Added macros into 4 files