diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj
index 6aff4cb9ae..93a7539b81 100644
--- a/OpenRCT2.xcodeproj/project.pbxproj
+++ b/OpenRCT2.xcodeproj/project.pbxproj
@@ -123,6 +123,7 @@
 		4CE4624B1FD1613D0001CD98 /* Platform.macOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */; };
 		4CE4624C1FD1613D0001CD98 /* Platform.Posix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */; };
 		4CE4624D1FD1613D0001CD98 /* Platform.Win32.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */; };
+		4CE462411FD0710E0001CD98 /* Game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CE4623F1FD0710E0001CD98 /* Game.cpp */; };
 		4CF788C01F1B787700C611BF /* Painter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CF788BE1F1B787700C611BF /* Painter.cpp */; };
 		4CFBCD5E1F27CD8000D74FB6 /* SmallScenery.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */; };
 		4CFE4E801F90A3F1005243C2 /* Peep.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4CFE4E7B1F90A3F1005243C2 /* Peep.cpp */; };
@@ -303,7 +304,6 @@
 		F76C86041EC4E88300FA49E2 /* string.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B01EC4E7CC00FA49E2 /* string.c */; };
 		F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B11EC4E7CC00FA49E2 /* Editor.cpp */; };
 		F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */; };
-		F76C86091EC4E88300FA49E2 /* game.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B51EC4E7CC00FA49E2 /* game.c */; };
 		F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */; };
 		F76C860D1EC4E88300FA49E2 /* input.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83B91EC4E7CC00FA49E2 /* input.c */; };
 		F76C860F1EC4E88300FA49E2 /* chat.c in Sources */ = {isa = PBXBuildFile; fileRef = F76C83BC1EC4E7CC00FA49E2 /* chat.c */; };
@@ -716,6 +716,8 @@
 		4CE462471FD1613D0001CD98 /* Platform.macOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.macOS.cpp; sourceTree = "<group>"; };
 		4CE462481FD1613D0001CD98 /* Platform.Posix.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Posix.cpp; sourceTree = "<group>"; };
 		4CE462491FD1613D0001CD98 /* Platform.Win32.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.Win32.cpp; sourceTree = "<group>"; };
+		4CE4623F1FD0710E0001CD98 /* Game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Game.cpp; sourceTree = "<group>"; };
+		4CE462401FD0710E0001CD98 /* Game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Game.h; sourceTree = "<group>"; };
 		4CF788BE1F1B787700C611BF /* Painter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Painter.cpp; sourceTree = "<group>"; };
 		4CF788BF1F1B787700C611BF /* Painter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Painter.h; sourceTree = "<group>"; };
 		4CFBCD5D1F27CD8000D74FB6 /* SmallScenery.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SmallScenery.cpp; sourceTree = "<group>"; };
@@ -1113,8 +1115,6 @@
 		F76C83B21EC4E7CC00FA49E2 /* Editor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Editor.h; sourceTree = "<group>"; };
 		F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FileClassifier.cpp; sourceTree = "<group>"; };
 		F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileClassifier.h; sourceTree = "<group>"; };
-		F76C83B51EC4E7CC00FA49E2 /* game.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = game.c; sourceTree = "<group>"; };
-		F76C83B61EC4E7CC00FA49E2 /* game.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = game.h; sourceTree = "<group>"; };
 		F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Imaging.cpp; sourceTree = "<group>"; };
 		F76C83B81EC4E7CC00FA49E2 /* Imaging.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Imaging.h; sourceTree = "<group>"; };
 		F76C83B91EC4E7CC00FA49E2 /* input.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = input.c; sourceTree = "<group>"; };
@@ -1831,8 +1831,8 @@
 				F76C83B21EC4E7CC00FA49E2 /* Editor.h */,
 				F76C83B31EC4E7CC00FA49E2 /* FileClassifier.cpp */,
 				F76C83B41EC4E7CC00FA49E2 /* FileClassifier.h */,
-				F76C83B51EC4E7CC00FA49E2 /* game.c */,
-				F76C83B61EC4E7CC00FA49E2 /* game.h */,
+				4CE4623F1FD0710E0001CD98 /* Game.cpp */,
+				4CE462401FD0710E0001CD98 /* Game.h */,
 				F76C83B71EC4E7CC00FA49E2 /* Imaging.cpp */,
 				F76C83B81EC4E7CC00FA49E2 /* Imaging.h */,
 				F76C83B91EC4E7CC00FA49E2 /* input.c */,
@@ -3163,6 +3163,7 @@
 				C654DF401F69C18C0040F43D /* Intent.cpp in Sources */,
 				C666ED761F33DBB20061AA04 /* ShortcutKeyChange.cpp in Sources */,
 				F76C887F1EC5324E00FA49E2 /* ApplyPaletteShader.cpp in Sources */,
+				4CE462411FD0710E0001CD98 /* Game.cpp in Sources */,
 				C685E51C1F8907850090598F /* Map.cpp in Sources */,
 				F7CB864A1EEDA1330030C877 /* KeyboardShortcuts.cpp in Sources */,
 				4C8667821EEFDCDF0024AAB8 /* RideGroupManager.cpp in Sources */,
@@ -3323,7 +3324,6 @@
 				F76C86041EC4E88300FA49E2 /* string.c in Sources */,
 				F76C86051EC4E88300FA49E2 /* Editor.cpp in Sources */,
 				F76C86071EC4E88300FA49E2 /* FileClassifier.cpp in Sources */,
-				F76C86091EC4E88300FA49E2 /* game.c in Sources */,
 				F76C860B1EC4E88300FA49E2 /* Imaging.cpp in Sources */,
 				F76C860D1EC4E88300FA49E2 /* input.c in Sources */,
 				F76C860F1EC4E88300FA49E2 /* chat.c in Sources */,
