Fixed the preprocessor to ensure a single wall per file