diff --git a/source.list b/source.list
index 1c7a88c72d..d03aa9cfad 100644
--- a/source.list
+++ b/source.list
@@ -1226,14 +1226,14 @@ citymania/extensions/cmext_town.hpp
 citymania/extensions/cmext_company.hpp
 
 # CityMania client
-citymania/base64.h
-citymania/base64.cpp
-citymania/highlight.hpp
-citymania/highlight.cpp
-citymania/locations.hpp
-citymania/locations.cpp
-citymania/minimap.hpp
-citymania/minimap.cpp
-citymania/station_ui.hpp
-citymania/station_ui.cpp
+citymania/cm_base64.hpp
+citymania/cm_base64.cpp
+citymania/cm_highlight.hpp
+citymania/cm_highlight.cpp
+citymania/cm_locations.hpp
+citymania/cm_locations.cpp
+citymania/cm_minimap.hpp
+citymania/cm_minimap.cpp
+citymania/cm_station_gui.hpp
+citymania/cm_station_gui.cpp
 newgrf_revisions.hpp
diff --git a/src/citymania/base64.cpp b/src/citymania/cm_base64.cpp
similarity index 98%
rename from src/citymania/base64.cpp
rename to src/citymania/cm_base64.cpp
index b287090626..97e9f73349 100644
--- a/src/citymania/base64.cpp
+++ b/src/citymania/cm_base64.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
    base64.cpp and base64.h
 
    Copyright (C) 2004-2008 René Nyffenegger
@@ -25,10 +25,10 @@
 
 */
 
-#include "base64.h"
+#include "cm_base64.hpp"
 #include <iostream>
 
-static const std::string base64_chars = 
+static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"
              "0123456789+/";