diff --git a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
index 7a5798c677..69a393f0fe 100644
--- a/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
@@ -25,7 +25,7 @@
 #include "DrawingEngines.h"
 
 #include <openrct2/drawing/lightfx.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/paint/paint.h>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
index 359712b8ae..83f24daa03 100644
--- a/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
+++ b/src/openrct2-ui/drawing/engines/SoftwareDrawingEngine.cpp
@@ -24,7 +24,7 @@
 #include <openrct2/ui/UiContext.h>
 #include "DrawingEngines.h"
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;
diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp
index 39aab18317..15e9f6f145 100644
--- a/src/openrct2-ui/input/KeyboardShortcut.cpp
+++ b/src/openrct2-ui/input/KeyboardShortcut.cpp
@@ -20,7 +20,7 @@
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Util.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/Screenshot.h>
 #include <openrct2/interface/chat.h>
diff --git a/src/openrct2-ui/windows/Banner.cpp b/src/openrct2-ui/windows/Banner.cpp
index 9454a31c49..a93a2bf6a9 100644
--- a/src/openrct2-ui/windows/Banner.cpp
+++ b/src/openrct2-ui/windows/Banner.cpp
@@ -17,7 +17,7 @@
 #include <openrct2/config/Config.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/DemolishRidePrompt.cpp b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
index bdf3c24bbb..298ec41dde 100644
--- a/src/openrct2-ui/windows/DemolishRidePrompt.cpp
+++ b/src/openrct2-ui/windows/DemolishRidePrompt.cpp
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2-ui/windows/Window.h>
diff --git a/src/openrct2-ui/windows/EditorBottomToolbar.cpp b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
index 66b689beca..1c7b979139 100644
--- a/src/openrct2-ui/windows/EditorBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/EditorBottomToolbar.cpp
@@ -21,7 +21,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/audio/audio.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/Editor.h>
 #include <openrct2/input.h>
 #include <openrct2/sprites.h>
diff --git a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
index f9e1ad63bc..957ecc9a89 100644
--- a/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
+++ b/src/openrct2-ui/windows/EditorObjectiveOptions.cpp
@@ -19,7 +19,7 @@
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/date.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/EditorScenarioOptions.cpp b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
index d763e8d433..3b01223592 100644
--- a/src/openrct2-ui/windows/EditorScenarioOptions.cpp
+++ b/src/openrct2-ui/windows/EditorScenarioOptions.cpp
@@ -20,7 +20,7 @@
 #include <openrct2/Context.h>
 
 #include <openrct2/Editor.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/localisation/string_ids.h>
diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp
index eea743b0ae..a0c1d9bcaa 100644
--- a/src/openrct2-ui/windows/Finances.cpp
+++ b/src/openrct2-ui/windows/Finances.cpp
@@ -18,7 +18,7 @@
 #include <openrct2/core/Math.hpp>
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/graph.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/date.h>
diff --git a/src/openrct2-ui/windows/Footpath.cpp b/src/openrct2-ui/windows/Footpath.cpp
index 7c3ac7ff56..7ab84276ad 100644
--- a/src/openrct2-ui/windows/Footpath.cpp
+++ b/src/openrct2-ui/windows/Footpath.cpp
@@ -19,7 +19,7 @@
 
 #include <openrct2/audio/audio.h>
 #include <openrct2/cheats.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index 82f29faaca..de37e02ff4 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -19,7 +19,7 @@
 #include <openrct2/config/Config.h>
 #include <openrct2/Context.h>
 #include <openrct2/core/Math.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/themes.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/Guest.cpp b/src/openrct2-ui/windows/Guest.cpp
index 76d77efde1..ae2863070f 100644
--- a/src/openrct2-ui/windows/Guest.cpp
+++ b/src/openrct2-ui/windows/Guest.cpp
@@ -18,7 +18,7 @@
 
 #include <openrct2/config/Config.h>
 #include <openrct2/Context.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index 32d36a332f..8505350b64 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -17,7 +17,7 @@
 #include <openrct2/config/Config.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/sprites.h>
diff --git a/src/openrct2-ui/windows/LandRights.cpp b/src/openrct2-ui/windows/LandRights.cpp
index 7caf840438..d634a2e9ff 100644
--- a/src/openrct2-ui/windows/LandRights.cpp
+++ b/src/openrct2-ui/windows/LandRights.cpp
@@ -18,7 +18,7 @@
 #include <openrct2/core/Math.hpp>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/land_tool.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index 3948a6c261..c46899582e 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -26,7 +26,7 @@
 #include <time.h>
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/Editor.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/platform/platform.h>
diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index 0fdd0a6c8b..13e51c48df 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -21,7 +21,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/cheats.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/land_tool.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2-ui/windows/MazeConstruction.cpp b/src/openrct2-ui/windows/MazeConstruction.cpp
index ea35b7dc56..d1acb9ca89 100644
--- a/src/openrct2-ui/windows/MazeConstruction.cpp
+++ b/src/openrct2-ui/windows/MazeConstruction.cpp
@@ -19,7 +19,7 @@
 #include <openrct2/audio/audio.h>
 #include <openrct2/Context.h>
 #include <openrct2/drawing/drawing.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/NewCampaign.cpp b/src/openrct2-ui/windows/NewCampaign.cpp
index 886f36a269..1abce03451 100644
--- a/src/openrct2-ui/windows/NewCampaign.cpp
+++ b/src/openrct2-ui/windows/NewCampaign.cpp
@@ -18,7 +18,7 @@
 #include <openrct2/core/Math.hpp>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/ride/ride.h>
diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp
index 211f8403f0..c620521596 100644
--- a/src/openrct2-ui/windows/NewRide.cpp
+++ b/src/openrct2-ui/windows/NewRide.cpp
@@ -25,7 +25,7 @@
 #include <openrct2/core/Math.hpp>
 #include <openrct2/Context.h>
 #include <openrct2/audio/audio.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/management/NewsItem.h>
