Minor style fix
Move macros to dedicate header