Yes, I'd suggest to duplicate the definitions for things that actually need to be different, and keep everything else unchanged, and don't try to do hacks that require including the header twice. Something along the lines of what we do for A/W Unicode support.