GitLab

Updates any includes, and references from Makefiles/CMake.

This essentially reverts what was done long ago in commit
136b5cbd



This work was funded through GitHub Sponsors.
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>