Fix macros in headers