Added configuration dependent preprocessor conditionals.