removed macro.h