GitLab

We already did the same some time ago in the FreeTye library.

Also remove redundant inclusion of some header macros.