cleanup header file guard and configure macros