Have you tried #ifdef'd global variables? Should definitely make things easier to read