Re-organizing preprocessor definitions.