Change to new preprocessor syntax