diff --git a/src/openrct2-ui/windows/Park.cpp b/src/openrct2-ui/windows/Park.cpp
index 10324f6d31..3db0d271a5 100644
--- a/src/openrct2-ui/windows/Park.cpp
+++ b/src/openrct2-ui/windows/Park.cpp
@@ -19,7 +19,7 @@
 #include <openrct2/core/Math.hpp>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/date.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/input.h>
diff --git a/src/openrct2-ui/windows/Player.cpp b/src/openrct2-ui/windows/Player.cpp
index a56d78928d..d83dd6ef8b 100644
--- a/src/openrct2-ui/windows/Player.cpp
+++ b/src/openrct2-ui/windows/Player.cpp
@@ -18,7 +18,7 @@
 #include <openrct2/network/network.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/sprites.h>
diff --git a/src/openrct2-ui/windows/Research.cpp b/src/openrct2-ui/windows/Research.cpp
index 369388cd7d..343868ebb4 100644
--- a/src/openrct2-ui/windows/Research.cpp
+++ b/src/openrct2-ui/windows/Research.cpp
@@ -16,7 +16,7 @@
 
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/management/NewsItem.h>
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 29bafc576b..2d6b8416d6 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -24,7 +24,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/core/Util.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/themes.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index ee73826c7f..0ac0c170a4 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -22,7 +22,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/core/Util.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/RideList.cpp b/src/openrct2-ui/windows/RideList.cpp
index 929ba3dced..ea5dbe1845 100644
--- a/src/openrct2-ui/windows/RideList.cpp
+++ b/src/openrct2-ui/windows/RideList.cpp
@@ -19,7 +19,7 @@
 #include <openrct2/config/Config.h>
 #include <openrct2/Context.h>
 #include <openrct2/core/Util.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/themes.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/SavePrompt.cpp b/src/openrct2-ui/windows/SavePrompt.cpp
index 7c17e6c8a5..55b02f4368 100644
--- a/src/openrct2-ui/windows/SavePrompt.cpp
+++ b/src/openrct2-ui/windows/SavePrompt.cpp
@@ -22,7 +22,7 @@
 #include <openrct2/Context.h>
 
 #include <openrct2/audio/audio.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/interface/widget.h>
 
diff --git a/src/openrct2-ui/windows/Sign.cpp b/src/openrct2-ui/windows/Sign.cpp
index c08a2aa04c..776e84343c 100644
--- a/src/openrct2-ui/windows/Sign.cpp
+++ b/src/openrct2-ui/windows/Sign.cpp
@@ -17,7 +17,7 @@
 #include <openrct2/config/Config.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/localisation/string_ids.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
index 82f1aafc10..14400699fb 100644
--- a/src/openrct2-ui/windows/Staff.cpp
+++ b/src/openrct2-ui/windows/Staff.cpp
@@ -20,7 +20,7 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2/Context.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/StaffFirePrompt.cpp b/src/openrct2-ui/windows/StaffFirePrompt.cpp
index d7f14bce7a..c9d96c207e 100644
--- a/src/openrct2-ui/windows/StaffFirePrompt.cpp
+++ b/src/openrct2-ui/windows/StaffFirePrompt.cpp
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include <openrct2-ui/windows/Window.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
 
diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp
index 8454e052a7..077d2db83a 100644
--- a/src/openrct2-ui/windows/StaffList.cpp
+++ b/src/openrct2-ui/windows/StaffList.cpp
@@ -21,7 +21,7 @@
 #include <openrct2/Context.h>
 
 #include <openrct2/drawing/drawing.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/Themes.cpp b/src/openrct2-ui/windows/Themes.cpp
index 3c9a09a0a7..1e7bf2533f 100644
--- a/src/openrct2-ui/windows/Themes.cpp
+++ b/src/openrct2-ui/windows/Themes.cpp
@@ -18,7 +18,7 @@
 #include <openrct2-ui/windows/Window.h>
 #include <openrct2/Context.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp
index 54da6d48bd..cdaea3c882 100644
--- a/src/openrct2-ui/windows/TileInspector.cpp
+++ b/src/openrct2-ui/windows/TileInspector.cpp
@@ -20,7 +20,7 @@
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/core/Util.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp
index 4640f3bc2a..797373f7b3 100644
--- a/src/openrct2-ui/windows/TitleCommandEditor.cpp
+++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp
@@ -19,7 +19,7 @@
 #include <openrct2/core/Memory.hpp>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/themes.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp
index 0490ddf50b..3b23056d4a 100644
--- a/src/openrct2-ui/windows/TitleEditor.cpp
+++ b/src/openrct2-ui/windows/TitleEditor.cpp
@@ -27,7 +27,7 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp
index 774da79c3f..7dec51c521 100644
--- a/src/openrct2-ui/windows/TitleMenu.cpp
+++ b/src/openrct2-ui/windows/TitleMenu.cpp
@@ -20,7 +20,7 @@
 #include <openrct2-ui/windows/Window.h>
 
 #include <openrct2/Editor.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/widget.h>
 #include <openrct2/localisation/localisation.h>
diff --git a/src/openrct2-ui/windows/TrackDesignPlace.cpp b/src/openrct2-ui/windows/TrackDesignPlace.cpp
index c7d99d06f0..8269bc9da2 100644
--- a/src/openrct2-ui/windows/TrackDesignPlace.cpp
+++ b/src/openrct2-ui/windows/TrackDesignPlace.cpp
@@ -21,7 +21,7 @@
 #include <openrct2/Context.h>
 #include <openrct2/core/Math.hpp>
 #include <openrct2/core/Memory.hpp>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/input.h>
 #include <openrct2/interface/viewport.h>
 #include <openrct2/interface/widget.h>
