remove references to deleted macros.h