> Good point about macros, maybe I can have a look later. Macros and include feel like they fill the same spot in my mind in terms of features so I'd rather not have both.

You could always repurpose includes as imports, i.e. not generate any output from imports, but to allow their use as purely an organizational tool for importing macros.