Test
Revert "Header file includes relocation"

This reverts commit 3b003d1dcd6a96fcee2a291467214b76c4d31d06.
Revert "Massive Bugfixes and Improvements and New Features"

This reverts commit 6d73e14ee47858544a3f1d69ff627d6977fb1872.