Significantly improve makefile speed
Header cleanup
Conform magic headers to the decl/def rule