Move some macros at the top a the toolchain