diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index a5cbbc42f2..a660b6c6e9 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -30,7 +30,7 @@
 #include "widgets/airport_widget.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index d90d1ee408..e11ba2b917 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -44,7 +44,7 @@
 #include <bitset>
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index a8c2e5a214..dfea49b17a 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -39,7 +39,7 @@
 #include "widgets/rail_widget.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index a560993229..b188899b3a 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -787,7 +787,9 @@ static CallBackFunction MenuClickLeague(int index)
 static CallBackFunction ToolbarIndustryClick(Window *w)
 {
 	/* Disable build-industry menu if we are a spectator */
-	PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, (_local_company == COMPANY_SPECTATOR) ? 2 : 3);
+	// CM don't disable
+	// PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, (_local_company == COMPANY_SPECTATOR) ? 2 : 3);
+	PopupMainToolbMenu(w, WID_TN_INDUSTRIES, STR_INDUSTRY_MENU_INDUSTRY_DIRECTORY, 3);
 	return CBF_NONE;
 }