Remove some duplicate build macros