Split types.hpp into types.hpp and macros.hpp

macros.hpp contains macros... Some files may only need to include macros.hpp
also it's cleaner.