Added macros.h