diff --git a/src/openrct2-ui/windows/Viewport.cpp b/src/openrct2-ui/windows/Viewport.cpp
index 2c91657b33..9437ee4fcc 100644
--- a/src/openrct2-ui/windows/Viewport.cpp
+++ b/src/openrct2-ui/windows/Viewport.cpp
@@ -17,7 +17,7 @@
 #include <openrct2-ui/windows/Window.h>
 
 #include <openrct2/audio/audio.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/sprites.h>
 #include <openrct2/interface/viewport.h>
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 40a5c0f51b..13317bdea0 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -51,7 +51,7 @@
 #include "config/Config.h"
 #include "drawing/lightfx.h"
 #include "Editor.h"
-#include "game.h"
+#include "Game.h"
 #include "input.h"
 #include "interface/chat.h"
 #include "interface/console.h"
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 7af55b1648..239728d9ba 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -19,7 +19,7 @@
 #include "core/Math.hpp"
 #include "Editor.h"
 #include "FileClassifier.h"
-#include "game.h"
+#include "Game.h"
 #include "interface/viewport.h"
 #include "localisation/localisation.h"
 #include "management/NewsItem.h"
diff --git a/src/openrct2/game.c b/src/openrct2/Game.cpp
similarity index 98%
rename from src/openrct2/game.c
rename to src/openrct2/Game.cpp
index b08e3be9d1..4982889156 100644
--- a/src/openrct2/game.c
+++ b/src/openrct2/Game.cpp
@@ -18,9 +18,11 @@
 #include "cheats.h"
 #include "config/Config.h"
 #include "Context.h"
+#include "core/Math.hpp"
+#include "core/Util.hpp"
 #include "Editor.h"
 #include "FileClassifier.h"
-#include "game.h"
+#include "Game.h"
 #include "input.h"
 #include "interface/Screenshot.h"
 #include "interface/viewport.h"
