Move screen variables to OpenRCT2.h

src/openrct2-ui/audio/AudioMixer.cpp

@@ -36,7 +36,6 @@ extern "C"
     #include <openrct2/localisation/localisation.h>
     #include <openrct2/OpenRCT2.h>
     #include <openrct2/platform/platform.h>
-    #include <openrct2/rct2.h>
 }
 
 namespace OpenRCT2 { namespace Audio

src/openrct2-ui/input/keyboard_shortcut.c

@@ -23,6 +23,7 @@
 #include <openrct2/interface/Screenshot.h>
 #include <openrct2/localisation/localisation.h>
 #include <openrct2/network/network.h>
+#include <openrct2/OpenRCT2.h>
 #include <openrct2/platform/platform.h>
 #include <openrct2/ride/track.h>
 #include <openrct2/ride/track_paint.h>

src/openrct2/Context.cpp

@@ -63,7 +63,6 @@ extern "C"
     #include "object_list.h"
     #include "platform/platform.h"
     #include "rct1.h"
-    #include "rct2.h"
     #include "rct2/interop.h"
     #include "util/util.h"
 }

src/openrct2/OpenRCT2.cpp

@@ -23,7 +23,6 @@ extern "C"
 {
     #include "audio/audio.h"
     #include "platform/platform.h"
-    #include "rct2.h"
 }
 
 extern "C"
@@ -47,4 +46,9 @@ extern "C"
     // OpenSSL's message digest context used for calculating sprite checksums
     EVP_MD_CTX * gHashCTX = nullptr;
 #endif // DISABLE_NETWORK
+
+    uint32 gCurrentDrawCount = 0;
+    uint8 gScreenFlags;
+    uint32 gScreenAge;
+    uint8 gSavePromptMode;
 }

src/openrct2/OpenRCT2.h

@@ -37,6 +37,18 @@ enum STARTUP_ACTION
     STARTUP_ACTION_EDIT
 };
 
+enum
+{
+    // Although this is labeled a flag it actually means when
+    // zero the screen is in playing mode.
+    SCREEN_FLAGS_PLAYING = 0,
+    SCREEN_FLAGS_TITLE_DEMO = 1,
+    SCREEN_FLAGS_SCENARIO_EDITOR = 2,
+    SCREEN_FLAGS_TRACK_DESIGNER = 4,
+    SCREEN_FLAGS_TRACK_MANAGER = 8,
+    SCREEN_FLAGS_EDITOR = (SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER),
+};
+
 #ifdef __cplusplus
 extern "C"
 {
@@ -67,6 +79,11 @@ extern "C"
     extern char* gNetworkStartAddress;
 #endif
 
+    extern uint32 gCurrentDrawCount;
+    extern uint8 gScreenFlags;
+    extern uint32 gScreenAge;
+    extern uint8 gSavePromptMode;
+
     void openrct2_write_full_version_info(utf8 * buffer, size_t bufferSize);
     void openrct2_finish();
 

src/openrct2/PlatformEnvironment.cpp

@@ -27,7 +27,6 @@
 extern "C"
 {
     #include "platform/platform.h"
-    #include "rct2.h"
 }
 
 using namespace OpenRCT2;

src/openrct2/audio/AudioMixer.cpp

@@ -23,11 +23,6 @@
 #include "AudioMixer.h"
 #include "AudioSource.h"
 
-extern "C"
-{
-    #include "../rct2.h"
-}
-
 using namespace OpenRCT2;
 using namespace OpenRCT2::Audio;
 

src/openrct2/cmdline/ConvertCommand.cpp

@@ -30,7 +30,6 @@ extern "C"
     #include "../game.h"
     #include "../interface/window.h"
     #include "../OpenRCT2.h"
-    #include "../rct2.h"
 }
 
 static void WriteConvertFromAndToMessage(uint32 sourceFileType, uint32 destinationFileType);

src/openrct2/drawing/NewDrawing.cpp

@@ -31,7 +31,6 @@ extern "C"
     #include "../drawing/drawing.h"
     #include "../localisation/string_ids.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
 }
 
 using namespace OpenRCT2;

src/openrct2/drawing/NewDrawing.h

