[jacquesm]

I don't particularly like include files in the middle of structs, but it looks like X macros might work.

Thanks for the tip, I'll have a look at them to see if there is a way around that so that it would work from a 'top' included file as well.

The project I'm working on has a single 'master include' file and I'd hate to break that convention.