diff --git a/projects/openttd_vs140.vcxproj b/projects/openttd_vs140.vcxproj
index 0504063c74..1437d9e586 100644
--- a/projects/openttd_vs140.vcxproj
+++ b/projects/openttd_vs140.vcxproj
@@ -905,8 +905,10 @@
-
-
+
+
+
+
diff --git a/projects/openttd_vs140.vcxproj.filters b/projects/openttd_vs140.vcxproj.filters
index 6c909ae8fe..a5255f172e 100644
--- a/projects/openttd_vs140.vcxproj.filters
+++ b/projects/openttd_vs140.vcxproj.filters
@@ -1806,10 +1806,16 @@
CityMania files
-
+
CityMania files
-
+
+ CityMania files
+
+
+ CityMania files
+
+
CityMania files
diff --git a/projects/openttd_vs141.vcxproj b/projects/openttd_vs141.vcxproj
index c6bed3ee50..d3e51b0a8d 100644
--- a/projects/openttd_vs141.vcxproj
+++ b/projects/openttd_vs141.vcxproj
@@ -905,8 +905,10 @@
-
-
+
+
+
+
diff --git a/projects/openttd_vs141.vcxproj.filters b/projects/openttd_vs141.vcxproj.filters
index 6c909ae8fe..a5255f172e 100644
--- a/projects/openttd_vs141.vcxproj.filters
+++ b/projects/openttd_vs141.vcxproj.filters
@@ -1806,10 +1806,16 @@
CityMania files
-
+
CityMania files
-
+
+ CityMania files
+
+
+ CityMania files
+
+
CityMania files
diff --git a/projects/openttd_vs142.vcxproj b/projects/openttd_vs142.vcxproj
index 89eb102460..4257d28cf8 100644
--- a/projects/openttd_vs142.vcxproj
+++ b/projects/openttd_vs142.vcxproj
@@ -905,8 +905,10 @@
-
-
+
+
+
+
diff --git a/projects/openttd_vs142.vcxproj.filters b/projects/openttd_vs142.vcxproj.filters
index 6c909ae8fe..a5255f172e 100644
--- a/projects/openttd_vs142.vcxproj.filters
+++ b/projects/openttd_vs142.vcxproj.filters
@@ -1806,10 +1806,16 @@
CityMania files
-
+
CityMania files
-
+
+ CityMania files
+
+
+ CityMania files
+
+
CityMania files
diff --git a/source.list b/source.list
index 7e6b32f9c3..47c40febe1 100644
--- a/source.list
+++ b/source.list
@@ -620,8 +620,8 @@ citymania/base64.h
citymania/base64.cpp
citymania/highlight.hpp
citymania/highlight.cpp
-citymania/station_gui.hpp
-citymania/station_gui.cpp
+citymania/station_ui.hpp
+citymania/station_ui.cpp
newgrf_revisions.hpp
# Save/Load handlers
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 0814c93daa..9264924fb7 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -29,14 +29,14 @@
#include "widgets/airport_widget.h"
-#include "citymania/station_gui.hpp"
+#include "citymania/station_ui.hpp"
#include "safeguards.h"
-static AirportClassID _selected_airport_class; ///< the currently visible airport class
+AirportClassID _selected_airport_class; ///< the currently visible airport class
int _selected_airport_index; ///< the index of the selected airport in the current class or -1
-static byte _selected_airport_layout; ///< selected airport layout number.
+byte _selected_airport_layout; ///< selected airport layout number.
static void ShowBuildAirportPicker(Window *parent);
diff --git a/src/citymania/highlight.cpp b/src/citymania/highlight.cpp
index 32c2b78fef..7fb9a4c0b4 100644
--- a/src/citymania/highlight.cpp
+++ b/src/citymania/highlight.cpp
@@ -13,7 +13,7 @@
#include "../viewport_func.h"
#include "../zoning.h"
-#include "station_gui.hpp"
+#include "station_ui.hpp"
/** Enumeration of multi-part foundations */
diff --git a/src/citymania/station_gui.cpp b/src/citymania/station_ui.cpp
similarity index 99%
rename from src/citymania/station_gui.cpp
rename to src/citymania/station_ui.cpp
index de3960dcb7..523e471f59 100644
--- a/src/citymania/station_gui.cpp
+++ b/src/citymania/station_ui.cpp
@@ -1,6 +1,6 @@
#include "../stdafx.h"
-#include "station_gui.hpp"
+#include "station_ui.hpp"
#include "../core/math_func.hpp"
#include "../command_type.h"
@@ -27,9 +27,9 @@ extern DiagDirection AutodetectDriveThroughRoadStopDirection(TileArea area);
extern bool CheckClickOnViewportSign(const ViewPort *vp, int x, int y, const ViewportSign *sign);
extern Rect ExpandRectWithViewportSignMargins(Rect r, ZoomLevel zoom);
extern ViewportSignKdtree _viewport_sign_kdtree;
-AirportClassID _selected_airport_class;
+extern AirportClassID _selected_airport_class;
extern int _selected_airport_index;
-byte _selected_airport_layout;
+extern byte _selected_airport_layout;
extern RailType _cur_railtype; // rail_gui.cpp
diff --git a/src/citymania/station_gui.hpp b/src/citymania/station_ui.hpp
similarity index 93%
rename from src/citymania/station_gui.hpp
rename to src/citymania/station_ui.hpp
index f92d590355..b927c0edb1 100644
--- a/src/citymania/station_gui.hpp
+++ b/src/citymania/station_ui.hpp
@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_STATION_GUI_HPP
-#define CITYMANIA_STATION_GUI_HPP
+#ifndef CITYMANIA_STATION_UI_HPP
+#define CITYMANIA_STATION_UI_HPP
#include "../core/geometry_type.hpp"
#include "../command_type.h"
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index ccaf48b2d2..5da5726b65 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -31,7 +31,7 @@
#include "table/sprites.h"
#include "table/strings.h"
-#include "citymania/station_gui.hpp"
+#include "citymania/station_ui.hpp"
#include "safeguards.h"
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 3351e0be7d..82cdea4428 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -38,7 +38,7 @@
#include "widgets/rail_widget.h"
-#include "citymania/station_gui.hpp"
+#include "citymania/station_ui.hpp"
#include "safeguards.h"
diff --git a/src/rev.cpp b/src/rev.cpp
index 46f0074b6d..c6af42c4dd 100644
--- a/src/rev.cpp
+++ b/src/rev.cpp
@@ -83,4 +83,4 @@ const byte _openttd_revision_tagged = 1;
const uint32 _openttd_newgrf_version = 1 << 28 | 10 << 24 | 0 << 20 | 0 << 19 | 28004;
-const char _citymania_version[] = "20200222-master-mbac6a8a794 23.02.20";
+const char _citymania_version[] = "20200318-master-m5201c504f4 18.03.20";
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index e0fc4be8db..4c62f5ed42 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -39,7 +39,7 @@
#include "table/strings.h"
-#include "citymania/station_gui.hpp"
+#include "citymania/station_ui.hpp"
#include "safeguards.h"