Added macros to ifdef and ifndef criteria