@@ -21,7 +21,6 @@ extern "C"
 {
 #endif
 
-#include "../rct2.h"
 #include "drawing.h"
 
 extern rct_string_id DrawingEngineStringIds[3];

src/openrct2/drawing/X8DrawingEngine.cpp

@@ -33,7 +33,6 @@ extern "C"
     #include "../interface/window.h"
     #include "../intro.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
     #include "drawing.h"
     #include "lightfx.h"
 }

src/openrct2/drawing/drawing.c

@@ -22,7 +22,6 @@
 #include "../object.h"
 #include "../OpenRCT2.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "../world/water.h"
 #include "drawing.h"
 

src/openrct2/drawing/lightfx.c

@@ -18,7 +18,6 @@
 
 #include "../common.h"
 #include "../game.h"
-#include "../rct2.h"
 #include "../interface/viewport.h"
 #include "../interface/window.h"
 #include "../paint/map_element/map_element.h"

src/openrct2/drawing/ttf.c

@@ -20,8 +20,8 @@
 #include FT_FREETYPE_H
 
 #include "../localisation/localisation.h"
+#include "../OpenRCT2.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "ttf.h"
 
 static bool _ttfInitialised = false;

src/openrct2/editor.c

@@ -28,6 +28,7 @@
 #include "network/network.h"
 #include "object.h"
 #include "object/ObjectManager.h"
+#include "OpenRCT2.h"
 #include "peep/staff.h"
 #include "platform/platform.h"
 #include "rct1.h"

src/openrct2/editor.h

@@ -18,7 +18,6 @@
 #define _EDITOR_H_
 
 #include "object.h"
