Move a couple macros to more appropriate headers