@@ -142,10 +142,10 @@ int main2() {
 	fclose(fp);
 
   std::string encoded = base64_encode((unsigned char*)mFileBuffer, mFileLen);//reinterpret_cast<const unsigned char*>(s.c_str()), s.length());
- 
+
   {
   FILE* fileWrite = fopen("d:/PhysicsAnimationBakingDemo.uue64.h","w");
-  
+
   fprintf(fileWrite,"const char* mydata_base64 = {\n");
 	int counter = 0;
 	for (int i=0;i<encoded.size();i++)
diff --git a/src/citymania/base64.h b/src/citymania/cm_base64.hpp
similarity index 78%
rename from src/citymania/base64.h
rename to src/citymania/cm_base64.hpp
index 1e8e2cf2f8..f83df5d784 100644
--- a/src/citymania/base64.h
+++ b/src/citymania/cm_base64.hpp
@@ -1,5 +1,5 @@
-#ifndef BASE_64_H
-#define BASE_64_H
+#ifndef CM_BASE64_HPP
+#define CM_BASE64_HPP
 
 #include <string>
 
diff --git a/src/citymania/highlight.cpp b/src/citymania/cm_highlight.cpp
similarity index 99%
rename from src/citymania/highlight.cpp
rename to src/citymania/cm_highlight.cpp
index 42db6dd664..741517f8ac 100644
--- a/src/citymania/highlight.cpp
+++ b/src/citymania/cm_highlight.cpp
@@ -1,6 +1,8 @@
 #include "../stdafx.h"
 
-#include "highlight.hpp"
+#include "cm_highlight.hpp"
+#include "cm_main.hpp"
+#include "cm_station_gui.hpp"
 
 #include "../core/math_func.hpp"
 #include "../command_func.h"
@@ -16,10 +18,6 @@
 
 #include <set>
 
-#include "station_ui.hpp"
-
-#include "cm_main.hpp"
-
 
 /** Enumeration of multi-part foundations */
 enum FoundationPart {
diff --git a/src/citymania/highlight.hpp b/src/citymania/cm_highlight.hpp
similarity index 100%
rename from src/citymania/highlight.hpp
rename to src/citymania/cm_highlight.hpp
diff --git a/src/citymania/locations.cpp b/src/citymania/cm_locations.cpp
similarity index 98%
rename from src/citymania/locations.cpp
rename to src/citymania/cm_locations.cpp
index 1fa0cf06e4..55839c8c23 100644
--- a/src/citymania/locations.cpp
+++ b/src/citymania/cm_locations.cpp
@@ -7,7 +7,7 @@
 #include "../zoom_func.h"
 #include "../zoom_type.h"
 
-#include "locations.hpp"
+#include "cm_locations.hpp"
 
 #include "../safeguards.h"
 
diff --git a/src/citymania/locations.hpp b/src/citymania/cm_locations.hpp
similarity index 97%
rename from src/citymania/locations.hpp
rename to src/citymania/cm_locations.hpp
index ac33ec6574..b744fcfcee 100644
--- a/src/citymania/locations.hpp
+++ b/src/citymania/cm_locations.hpp
@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_LOCATIONS_HPP
-#define CITYMANIA_LOCATIONS_HPP
+#ifndef CM_LOCATIONS_HPP
+#define CM_LOCATIONS_HPP
 
 namespace citymania {
 
diff --git a/src/citymania/minimap.cpp b/src/citymania/cm_minimap.cpp
similarity index 79%
rename from src/citymania/minimap.cpp
rename to src/citymania/cm_minimap.cpp
index 6259b8b417..80f24c278e 100644
--- a/src/citymania/minimap.cpp
+++ b/src/citymania/cm_minimap.cpp
@@ -1,6 +1,6 @@
 #include "../stdafx.h"
 
-#include "minimap.hpp"
+#include "cm_minimap.hpp"
 
 #include "../safeguards.h"
 
diff --git a/src/citymania/minimap.hpp b/src/citymania/cm_minimap.hpp
similarity index 95%
rename from src/citymania/minimap.hpp
rename to src/citymania/cm_minimap.hpp
index 7dfdff05b0..2f32ac5092 100644
--- a/src/citymania/minimap.hpp
+++ b/src/citymania/cm_minimap.hpp
@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_MINIMAP_HPP
-#define CITYMANIA_MINIMAP_HPP
+#ifndef CM_MINIMAP_HPP
+#define CM_MINIMAP_HPP
 
 #include "../core/endian_func.hpp"
 
diff --git a/src/citymania/station_ui.cpp b/src/citymania/cm_station_gui.cpp
similarity index 99%
rename from src/citymania/station_ui.cpp
rename to src/citymania/cm_station_gui.cpp
index 720e879828..56fa9427ea 100644
--- a/src/citymania/station_ui.cpp
+++ b/src/citymania/cm_station_gui.cpp
@@ -1,6 +1,6 @@
 #include "../stdafx.h"
 
-#include "station_ui.hpp"
+#include "cm_station_gui.hpp"
 
 #include "cm_hotkeys.hpp"
 
diff --git a/src/citymania/station_ui.hpp b/src/citymania/cm_station_gui.hpp
similarity index 93%
rename from src/citymania/station_ui.hpp
rename to src/citymania/cm_station_gui.hpp
index 613c220457..457bf6e899 100644
--- a/src/citymania/station_ui.hpp
+++ b/src/citymania/cm_station_gui.hpp
@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_STATION_UI_HPP
-#define CITYMANIA_STATION_UI_HPP
+#ifndef CM_STATION_GUI_HPP
+#define CM_STATION_GUI_HPP
 
 #include "../core/geometry_type.hpp"
 #include "../command_type.h"
diff --git a/src/commands_gui.cpp b/src/commands_gui.cpp
index 31f64827b0..0d1134a494 100644
--- a/src/commands_gui.cpp
+++ b/src/commands_gui.cpp
@@ -18,7 +18,7 @@
 #include "window_func.h"
 #include "window_gui.h"
 
-#include "citymania/base64.h"
+#include "citymania/cm_base64.hpp"
 
 
 bool _novahost = false;
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 748451a096..9fe9e6e299 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -32,7 +32,7 @@
 #include "table/strings.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/map.cpp b/src/map.cpp
index dff4ded676..ebea3e4e83 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -12,7 +12,7 @@
 #include "core/alloc_func.hpp"
 #include "water_map.h"
 #include "string_func.h"
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/openttd.cpp b/src/openttd.cpp
index 04df4f573e..eb9600044e 100644
--- a/src/openttd.cpp
+++ b/src/openttd.cpp
@@ -68,7 +68,7 @@
 
 #include "linkgraph/linkgraphschedule.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_main.hpp"
 
 #include <stdarg.h>
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 1218445a13..4dffe105b1 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -40,7 +40,7 @@
 #include "table/strings.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index d62be82186..986f2e7abb 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -61,7 +61,7 @@
 #include "../game/game_text.hpp"
 #include "../table/control_codes.h"
 
-#include "../citymania/highlight.hpp"
+#include "../citymania/cm_highlight.hpp"
 
 #include "saveload_internal.h"
 
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index b1444c823e..12252eb94c 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -30,7 +30,7 @@
 #include <bitset>
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/minimap.hpp"
+#include "citymania/cm_minimap.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 12a3d4b66b..2545a89e16 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -59,7 +59,7 @@
 
 #include "table/strings.h"
 
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index 4234408a13..ce1c46558f 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -39,8 +39,8 @@
 #include <set>
 #include <vector>
 
-#include "citymania/station_ui.hpp"
 #include "citymania/cm_hotkeys.hpp"
+#include "citymania/cm_station_gui.hpp"
 #include "citymania/cm_tooltips.hpp"
 
 #include "safeguards.h"
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index ad6927c8ab..a560993229 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -60,7 +60,7 @@
 #include "zoning.h"
 #include "watch_gui.h"
 
-#include "citymania/locations.hpp"
+#include "citymania/cm_locations.hpp"
 #include "citymania/cm_main.hpp"
 
 #include "safeguards.h"
diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp
index c725179a6a..f480c349c2 100644
--- a/src/town_cmd.cpp
+++ b/src/town_cmd.cpp
@@ -52,7 +52,7 @@
 #include "table/strings.h"
 #include "table/town_land.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_main.hpp"
 
 #include "safeguards.h"
diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp
index bc6c7a7570..7cdd8f20cd 100644
--- a/src/tree_cmd.cpp
+++ b/src/tree_cmd.cpp
@@ -27,7 +27,7 @@
 #include "table/tree_land.h"
 #include "table/clear_land.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/viewport.cpp b/src/viewport.cpp
index 7d43164501..9b8aa37c44 100644
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -101,7 +101,7 @@
 #include "zoning.h"
 #include "industry_type.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_hotkeys.hpp"
 
 #include "safeguards.h"
diff --git a/src/zoning_cmd.cpp b/src/zoning_cmd.cpp
index 0f1d880505..c5165eeeb4 100644
--- a/src/zoning_cmd.cpp
+++ b/src/zoning_cmd.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_game.hpp"
 #include "citymania/cm_main.hpp"