Reorder macros, remove unused include file