put back macros.h