Revert "headerfile/makefile hax hax"