-#include "rct2.h"
 
 typedef enum {
     EDITOR_STEP_OBJECT_SELECTION,           // 0

src/openrct2/input.c

@@ -36,7 +36,6 @@
 #include "world/sprite.h"
 #include "world/scenery.h"
 #include "OpenRCT2.h"
-#include "rct2.h"
 
 typedef struct rct_mouse_data {
     uint32 x;

src/openrct2/interface/Screenshot.cpp

@@ -30,7 +30,6 @@ extern "C"
     #include "../intro.h"
     #include "../localisation/localisation.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
     #include "../util/util.h"
     #include "../windows/error.h"
     #include "viewport.h"

src/openrct2/interface/chat.c

@@ -21,7 +21,6 @@
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "../util/util.h"
 #include "chat.h"
 

src/openrct2/interface/console.c

@@ -30,9 +30,9 @@
 #include "../object.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../OpenRCT2.h"
 #include "../peep/staff.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../util/sawyercoding.h"

src/openrct2/interface/viewport.c

@@ -23,7 +23,6 @@
 #include "../paint/paint.h"
 #include "../paint/supports.h"
 #include "../peep/staff.h"
-#include "../rct2.h"
 #include "../ride/ride_data.h"
 #include "../ride/track_data.h"
 #include "../world/banner.h"

src/openrct2/interface/viewport_interaction.c

@@ -19,6 +19,7 @@
 #include "../game.h"
 #include "../input.h"
 #include "../localisation/localisation.h"
+#include "../OpenRCT2.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/track.h"

src/openrct2/interface/window.c

@@ -26,6 +26,7 @@
 #include "../interface/themes.h"
 #include "../localisation/localisation.h"
 #include "../localisation/string_ids.h"
+#include "../OpenRCT2.h"
 #include "../platform/platform.h"
 #include "../world/map.h"
 #include "../world/sprite.h"

src/openrct2/intro.c

@@ -19,7 +19,6 @@
 #include "Context.h"
 #include "drawing/drawing.h"
 #include "intro.h"
-#include "rct2.h"
 #include "sprites.h"
 
 #define BACKROUND_COLOUR_DARK       PALETTE_INDEX_10

src/openrct2/management/news_item.c

@@ -20,7 +20,7 @@
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../ride/ride.h"
 #include "../util/util.h"
 #include "../world/sprite.h"

src/openrct2/management/research.c

@@ -22,6 +22,7 @@
 #include "../localisation/localisation.h"
 #include "../localisation/string_ids.h"
 #include "../management/finance.h"
+#include "../OpenRCT2.h"
 #include "../scenario/scenario.h"
 #include "../rct1.h"
 #include "../ride/ride.h"

src/openrct2/network/twitch.cpp

@@ -32,6 +32,7 @@
 #include <vector>
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
+#include "../OpenRCT2.h"
 
 extern "C"
 {
@@ -43,7 +44,6 @@ extern "C"
     #include "../management/news_item.h"
     #include "../peep/peep.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
     #include "../util/util.h"
     #include "../world/sprite.h"
     #include "http.h"

src/openrct2/object/ObjectRepository.cpp

@@ -48,7 +48,6 @@ extern "C"
     #include "../object.h"
     #include "../object_list.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
     #include "../util/sawyercoding.h"
     #include "../util/util.h"
 }

src/openrct2/paint/Painter.cpp

@@ -16,6 +16,7 @@
 
 #include "../config/Config.h"
 #include "../drawing/IDrawingEngine.h"
+#include "../OpenRCT2.h"
 #include "../title/TitleScreen.h"
 #include "../ui/UiContext.h"
 #include "Painter.h"

src/openrct2/paint/map_element/surface.c

@@ -17,8 +17,8 @@
 #include "../../cheats.h"
 #include "../../config/Config.h"
 #include "../../interface/viewport.h"
+#include "../../OpenRCT2.h"
 #include "../../peep/staff.h"
-#include "../../rct2.h"
 #include "../../sprites.h"
 #include "map_element.h"
 #include "surface.h"

src/openrct2/peep/peep.c

@@ -28,7 +28,6 @@
 #include "../management/news_item.h"
 #include "../network/network.h"
 #include "../OpenRCT2.h"
-#include "../rct2.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/station.h"

src/openrct2/rct1.h

@@ -21,7 +21,6 @@
 #include "management/news_item.h"
 #include "management/research.h"
 #include "rct12.h"
-#include "rct2.h"
 #include "ride/ride.h"
 #include "world/banner.h"
 #include "world/map.h"

src/openrct2/rct2.c

@@ -1,31 +0,0 @@
-#pragma region Copyright (c) 2014-2017 OpenRCT2 Developers
-/*****************************************************************************
- * OpenRCT2, an open source clone of Roller Coaster Tycoon 2.
- *
- * OpenRCT2 is the work of many authors, a full list can be found in contributors.md
- * For more information, visit https://github.com/OpenRCT2/OpenRCT2
- *
- * OpenRCT2 is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * A full copy of the GNU General Public License can be found in licence.txt
- *****************************************************************************/
-#pragma endregion
-
-#pragma warning(disable : 4996) // GetVersionExA deprecated
-
-#include <time.h>
-#include "audio/audio.h"
-#include "config/Config.h"
-#include "Context.h"
-#include "OpenRCT2.h"
-#include "platform/platform.h"
-#include "util/util.h"
-
-uint32 gCurrentDrawCount = 0;
-
-uint8 gScreenFlags;
-uint32 gScreenAge;
-uint8 gSavePromptMode;

src/openrct2/rct2.h

@@ -76,29 +76,4 @@ assert_struct_size(rct_scores_entry, 0x02B0);
 
 #pragma pack(pop)
 
-enum {
-    // Although this is labeled a flag it actually means when
-    // zero the screen is in playing mode.
-    SCREEN_FLAGS_PLAYING = 0,
-    SCREEN_FLAGS_TITLE_DEMO = 1,
-    SCREEN_FLAGS_SCENARIO_EDITOR = 2,
-    SCREEN_FLAGS_TRACK_DESIGNER = 4,
-    SCREEN_FLAGS_TRACK_MANAGER = 8,
-};
-
-#define SCREEN_FLAGS_EDITOR (SCREEN_FLAGS_SCENARIO_EDITOR | SCREEN_FLAGS_TRACK_DESIGNER | SCREEN_FLAGS_TRACK_MANAGER)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-extern uint32 gCurrentDrawCount;
-extern uint8 gScreenFlags;
-extern uint32 gScreenAge;
-extern uint8 gSavePromptMode;
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif

src/openrct2/rct2/S6Exporter.cpp

@@ -42,7 +42,6 @@ extern "C"
     #include "../object.h"
     #include "../OpenRCT2.h"
     #include "../peep/staff.h"
-    #include "../rct2.h"
     #include "../ride/ride.h"
     #include "../ride/ride_ratings.h"
     #include "../ride/track_data.h"

src/openrct2/rct2/S6Importer.cpp

@@ -42,7 +42,6 @@ extern "C"
     #include "../management/research.h"
     #include "../OpenRCT2.h"
     #include "../peep/staff.h"
-    #include "../rct2.h"
     #include "../ride/ride.h"
     #include "../ride/ride_ratings.h"
     #include "../scenario/scenario.h"

src/openrct2/ride/TrackDesignRepository.cpp

@@ -33,7 +33,6 @@
 
 extern "C"
 {
-    #include "../rct2.h"
     #include "track_design.h"
 }
 

src/openrct2/ride/ride.c

@@ -31,6 +31,7 @@
 #include "../management/news_item.h"
 #include "../network/network.h"
 #include "../object_list.h"
+#include "../OpenRCT2.h"
 #include "../peep/peep.h"
 #include "../peep/staff.h"
 #include "../rct1.h"

src/openrct2/ride/ride_ratings.c

@@ -17,7 +17,7 @@
 #include "../cheats.h"
 #include "../interface/window.h"
 #include "../localisation/date.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../world/map.h"
 #include "ride.h"
 #include "ride_data.h"

src/openrct2/ride/track_design.c

@@ -23,6 +23,7 @@
 #include "../network/network.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../OpenRCT2.h"
 #include "../rct1.h"
 #include "../rct1/Tables.h"
 #include "../util/sawyercoding.h"

src/openrct2/scenario/ScenarioRepository.cpp

@@ -35,7 +35,6 @@ extern "C"
     #include "../config/Config.h"
     #include "../localisation/localisation.h"
     #include "../platform/platform.h"
-    #include "../rct2.h"
     #include "scenario.h"
 }
 

src/openrct2/title/TitleSequencePlayer.cpp

@@ -23,6 +23,7 @@
 #include "../core/Math.hpp"
 #include "../core/Path.hpp"
 #include "../core/String.hpp"
+#include "../OpenRCT2.h"
 #include "../ParkImporter.h"
 #include "../scenario/ScenarioRepository.h"
 #include "../scenario/ScenarioSources.h"

src/openrct2/windows/changelog.c

@@ -22,7 +22,6 @@
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "../util/util.h"
 #include "../world/footpath.h"
 #include "../world/map.h"

src/openrct2/windows/clear_scenery.c

@@ -20,7 +20,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../world/map.h"
 #include "../world/scenery.h"

src/openrct2/windows/debug_paint.c

@@ -21,7 +21,6 @@
 #include "../localisation/localisation.h"
 #include "../paint/map_element/map_element.h"
 #include "../paint/paint.h"
-#include "../rct2.h"
 #include "../ride/track_paint.h"
 #include "../sprites.h"
 #include "../world/map.h"

src/openrct2/windows/dropdown.c

@@ -19,7 +19,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../scenario/scenario.h"
 #include "../sprites.h"
 #include "dropdown.h"

src/openrct2/windows/editor_bottom_toolbar.c

@@ -28,6 +28,7 @@
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
+#include "../OpenRCT2.h"
 #include "../platform/platform.h"
 #include "../ride/track_data.h"
 #include "../util/util.h"

src/openrct2/windows/editor_inventions_list.c

@@ -24,6 +24,7 @@
 #include "../object.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../OpenRCT2.h"
 #include "../rct1.h"
 #include "../sprites.h"
 #include "../util/util.h"

src/openrct2/windows/editor_main.c

@@ -18,7 +18,6 @@
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
-#include "../rct2.h"
 #include "../world/footpath.h"
 
 static void window_editor_main_paint(rct_window *w, rct_drawpixelinfo *dpi);

src/openrct2/windows/editor_object_selection.c

@@ -30,6 +30,7 @@
 #include "../object_list.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../OpenRCT2.h"
 #include "../platform/platform.h"
 #include "../rct1.h"
 #include "../ride/ride.h"

src/openrct2/windows/editor_objective_options.c

@@ -19,7 +19,7 @@
 #include "../interface/window.h"
 #include "../localisation/date.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../scenario/scenario.h"
 #include "../sprites.h"
 #include "../util/util.h"

src/openrct2/windows/editor_scenario_options.c

@@ -20,7 +20,7 @@
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../management/finance.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../sprites.h"
 #include "dropdown.h"
 #include "error.h"

src/openrct2/windows/error.c

@@ -21,7 +21,6 @@
 #include "../localisation/localisation.h"
 #include "../OpenRCT2.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "error.h"
 
 bool gDisableErrorWindowSound = false;

src/openrct2/windows/footpath.c

@@ -21,7 +21,7 @@
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../sprites.h"
 #include "../world/footpath.h"
 #include "dropdown.h"

src/openrct2/windows/game_bottom_toolbar.c

@@ -24,9 +24,9 @@
 #include "../localisation/localisation.h"
 #include "../management/finance.h"
 #include "../management/news_item.h"
+#include "../OpenRCT2.h"
 #include "../peep/peep.h"
 #include "../peep/staff.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../world/Climate.h"
 #include "../world/park.h"

src/openrct2/windows/land.c

@@ -20,13 +20,10 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../world/map.h"
 #include "dropdown.h"
 
-
-
 enum WINDOW_LAND_WIDGET_IDX {
     WIDX_BACKGROUND,
     WIDX_TITLE,

src/openrct2/windows/land_rights.c

@@ -22,7 +22,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../world/map.h"
 

src/openrct2/windows/main.c

@@ -18,7 +18,6 @@
 #include "../interface/viewport.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
-#include "../rct2.h"
 #include "../world/footpath.h"
 
 rct_widget window_main_widgets[] = {

src/openrct2/windows/map.c

@@ -23,7 +23,7 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../sprites.h"
 #include "../world/entrance.h"
 #include "../world/footpath.h"

src/openrct2/windows/new_ride.c

@@ -24,6 +24,7 @@
 #include "../management/research.h"
 #include "../network/network.h"
 #include "../object.h"
+#include "../OpenRCT2.h"
 #include "../rct1.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"

src/openrct2/windows/options.c

@@ -38,7 +38,6 @@
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../platform/platform.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../title/TitleScreen.h"
 #include "../title/TitleSequence.h"

src/openrct2/windows/park.c

@@ -27,7 +27,6 @@
 #include "../interface/window.h"
 #include "../management/award.h"
 #include "../peep/peep.h"
-#include "../rct2.h"
 #include "../ride/ride.h"
 #include "../scenario/scenario.h"
 #include "../sprites.h"

src/openrct2/windows/ride.c

@@ -28,9 +28,9 @@
 #include "../network/network.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
+#include "../OpenRCT2.h"
 #include "../peep/staff.h"
 #include "../rct1.h"
-#include "../rct2.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../ride/RideGroupManager.h"

src/openrct2/windows/save_prompt.c

@@ -21,7 +21,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../OpenRCT2.h"
-#include "../rct2.h"
 #include "../sprites.h"
 
 enum WINDOW_SAVE_PROMPT_WIDGET_IDX {

src/openrct2/windows/scenery.c

@@ -24,7 +24,6 @@
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
 #include "../peep/peep.h"
-#include "../rct2.h"
 #include "../world/map.h"
 #include "../world/scenery.h"
 #include "../world/sprite.h"

src/openrct2/windows/staff_list.c

@@ -24,7 +24,6 @@
 #include "../localisation/localisation.h"
 #include "../peep/peep.h"
 #include "../peep/staff.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../util/util.h"
 #include "../world/footpath.h"

src/openrct2/windows/title_command_editor.c

@@ -21,7 +21,7 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../sprites.h"
 #include "../title/TitleScreen.h"
 #include "../title/TitleSequence.h"

src/openrct2/windows/title_editor.c

@@ -23,6 +23,7 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
+#include "../OpenRCT2.h"
 #include "../ParkImporter.h"
 #include "../peep/peep.h"
 #include "../peep/staff.h"

src/openrct2/windows/title_exit.c

@@ -22,7 +22,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../intro.h"
-#include "../rct2.h"
 
 enum WINDOW_TITLE_EXIT_WIDGET_IDX {
     WIDX_EXIT,

src/openrct2/windows/title_options.c

@@ -21,7 +21,6 @@
 #include "../localisation/localisation.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
-#include "../rct2.h"
 
 enum WINDOW_TITLE_OPTIONS_WIDGET_IDX {
     WIDX_OPTIONS,

src/openrct2/windows/tooltip.c

@@ -20,7 +20,6 @@
 #include "../input.h"
 #include "../interface/widget.h"
 #include "../interface/window.h"
-#include "../rct2.h"
 #include "tooltip.h"
 
 enum {

src/openrct2/windows/top_toolbar.c

@@ -30,6 +30,7 @@
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../network/twitch.h"
+#include "../OpenRCT2.h"
 #include "../ParkImporter.h"
 #include "../peep/staff.h"
 #include "../scenario/scenario.h"

src/openrct2/windows/track_list.c

@@ -22,6 +22,7 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
+#include "../OpenRCT2.h"
 #include "../rct1.h"
 #include "../ride/ride.h"
 #include "../ride/track.h"

src/openrct2/windows/track_manage.c

@@ -19,7 +19,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../ride/track.h"
 #include "../ride/track_design.h"
 #include "../ride/TrackDesignRepository.h"

src/openrct2/windows/view_clipping.c

@@ -20,7 +20,6 @@
 #include "../interface/viewport.h"
 #include "../localisation/localisation.h"
 #include "../paint/paint.h"
-#include "../rct2.h"
 
 enum WINDOW_VIEW_CLIPPING_WIDGET_IDX {
     WIDX_BACKGROUND,

src/openrct2/windows/water.c

@@ -20,7 +20,6 @@
 #include "../interface/widget.h"
 #include "../interface/window.h"
 #include "../localisation/localisation.h"
-#include "../rct2.h"
 #include "../sprites.h"
 #include "../world/map.h"
 

src/openrct2/world/Climate.cpp

@@ -16,6 +16,7 @@
 
 #include "../config/Config.h"
 #include "../core/Math.hpp"
+#include "../OpenRCT2.h"
 #include "Climate.h"
 
 extern "C"
@@ -27,7 +28,6 @@ extern "C"
     #include "../game.h"
     #include "../interface/window.h"
     #include "../localisation/date.h"
-    #include "../rct2.h"
     #include "../scenario/scenario.h"
     #include "../sprites.h"
     #include "../util/util.h"

src/openrct2/world/SmallScenery.cpp

@@ -15,9 +15,7 @@
 #pragma endregion
 
 #include "../network/network.h"
-
-#include "../rct2.h"
-#include "../network/network.h"
+#include "../OpenRCT2.h"
 
 extern "C"
 {

src/openrct2/world/entrance.cpp

@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../rct2.h"
 #include "../network/network.h"
+#include "../OpenRCT2.h"
 
 extern "C"
 {

src/openrct2/world/footpath.c

@@ -19,7 +19,7 @@
 #include "../localisation/localisation.h"
 #include "../network/network.h"
 #include "../object_list.h"
-#include "../rct2.h"
+#include "../OpenRCT2.h"
 #include "../ride/station.h"
 #include "../ride/track.h"
 #include "../ride/track_data.h"

src/openrct2/world/map.c

@@ -27,7 +27,6 @@
 #include "../management/finance.h"
 #include "../network/network.h"
 #include "../OpenRCT2.h"
-#include "../rct2.h"
 #include "../ride/ride_data.h"
 #include "../ride/track.h"
 #include "../ride/track_data.h"

src/openrct2/world/park.c

@@ -26,9 +26,9 @@
 #include "../management/news_item.h"
 #include "../management/research.h"
 #include "../network/network.h"
+#include "../OpenRCT2.h"
 #include "../peep/peep.h"
 #include "../peep/staff.h"
-#include "../rct2.h"
 #include "../ride/ride.h"
 #include "../ride/ride_data.h"
 #include "../scenario/scenario.h"

src/openrct2/world/wall.cpp

@@ -16,6 +16,7 @@
 
 #include "../common.h"
 #include "../network/network.h"
+#include "../OpenRCT2.h"
 
 extern "C"
 {