Moved preprocessors around