@@ -104,7 +106,7 @@ rct_string_id gErrorStringId;
 
 sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback)
 {
-    for (sint32 i = 0; i < countof(game_command_callback_table); i++ ) {
+    for (sint32 i = 0; i < Util::CountOf(game_command_callback_table); i++ ) {
         if (game_command_callback_table[i] == callback) {
             return i;
         }
@@ -114,7 +116,7 @@ sint32 game_command_callback_get_index(GAME_COMMAND_CALLBACK_POINTER* callback)
 
 GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index)
 {
-    if (index < countof(game_command_callback_table)) {
+    if (index < Util::CountOf(game_command_callback_table)) {
         return game_command_callback_table[index];
     }
     return 0;
@@ -122,7 +124,7 @@ GAME_COMMAND_CALLBACK_POINTER* game_command_callback_get_callback(sint32 index)
 
 void game_increase_game_speed()
 {
-    gGameSpeed = min(gConfigGeneral.debugging_tools ? 5 : 4, gGameSpeed + 1);
+    gGameSpeed = Math::Min(gConfigGeneral.debugging_tools ? 5 : 4, gGameSpeed + 1);
     if (gGameSpeed == 5)
         gGameSpeed = 8;
     window_invalidate_by_class(WC_TOP_TOOLBAR);
@@ -130,7 +132,7 @@ void game_increase_game_speed()
 
 void game_reduce_game_speed()
 {
-    gGameSpeed = max(1, gGameSpeed - 1);
+    gGameSpeed = Math::Max(1, gGameSpeed - 1);
     if (gGameSpeed == 7)
         gGameSpeed = 4;
     window_invalidate_by_class(WC_TOP_TOOLBAR);
@@ -310,7 +312,7 @@ void game_update()
 {
     gInUpdateCode = true;
 
-    sint32 numUpdates;
+    uint32 numUpdates;
 
     // 0x006E3AEC // screen_game_process_mouse_input();
     screenshot_check();
@@ -326,7 +328,7 @@ void game_update()
         numUpdates = 1 << (gGameSpeed - 1);
     } else {
         numUpdates = gTicksSinceLastUpdate / GAME_UPDATE_TIME_MS;
-        numUpdates = clamp(1, numUpdates, GAME_MAX_UPDATES);
+        numUpdates = Math::Clamp(1u, numUpdates, (uint32)GAME_MAX_UPDATES);
     }
 
     if (network_get_mode() == NETWORK_MODE_CLIENT && network_get_status() == NETWORK_STATUS_CONNECTED && network_get_authstatus() == NETWORK_AUTH_OK) {
@@ -542,7 +544,7 @@ sint32 game_do_command_p(sint32 command, sint32 *eax, sint32 *ebx, sint32 *ecx,
     original_edi = *edi;
     original_ebp = *ebp;
 
-    if (command >= countof(new_game_command_table)) {
+    if (command >= Util::CountOf(new_game_command_table)) {
         return MONEY32_UNDEFINED;
     }
 
@@ -862,7 +864,7 @@ void game_log_multiplayer_command(int command, int *eax, int* ebx, int* ecx, int
             if (nameChunkOffset < 0)
                 nameChunkOffset = 2;
             nameChunkOffset *= 12;
-            nameChunkOffset = min(nameChunkOffset, countof(banner_name) - 12);
+            nameChunkOffset = Math::Min(nameChunkOffset, (sint32)(Util::CountOf(banner_name) - 12));
             memcpy(banner_name + nameChunkOffset + 0, edx, 4);
             memcpy(banner_name + nameChunkOffset + 4, ebp, 4);
             memcpy(banner_name + nameChunkOffset + 8, edi, 4);
diff --git a/src/openrct2/game.h b/src/openrct2/Game.h
similarity index 99%
rename from src/openrct2/game.h
rename to src/openrct2/Game.h
index b776533c8f..e407aa2c8d 100644
--- a/src/openrct2/game.h
+++ b/src/openrct2/Game.h
@@ -14,8 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#ifndef _GAME_H_
-#define _GAME_H_
+#pragma once
 
 #include "common.h"
 #include "scenario/scenario.h"
@@ -196,5 +195,3 @@ void game_init_all(sint32 mapSize);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h
index 8d6d0dc20d..c3866c16d3 100644
--- a/src/openrct2/actions/GameAction.h
+++ b/src/openrct2/actions/GameAction.h
@@ -23,7 +23,7 @@
 #include "../core/DataSerialiser.h"
 #include "../core/IStream.hpp"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/string_ids.h"
 #include "../world/map.h"
 
diff --git a/src/openrct2/cheats.c b/src/openrct2/cheats.c
index 083b414ee3..fb2a8aad47 100644
--- a/src/openrct2/cheats.c
+++ b/src/openrct2/cheats.c
@@ -17,7 +17,7 @@
 #include "cheats.h"
 #include "config/Config.h"
 #include "Editor.h"
-#include "game.h"
+#include "Game.h"
 #include "interface/window.h"
 #include "localisation/localisation.h"
 #include "management/Finance.h"
diff --git a/src/openrct2/cmdline/ConvertCommand.cpp b/src/openrct2/cmdline/ConvertCommand.cpp
index 72db62b3c4..9ce7206972 100644
--- a/src/openrct2/cmdline/ConvertCommand.cpp
+++ b/src/openrct2/cmdline/ConvertCommand.cpp
@@ -25,7 +25,7 @@
 #include "../rct2/S6Exporter.h"
 #include "CommandLine.hpp"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../OpenRCT2.h"
 
diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp
index 4b8567bb7b..ac110ba2bb 100644
--- a/src/openrct2/drawing/X8DrawingEngine.cpp
+++ b/src/openrct2/drawing/X8DrawingEngine.cpp
@@ -26,7 +26,7 @@
 #include "Rain.h"
 #include "X8DrawingEngine.h"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
 #include "../intro.h"
diff --git a/src/openrct2/drawing/lightfx.c b/src/openrct2/drawing/lightfx.c
index e96cb66d1f..2a0c4049c5 100644
--- a/src/openrct2/drawing/lightfx.c
+++ b/src/openrct2/drawing/lightfx.c
@@ -17,7 +17,7 @@
 #ifdef __ENABLE_LIGHTFX__
 
 #include "../common.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
 #include "../paint/tile_element/tile_element.h"
diff --git a/src/openrct2/input.c b/src/openrct2/input.c
index 6d25b53427..93c2b03c4c 100644
--- a/src/openrct2/input.c
+++ b/src/openrct2/input.c
@@ -17,7 +17,7 @@
 #include "audio/audio.h"
 #include "config/Config.h"
 #include "Context.h"
-#include "game.h"
+#include "Game.h"
 #include "input.h"
 #include "interface/chat.h"
 #include "interface/console.h"
diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp
index 976c55c335..89cfd1a921 100644
--- a/src/openrct2/interface/Screenshot.cpp
+++ b/src/openrct2/interface/Screenshot.cpp
@@ -24,7 +24,7 @@
 #include "Screenshot.h"
 
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../intro.h"
 #include "../localisation/localisation.h"
 #include "../platform/platform.h"
diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c
index 5673bb9b03..7275f266ee 100644
--- a/src/openrct2/interface/console.c
+++ b/src/openrct2/interface/console.c
@@ -20,7 +20,7 @@
 #include "../Context.h"
 #include "../drawing/drawing.h"
 #include "../Editor.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/themes.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/interface/viewport.c b/src/openrct2/interface/viewport.c
index 3626efd29e..54b080e42d 100644
--- a/src/openrct2/interface/viewport.c
+++ b/src/openrct2/interface/viewport.c
@@ -17,7 +17,7 @@
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c
index 030fabae55..1013a3516b 100644
--- a/src/openrct2/interface/viewport_interaction.c
+++ b/src/openrct2/interface/viewport_interaction.c
@@ -16,7 +16,7 @@
 
 #include "../cheats.h"
 #include "../Editor.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
diff --git a/src/openrct2/interface/window.c b/src/openrct2/interface/window.c
index d3841ce263..0c5581bdcb 100644
--- a/src/openrct2/interface/window.c
+++ b/src/openrct2/interface/window.c
@@ -20,7 +20,7 @@
 #include "../core/Guard.hpp"
 #include "../drawing/drawing.h"
 #include "../Editor.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/Cursors.h"
 #include "../interface/themes.h"
diff --git a/src/openrct2/localisation/date.c b/src/openrct2/localisation/date.c
index 534f77c99a..1d1286ac8b 100644
--- a/src/openrct2/localisation/date.c
+++ b/src/openrct2/localisation/date.c
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include <time.h>
-#include "../game.h"
+#include "../Game.h"
 #include "date.h"
 #include "string_ids.h"
 
diff --git a/src/openrct2/localisation/localisation.c b/src/openrct2/localisation/localisation.c
index 4757db4edb..d5baba7b16 100644
--- a/src/openrct2/localisation/localisation.c
+++ b/src/openrct2/localisation/localisation.c
@@ -31,7 +31,7 @@
 #endif // _WIN32
 
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../util/util.h"
 #include "date.h"
 #include "localisation.h"
diff --git a/src/openrct2/localisation/user.c b/src/openrct2/localisation/user.c
index aa95818dfe..881579daba 100644
--- a/src/openrct2/localisation/user.c
+++ b/src/openrct2/localisation/user.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../game.h"
+#include "../Game.h"
 #include "../ride/ride.h"
 #include "../util/util.h"
 #include "localisation.h"
diff --git a/src/openrct2/management/Finance.cpp b/src/openrct2/management/Finance.cpp
index 7d7fc2cad7..9eadd16ab5 100644
--- a/src/openrct2/management/Finance.cpp
+++ b/src/openrct2/management/Finance.cpp
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/management/Marketing.cpp b/src/openrct2/management/Marketing.cpp
index b869790df0..b2c20742b7 100644
--- a/src/openrct2/management/Marketing.cpp
+++ b/src/openrct2/management/Marketing.cpp
@@ -16,7 +16,7 @@
 
 #include "../config/Config.h"
 #include "../core/Util.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../ride/ride.h"
diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp
index c682ca54db..1cbf5840e6 100644
--- a/src/openrct2/management/Research.cpp
+++ b/src/openrct2/management/Research.cpp
@@ -17,7 +17,7 @@
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
 #include "../core/Util.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp
index 0ea756d479..077b3f54f4 100644
--- a/src/openrct2/network/Network.cpp
+++ b/src/openrct2/network/Network.cpp
@@ -55,7 +55,7 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL;
 #include "../rct2/S6Exporter.h"
 
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/chat.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
diff --git a/src/openrct2/network/NetworkAction.cpp b/src/openrct2/network/NetworkAction.cpp
index e3197993ee..355cbd5aa1 100644
--- a/src/openrct2/network/NetworkAction.cpp
+++ b/src/openrct2/network/NetworkAction.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include "NetworkAction.h"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/string_ids.h"
 
 sint32 NetworkActions::FindCommand(sint32 command)
diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp
index 69e4415695..a355788179 100644
--- a/src/openrct2/network/Twitch.cpp
+++ b/src/openrct2/network/Twitch.cpp
@@ -33,7 +33,7 @@
 
 #include "../config/Config.h"
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/console.h"
 #include "../localisation/localisation.h"
 #include "../management/NewsItem.h"
diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h
index 9ce12eca45..0b00ba4fab 100644
--- a/src/openrct2/network/network.h
+++ b/src/openrct2/network/network.h
@@ -38,7 +38,7 @@ enum {
 #define MAX_SERVER_DESCRIPTION_LENGTH 256
 
 #include "../common.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/string_ids.h"
 
 #include "../Version.h"
diff --git a/src/openrct2/object_list.c b/src/openrct2/object_list.c
index 0dc419d817..d46432d696 100644
--- a/src/openrct2/object_list.c
+++ b/src/openrct2/object_list.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "game.h"
+#include "Game.h"
 #include "object.h"
 #include "object_list.h"
 #include "object/ObjectRepository.h"
diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp
index debe250d41..0261663555 100644
--- a/src/openrct2/paint/Painter.cpp
+++ b/src/openrct2/paint/Painter.cpp
@@ -22,7 +22,7 @@
 #include "Painter.h"
 
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/chat.h"
 #include "../interface/console.h"
 #include "../intro.h"
diff --git a/src/openrct2/paint/tile_element/banner.c b/src/openrct2/paint/tile_element/banner.c
index c3002d96ca..151a0ce53a 100644
--- a/src/openrct2/paint/tile_element/banner.c
+++ b/src/openrct2/paint/tile_element/banner.c
@@ -16,7 +16,7 @@
 
 #include "../paint.h"
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../localisation/localisation.h"
 #include "../../paint/tile_element/tile_element.h"
diff --git a/src/openrct2/paint/tile_element/entrance.c b/src/openrct2/paint/tile_element/entrance.c
index c2a9be1ac4..7c3e04bf6b 100644
--- a/src/openrct2/paint/tile_element/entrance.c
+++ b/src/openrct2/paint/tile_element/entrance.c
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../localisation/localisation.h"
 #include "../../ride/ride_data.h"
diff --git a/src/openrct2/paint/tile_element/fence.c b/src/openrct2/paint/tile_element/fence.c
index 749fa527f6..54cda14640 100644
--- a/src/openrct2/paint/tile_element/fence.c
+++ b/src/openrct2/paint/tile_element/fence.c
@@ -17,7 +17,7 @@
 #include "../../common.h"
 #include "../../config/Config.h"
 #include "../../drawing/drawing.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../localisation/localisation.h"
 #include "../../interface/colour.h"
 #include "../../interface/viewport.h"
diff --git a/src/openrct2/paint/tile_element/large_scenery.c b/src/openrct2/paint/tile_element/large_scenery.c
index 2359f1eed5..29c95aa6ec 100644
--- a/src/openrct2/paint/tile_element/large_scenery.c
+++ b/src/openrct2/paint/tile_element/large_scenery.c
@@ -18,7 +18,7 @@
 #include "../paint.h"
 #include "../supports.h"
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../localisation/localisation.h"
 #include "../../util/util.h"
diff --git a/src/openrct2/paint/tile_element/path.c b/src/openrct2/paint/tile_element/path.c
index be910e3462..b9dc39ff11 100644
--- a/src/openrct2/paint/tile_element/path.c
+++ b/src/openrct2/paint/tile_element/path.c
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../localisation/localisation.h"
 #include "../../object_list.h"
diff --git a/src/openrct2/paint/tile_element/scenery.c b/src/openrct2/paint/tile_element/scenery.c
index 0b9a116e7c..75c94d1613 100644
--- a/src/openrct2/paint/tile_element/scenery.c
+++ b/src/openrct2/paint/tile_element/scenery.c
@@ -16,7 +16,7 @@
 
 #include "tile_element.h"
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../localisation/date.h"
 #include "../../paint/paint.h"
diff --git a/src/openrct2/paint/tile_element/tile_element.c b/src/openrct2/paint/tile_element/tile_element.c
index 8f43d3ea52..f308a35364 100644
--- a/src/openrct2/paint/tile_element/tile_element.c
+++ b/src/openrct2/paint/tile_element/tile_element.c
@@ -29,7 +29,7 @@
 #include "../../world/scenery.h"
 #include "../../sprites.h"
 #include "../../localisation/localisation.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../supports.h"
 
 #ifdef __TESTPAINT__
diff --git a/src/openrct2/peep/Peep.cpp b/src/openrct2/peep/Peep.cpp
index c3a21dfcf1..eb3c74a5cc 100644
--- a/src/openrct2/peep/Peep.cpp
+++ b/src/openrct2/peep/Peep.cpp
@@ -24,7 +24,7 @@
 #include "../config/Config.h"
 #include "../core/Math.hpp"
 #include "../core/Util.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp
index 2af243b38f..71b9f9b512 100644
--- a/src/openrct2/peep/Staff.cpp
+++ b/src/openrct2/peep/Staff.cpp
@@ -18,7 +18,7 @@
 #include "../core/Util.hpp"
 #include "../Context.h"
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/viewport.h"
 #include "../localisation/date.h"
diff --git a/src/openrct2/platform/shared.c b/src/openrct2/platform/shared.c
index a1c37bf5a6..e1ae6501ba 100644
--- a/src/openrct2/platform/shared.c
+++ b/src/openrct2/platform/shared.c
@@ -30,7 +30,7 @@
 #include "../config/Config.h"
 #include "../drawing/drawing.h"
 #include "../drawing/lightfx.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/currency.h"
 #include "../localisation/localisation.h"
 #include "../util/util.h"
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 98043c8a3c..d79cf49ac6 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -38,7 +38,7 @@
 #include "../audio/audio.h"
 #include "../cheats.h"
 #include "../Editor.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index edb7a8a40e..7f113b62e6 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -28,7 +28,7 @@
 #include <functional>
 
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 5c0f578ec3..9bb11115c3 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -31,7 +31,7 @@
 #include "../ride/Station.h"
 
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/ride/Station.cpp b/src/openrct2/ride/Station.cpp
index 357af6b583..c1a0f6a7e0 100644
--- a/src/openrct2/ride/Station.cpp
+++ b/src/openrct2/ride/Station.cpp
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../game.h"
+#include "../Game.h"
 #include "Station.h"
 #include "Track.h"
 
diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp
index 3d6136e617..dc6916b6ec 100644
--- a/src/openrct2/ride/Track.cpp
+++ b/src/openrct2/ride/Track.cpp
@@ -17,7 +17,7 @@
 #include "../audio/audio.h"
 #include "../cheats.h"
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../localisation/localisation.h"
 #include "../management/Finance.h"
diff --git a/src/openrct2/ride/TrackDesign.cpp b/src/openrct2/ride/TrackDesign.cpp
index 559d2fb2c0..054e3be15e 100644
--- a/src/openrct2/ride/TrackDesign.cpp
+++ b/src/openrct2/ride/TrackDesign.cpp
@@ -25,7 +25,7 @@
 
 #include "../audio/audio.h"
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/localisation.h"
 #include "../localisation/string_ids.h"
 #include "../management/Finance.h"
diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index 0a407db4e7..4d56775a89 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -22,7 +22,7 @@
 #include "../config/Config.h"
 #include "../core/Math.hpp"
 #include "../core/Util.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../localisation/localisation.h"
 #include "../management/NewsItem.h"
diff --git a/src/openrct2/ride/ride.c b/src/openrct2/ride/ride.c
index d03407dfdf..b8a7696659 100644
--- a/src/openrct2/ride/ride.c
+++ b/src/openrct2/ride/ride.c
@@ -23,7 +23,7 @@
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../Editor.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c
index 073a56c8da..ce7880209f 100644
--- a/src/openrct2/ride/track_design_save.c
+++ b/src/openrct2/ride/track_design_save.c
@@ -17,7 +17,7 @@
 #include "../audio/audio.h"
 #include "../config/Config.h"
 #include "../Context.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/localisation.h"
 #include "../localisation/string_ids.h"
 #include "../interface/viewport.h"
diff --git a/src/openrct2/ride/vehicle_paint.c b/src/openrct2/ride/vehicle_paint.c
index 9fa53997a4..df5097dc6f 100644
--- a/src/openrct2/ride/vehicle_paint.c
+++ b/src/openrct2/ride/vehicle_paint.c
@@ -20,7 +20,7 @@
 #include "../ride/ride_data.h"
 #include "Track.h"
 #include "../interface/viewport.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../drawing/lightfx.h"
 #include "vehicle_paint.h"
 
diff --git a/src/openrct2/ride/water/RiverRapids.cpp b/src/openrct2/ride/water/RiverRapids.cpp
index ff7ced9da6..22601cb8a2 100644
--- a/src/openrct2/ride/water/RiverRapids.cpp
+++ b/src/openrct2/ride/water/RiverRapids.cpp
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../../config/Config.h"
-#include "../../game.h"
+#include "../../Game.h"
 #include "../../interface/viewport.h"
 #include "../../paint/paint.h"
 #include "../../paint/supports.h"
diff --git a/src/openrct2/scenario/scenario.c b/src/openrct2/scenario/scenario.c
index f10d51232d..7b52b14b74 100644
--- a/src/openrct2/scenario/scenario.c
+++ b/src/openrct2/scenario/scenario.c
@@ -18,7 +18,7 @@
 #include "../cheats.h"
 #include "../config/Config.h"
 #include "../FileClassifier.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp
index ff8d2be779..c7d5b90497 100644
--- a/src/openrct2/title/TitleScreen.cpp
+++ b/src/openrct2/title/TitleScreen.cpp
@@ -28,7 +28,7 @@
 
 #include "../audio/audio.h"
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../input.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp
index 20cdcfe69b..b147c51c26 100644
--- a/src/openrct2/title/TitleSequencePlayer.cpp
+++ b/src/openrct2/title/TitleSequencePlayer.cpp
@@ -32,7 +32,7 @@
 #include "TitleSequenceManager.h"
 #include "TitleSequencePlayer.h"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
 #include "../management/NewsItem.h"
diff --git a/src/openrct2/windows/EditorObjectSelection.cpp b/src/openrct2/windows/EditorObjectSelection.cpp
index bfec246f2f..039d62a557 100644
--- a/src/openrct2/windows/EditorObjectSelection.cpp
+++ b/src/openrct2/windows/EditorObjectSelection.cpp
@@ -24,7 +24,7 @@
 
 #include <ctype.h>
 #include "../audio/audio.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../Editor.h"
 #include "../interface/widget.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/windows/_legacy.c b/src/openrct2/windows/_legacy.c
index d5df507c0c..a3d1afdf1c 100644
--- a/src/openrct2/windows/_legacy.c
+++ b/src/openrct2/windows/_legacy.c
@@ -21,7 +21,7 @@
 #include "../Context.h"
 #include "../audio/audio.h"
 #include "../input.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../ride/Track.h"
 #include "../ride/TrackData.h"
diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp
index ccfb36d283..7477fae554 100644
--- a/src/openrct2/world/Banner.cpp
+++ b/src/openrct2/world/Banner.cpp
@@ -26,7 +26,7 @@
 #include "map.h"
 #include "park.h"
 #include "scenery.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../ride/ride.h"
diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp
index c182b39c17..ce9b910d0d 100644
--- a/src/openrct2/world/Climate.cpp
+++ b/src/openrct2/world/Climate.cpp
@@ -23,7 +23,7 @@
 #include "../audio/AudioMixer.h"
 #include "../cheats.h"
 #include "../drawing/drawing.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../scenario/scenario.h"
diff --git a/src/openrct2/world/Duck.cpp b/src/openrct2/world/Duck.cpp
index ec2514a77a..721168e2dc 100644
--- a/src/openrct2/world/Duck.cpp
+++ b/src/openrct2/world/Duck.cpp
@@ -19,7 +19,7 @@
 #include "../sprites.h"
 
 #include "../audio/audio.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/date.h"
 #include "../scenario/scenario.h"
 #include "sprite.h"
diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp
index c68b3dc66b..a078f0c073 100644
--- a/src/openrct2/world/Entrance.cpp
+++ b/src/openrct2/world/Entrance.cpp
@@ -22,7 +22,7 @@
 #include "map.h"
 #include "park.h"
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/string_ids.h"
 #include "../management/Finance.h"
 #include "../ride/Track.h"
diff --git a/src/openrct2/world/Fountain.cpp b/src/openrct2/world/Fountain.cpp
index b04c4e67c0..f18c78c312 100644
--- a/src/openrct2/world/Fountain.cpp
+++ b/src/openrct2/world/Fountain.cpp
@@ -16,7 +16,7 @@
 
 #include "Fountain.h"
 
-#include "../game.h"
+#include "../Game.h"
 #include "../scenario/scenario.h"
 #include "footpath.h"
 #include "map.h"
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp
index d6fd5d0828..78d93fc2e3 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/src/openrct2/world/MapGen.cpp
@@ -23,7 +23,7 @@
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
 #include "../core/Util.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../Imaging.h"
 #include "../localisation/string_ids.h"
 #include "../object.h"
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 9bbc971885..81980d1fe3 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -17,7 +17,7 @@
 #include "../common.h"
 #include "../Context.h"
 #include "../core/Guard.hpp"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/window.h"
 #include "../ride/Track.h"
 #include "../windows/Intent.h"
diff --git a/src/openrct2/world/Wall.cpp b/src/openrct2/world/Wall.cpp
index 2d2c7ca003..a29a6ba677 100644
--- a/src/openrct2/world/Wall.cpp
+++ b/src/openrct2/world/Wall.cpp
@@ -19,7 +19,7 @@
 #include "../OpenRCT2.h"
 
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/string_ids.h"
 #include "../ride/Track.h"
 #include "../ride/TrackData.h"
diff --git a/src/openrct2/world/footpath.c b/src/openrct2/world/footpath.c
index 1e6958cabe..4cd1f122bc 100644
--- a/src/openrct2/world/footpath.c
+++ b/src/openrct2/world/footpath.c
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../object_list.h"
diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c
index 87d6c85d35..3753335970 100644
--- a/src/openrct2/world/map.c
+++ b/src/openrct2/world/map.c
@@ -18,7 +18,7 @@
 #include "../cheats.h"
 #include "../config/Config.h"
 #include "../Context.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/Cursors.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
diff --git a/src/openrct2/world/map_animation.c b/src/openrct2/world/map_animation.c
index 7aa003736b..48cc413776 100644
--- a/src/openrct2/world/map_animation.c
+++ b/src/openrct2/world/map_animation.c
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../game.h"
+#include "../Game.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/Track.h"
diff --git a/src/openrct2/world/park.c b/src/openrct2/world/park.c
index c262ad31fd..ce25e24784 100644
--- a/src/openrct2/world/park.c
+++ b/src/openrct2/world/park.c
@@ -16,7 +16,7 @@
 
 #include "../cheats.h"
 #include "../config/Config.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/colour.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
diff --git a/src/openrct2/world/scenery.c b/src/openrct2/world/scenery.c
index da83aec036..4136da5db6 100644
--- a/src/openrct2/world/scenery.c
+++ b/src/openrct2/world/scenery.c
@@ -16,7 +16,7 @@
 
 #include "../common.h"
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../object_list.h"
diff --git a/src/openrct2/world/sprite.c b/src/openrct2/world/sprite.c
index 0113258c8d..d3b45a0b13 100644
--- a/src/openrct2/world/sprite.c
+++ b/src/openrct2/world/sprite.c
@@ -16,7 +16,7 @@
 
 #include "../audio/audio.h"
 #include "../cheats.h"
-#include "../game.h"
+#include "../Game.h"
 #include "../interface/viewport.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
diff --git a/test/tests/MultiLaunch.cpp b/test/tests/MultiLaunch.cpp
index ff51e9f139..af359c7a17 100644
--- a/test/tests/MultiLaunch.cpp
+++ b/test/tests/MultiLaunch.cpp
@@ -10,7 +10,7 @@
 #include "TestData.h"
 
 #include <openrct2/platform/platform.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 
 using namespace OpenRCT2;
 
diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp
index ac4a860fbd..27654ea86f 100644
--- a/test/tests/RideRatings.cpp
+++ b/test/tests/RideRatings.cpp
@@ -9,7 +9,7 @@
 #include "TestData.h"
 
 #include <openrct2/platform/platform.h>
-#include <openrct2/game.h>
+#include <openrct2/Game.h>
 
 using namespace OpenRCT2;