Move macros to the end