change header and some macros