remove useless header file
remove redundant semicolon from macros