Consistent header macros everywhere