Removed old macros header