Reduce header inclusion

* Update includes in PlatformEnvironment.cpp

* Update includes in ParkImporter.h

* Update includes of OpenRCT2.h

* Update includes in Intro.h

* Remove unused include from Input.cpp

* Update includes of Imaging.h

* Update includes in Game.h

* Update includes in Editor.h

* Update includes of Context.cpp

* Update includes in Cheats.cpp, CmdlineSprite.cpp

* Update includes of some source files

* Update includes in some cpp files

* Update includes in some cpp files

* Update includes in TextureCache.h

* Fix tests

* Update includes in Font.cpp

* Update includes in LightFX files

* Update some includes

* Fix GCC builds

* Update some includes

* Update some includes

* Update includes in FontsFamilies.*

* Update includes of Console.h

* Improve includes in Window.h

* Improve headers in Viewport.h/Window.h

* Fix MSVC build

* Fix network-less builds

* Reduce inclusion of Map.h

src/openrct2-ui/WindowManager.cpp

@@ -22,6 +22,7 @@
 #include "input/Input.h"
 #include "input/KeyboardShortcuts.h"
 #include "WindowManager.h"
+#include "windows/Window.h"
 
 using namespace OpenRCT2::Ui;
 

src/openrct2-ui/drawing/engines/opengl/TextureCache.h

@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include <algorithm>
 #include <unordered_map>
 #include <vector>
 #include <array>

src/openrct2-ui/windows/TitleEditor.cpp

@@ -19,6 +19,7 @@
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/ParkImporter.h>
 #include <openrct2/scenario/ScenarioSources.h>
+#include <openrct2/scenario/ScenarioRepository.h>
 #include <openrct2/title/TitleScreen.h>
 #include <openrct2/title/TitleSequence.h>
 #include <openrct2/title/TitleSequenceManager.h>

src/openrct2/Cheats.cpp

@@ -16,13 +16,8 @@
 
 #include "Cheats.h"
 #include "config/Config.h"
-#include "Editor.h"
-#include "Game.h"
-#include "interface/Window.h"
 #include "localisation/Localisation.h"
-#include "management/Finance.h"
 #include "network/network.h"
-#include "ride/Station.h"
 #include "util/Util.h"
 #include "world/Climate.h"
 #include "world/Footpath.h"

src/openrct2/CmdlineSprite.cpp

@@ -20,11 +20,10 @@
 #include "CmdlineSprite.h"
 #include "drawing/Drawing.h"
 #include "Imaging.h"
-#include "localisation/Localisation.h"
+#include "localisation/Language.h"
 #include "OpenRCT2.h"
 #include "platform/platform.h"
 #include "util/Util.h"
-#include "png.h"
 
 #define MODE_DEFAULT 0
 #define MODE_CLOSEST 1

src/openrct2/Context.cpp

@@ -57,6 +57,7 @@
 #include "interface/Chat.h"
 #include "interface/Console.h"
 #include "interface/themes.h"
+#include "interface/Viewport.h"
 #include "Intro.h"
 #include "localisation/Date.h"
 #include "localisation/Language.h"
@@ -64,9 +65,7 @@
 #include "network/http.h"
 #include "network/network.h"
 #include "network/twitch.h"
-#include "object/ObjectList.h"
 #include "platform/platform.h"
-#include "rct1/RCT1.h"
 #include "util/Util.h"
 
 using namespace OpenRCT2;

src/openrct2/Context.h

@@ -18,6 +18,9 @@
 
 #include "common.h"
 
+#include <string>
+
+interface IStream;
 class Intent;
 struct rct_window;
 using rct_windowclass = uint8;
@@ -59,12 +62,6 @@ enum
     CURSOR_PRESSED = CURSOR_DOWN | CURSOR_CHANGED,
 };
 
-#ifdef __cplusplus
-
-#include <string>
-
-interface IStream;
-
 namespace OpenRCT2
 {
     interface IPlatformEnvironment;
@@ -109,8 +106,6 @@ namespace OpenRCT2
     IContext * GetContext();
 }
 
-#endif // __cplusplus
-
 enum
 {
     // The game update inverval in milliseconds, (1000 / 40fps) = 25ms

src/openrct2/Diagnostic.cpp

@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <cassert>
 #include <cstdarg>
 #include <cstdio>
 #include "Diagnostic.h"

src/openrct2/Editor.cpp

@@ -29,13 +29,14 @@
 #include "localisation/Localisation.h"
 #include "management/NewsItem.h"
 #include "object/ObjectManager.h"
-#include "object/ObjectRepository.h"
-#include "object/ObjectList.h"
 #include "peep/Staff.h"
 #include "rct1/RCT1.h"
 #include "util/Util.h"
 #include "windows/Intent.h"
 #include "world/Climate.h"
+#include "world/Entrance.h"
+#include "world/Footpath.h"
+#include "world/Scenery.h"
 #include "interface/Window_internal.h"
 
 namespace Editor

src/openrct2/Editor.h

@@ -18,10 +18,6 @@
 #define _EDITOR_H_
 
 #include "common.h"
-#include "object/Object.h"
-
-#ifdef __cplusplus
-#include "object/Object.h"
 
 namespace Editor
 {
@@ -84,5 +80,3 @@ void editor_open_windows_for_current_step();
 void game_command_edit_scenario_options(sint32* eax, sint32* ebx, sint32* ecx, sint32* edx, sint32* esi, sint32* edi, sint32* ebp);
 
 #endif
-
-#endif

src/openrct2/Game.h

@@ -16,8 +16,13 @@
 
 #pragma once
 
+// TODO: only used by handle_park_load_failure, extract to separate header
+#include <string>
+
 #include "common.h"
-#include "scenario/Scenario.h"
+
+struct ParkLoadResult;
+struct rct_s6_data;
 
 enum GAME_COMMAND
 {

src/openrct2/Imaging.cpp

@@ -21,6 +21,7 @@
 #include "core/FileStream.hpp"
 #include "core/Guard.hpp"
 #include "core/Memory.hpp"
+#include "drawing/Drawing.h"
 
 #include "Imaging.h"
 

src/openrct2/Imaging.h

@@ -18,9 +18,8 @@
 
 #include "common.h"
 
-#include "drawing/Drawing.h"
-
-#ifdef __cplusplus
+struct rct_drawpixelinfo;
+struct rct_palette;
 
 namespace Imaging
 {
@@ -29,9 +28,6 @@ namespace Imaging
     bool PngWrite32bpp(sint32 width, sint32 height, const void * pixels, const utf8 * path);
 }
 
-#endif // __cplusplus
-
 bool image_io_png_read(uint8 * * pixels, uint32 * width, uint32 * height, bool expand, const utf8 * path, sint32 * bitDepth);
 bool image_io_png_write(const rct_drawpixelinfo * dpi, const rct_palette * palette, const utf8 * path);
 bool image_io_png_write_32bpp(sint32 width, sint32 height, const void * pixels, const utf8 * path);
-

src/openrct2/Input.cpp

@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "audio/audio.h"
 #include "Context.h"
 #include "Input.h"
 
@@ -85,4 +84,4 @@ void reset_tooltip_not_shown()
 void input_reset_place_obj_modifier()
 {
     gInputPlaceObjectModifier = PLACE_OBJECT_MODIFIER_NONE;
-}
+}

src/openrct2/Intro.h

@@ -17,7 +17,9 @@
 #ifndef _INTRO_H_
 #define _INTRO_H_
 
-#include "drawing/Drawing.h"
+#include "common.h"
+
+struct rct_drawpixelinfo;
 
 enum INTRO_STATE {
     INTRO_STATE_NONE,

src/openrct2/OpenRCT2.h

@@ -17,8 +17,6 @@
 #pragma once
 
 #include "common.h"
-#include "core/Guard.hpp"
-
 
 #ifndef DISABLE_NETWORK
     #include <openssl/evp.h>

src/openrct2/ParkImporter.h

@@ -31,12 +31,12 @@ enum PARK_LOAD_ERROR
 
 #include <string>
 #include <vector>
-#include "scenario/ScenarioRepository.h"
 #include "core/String.hpp"
 
 interface IObjectManager;
 interface IObjectRepository;
 interface IStream;
+struct scenario_index_entry;
 
 struct ParkLoadResult final
 {

src/openrct2/PlatformEnvironment.cpp

@@ -15,15 +15,12 @@
 #pragma endregion
 
 #include "config/Config.h"
-#include "core/Console.hpp"
-#include "core/Guard.hpp"
 #include "core/Path.hpp"
 #include "core/String.hpp"
 #include "OpenRCT2.h"
 #include "platform/platform.h"
 #include "platform/Platform2.h"
 #include "PlatformEnvironment.h"
-#include "Version.h"
 
 using namespace OpenRCT2;
 

src/openrct2/actions/GameAction.cpp

@@ -23,6 +23,7 @@
 #include "../localisation/Localisation.h"
 #include "../network/network.h"
 #include "../platform/platform.h"
+#include "../scenario/Scenario.h"
 #include "../world/Park.h"
 #include "GameAction.h"
 

src/openrct2/audio/Audio.cpp

@@ -20,7 +20,6 @@
 #include "../core/FileStream.hpp"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
-#include "../core/Util.hpp"
 #include "../localisation/StringIds.h"
 #include "../OpenRCT2.h"
 #include "../ui/UiContext.h"

src/openrct2/cmdline/CommandLine.cpp

@@ -14,15 +14,11 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../core/Guard.hpp"
-
-#include "../platform/platform.h"
-#include "../OpenRCT2.h"
-
 #include "../core/Console.hpp"
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
 #include "CommandLine.hpp"
+#include "../OpenRCT2.h"
 
 #pragma region CommandLineArgEnumerator
 

src/openrct2/cmdline/ConvertCommand.cpp

@@ -17,14 +17,12 @@
 #include <memory>
 #include "../common.h"
 #include "../core/Console.hpp"
-#include "../core/Guard.hpp"
 #include "../core/Path.hpp"
 #include "../FileClassifier.h"
 #include "../ParkImporter.h"
 #include "../rct2/S6Exporter.h"
 #include "CommandLine.hpp"
 
-#include "../Game.h"
 #include "../interface/Window.h"
 #include "../OpenRCT2.h"
 

src/openrct2/config/Config.cpp

@@ -26,9 +26,9 @@
 #include "../interface/Window.h"
 #include "../network/network.h"
 #include "../OpenRCT2.h"
-#include "../PlatformEnvironment.h"
 #include "../ui/UiContext.h"
 #include "Config.h"
+#include "ConfigEnum.hpp"
 #include "IniReader.hpp"
 #include "IniWriter.hpp"
 

src/openrct2/config/IniReader.cpp

@@ -17,7 +17,6 @@
 #include <cctype>
 #include <initializer_list>
 #include <string>
-#include <tuple>
 #include <unordered_map>
 #include <vector>
 #include "../common.h"

src/openrct2/config/IniReader.hpp

@@ -18,9 +18,9 @@
 
 #include <string>
 #include "../common.h"
-#include "ConfigEnum.hpp"
 
 interface IStream;
+template <typename T> struct IConfigEnum;
 
 interface IIniReader
 {

src/openrct2/config/IniWriter.hpp

@@ -18,9 +18,9 @@
 
 #include <string>
 #include "../common.h"
-#include "ConfigEnum.hpp"
 
 interface IStream;
+template <typename T> struct IConfigEnum;
 
 interface IIniWriter
 {

src/openrct2/core/File.cpp

@@ -24,9 +24,9 @@
 #include "File.h"
 #include "FileStream.hpp"
 #include "String.hpp"
+#include "../util/Util.h"
 
 #include "../platform/platform.h"
-#include "../util/Util.h"
 
 namespace File
 {

src/openrct2/drawing/Drawing.h

@@ -19,7 +19,6 @@
 
 #include "../common.h"
 #include "../interface/Colour.h"
-#include "Font.h"
 
 struct rct_g1_element {
     uint8* offset;          // 0x00

src/openrct2/drawing/Font.cpp

@@ -14,10 +14,10 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../core/Guard.hpp"
 #include "../core/Util.hpp"
 #include "../localisation/ConversionTables.h"
-#include "../localisation/Localisation.h"
+#include "../localisation/FormatCodes.h"
+#include "../localisation/Language.h"
 #include "../sprites.h"
 #include "Drawing.h"
 #include "Font.h"

src/openrct2/drawing/LightFX.cpp

@@ -23,7 +23,6 @@
 #include "../Game.h"
 #include "../interface/Viewport.h"
 #include "../interface/Window.h"
-#include "../paint/tile_element/TileElement.h"
 #include "../util/Util.h"
 #include "../world/Climate.h"
 #include "Drawing.h"

src/openrct2/drawing/LightFX.h

@@ -20,8 +20,10 @@
 #ifdef __ENABLE_LIGHTFX__
 
 #include "../common.h"
-#include "../world/Map.h"
-#include "Drawing.h"
+
+struct LocationXY16;
+struct rct_drawpixelinfo;
+struct rct_palette;
 
 enum LIGHTFX_LIGHT_TYPE {
     LIGHTFX_LIGHT_TYPE_NONE             = 0,

src/openrct2/drawing/Rect.cpp

@@ -16,7 +16,6 @@
 
 #include "../common.h"
 #include "../interface/Colour.h"
-#include "../platform/platform.h"
 #include "Drawing.h"
 
 /**

src/openrct2/drawing/String.cpp

@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include "../config/Config.h"
-#include "../interface/Colour.h"
 #include "../interface/Viewport.h"
 #include "../localisation/Localisation.h"
 #include "../platform/platform.h"

src/openrct2/drawing/Text.cpp

@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "Drawing.h"
 #include "Text.h"
 
 #include "../localisation/Localisation.h"

src/openrct2/drawing/Text.h

@@ -17,7 +17,8 @@
 #pragma once
 
 #include "../common.h"
-#include "Drawing.h"
+
+struct rct_drawpixelinfo;
 
 enum class TextAlignment
 {

src/openrct2/drawing/X8DrawingEngine.cpp

@@ -18,9 +18,7 @@
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../ui/UiContext.h"
-#include "../core/Guard.hpp"
 #include "../core/Math.hpp"
-#include "../core/Memory.hpp"
 #include "../interface/Screenshot.h"
 #include "IDrawingContext.h"
 #include "IDrawingEngine.h"

src/openrct2/interface/Chat.h

@@ -18,13 +18,14 @@
 #define _CHAT_H_
 
 #include "../common.h"
-#include "../drawing/Drawing.h"
 
 #define CHAT_HISTORY_SIZE 10
 #define CHAT_INPUT_SIZE 1024
 #define CHAT_MAX_MESSAGE_LENGTH 200
 #define CHAT_MAX_WINDOW_WIDTH 600
 
+struct rct_drawpixelinfo;
+
 enum CHAT_INPUT
 {
     CHAT_INPUT_NONE,

src/openrct2/interface/Console.cpp

@@ -21,6 +21,7 @@
 
 #include "../config/Config.h"
 #include "../Context.h"
+#include "../core/Guard.hpp"
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
 #include "../core/Util.hpp"

src/openrct2/interface/Console.h

@@ -18,9 +18,10 @@
 #define _CONSOLE_H_
 
 #include "../common.h"
-#include "../drawing/Drawing.h"
 #include "../localisation/FormatCodes.h"
 
+struct rct_drawpixelinfo;
+
 enum CONSOLE_INPUT
 {
     CONSOLE_INPUT_NONE,

src/openrct2/interface/FontFamilies.cpp

@@ -14,6 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
+#include "Fonts.h"
 #include "FontFamilies.h"
 
 #ifndef NO_TTF

src/openrct2/interface/FontFamilies.h

@@ -22,7 +22,8 @@
 #ifndef NO_TTF
 
 #include <vector>
-#include "Fonts.h"
+
+struct TTFFontSetDescriptor;
 
 using TTFontFamily = std::vector<TTFFontSetDescriptor *>;
 

src/openrct2/interface/Viewport.h

@@ -17,11 +17,18 @@
 #ifndef _VIEWPORT_H_
 #define _VIEWPORT_H_
 
-#include "../world/Map.h"
-#include "../world/Sprite.h"
-#include "../paint/Paint.h"
 #include "Window.h"
 
+struct paint_session;
+struct paint_struct;
+struct rct_drawpixelinfo;
+struct rct_peep;
+struct rct_tile_element;
+struct rct_vehicle;
+struct rct_window;
+union paint_entry;
+union rct_sprite;
+
 enum {
     VIEWPORT_FLAG_UNDERGROUND_INSIDE = (1 << 0),
     VIEWPORT_FLAG_SEETHROUGH_RIDES = (1 << 1),

src/openrct2/interface/Window.h

@@ -18,14 +18,11 @@
 #define _WINDOW_H_
 
 #include "../common.h"
-#include "../drawing/Drawing.h"
-#include "../management/Research.h"
-#include "../peep/Peep.h"
 #include "../ride/Ride.h"
 #include "../ride/TrackDesign.h"
-#include "../ride/Vehicle.h"
 #include "../scenario/Scenario.h"
 #include "../world/Park.h"
+#include "../paint/Paint.h"
 #include "Colour.h"
 
 struct rct_window;

src/openrct2/interface/Window_internal.h

@@ -17,6 +17,8 @@
 #ifndef _WINDOW2_H_
 #define _WINDOW2_H_
 
+struct rct_research_item;
+
 /**
  * Window structure
  * size: 0x4C0

src/openrct2/localisation/Localisation.cpp

@@ -30,13 +30,14 @@
 
 #include "../common.h"
 #include "../config/Config.h"
-#include "../core/Util.hpp"
-#include "../management/Marketing.h"
-#include "../Game.h"
-#include "../util/Util.h"
-#include "Date.h"
-#include "Localisation.h"
 #include "../core/Math.hpp"
+#include "../core/Util.hpp"
+#include "Date.h"
+#include "../Game.h"
+#include "Localisation.h"
+#include "../management/Marketing.h"
+#include "../ride/Ride.h"
+#include "../util/Util.h"
 
 char gCommonStringFormatBuffer[256];
 uint8 gCommonFormatArgs[80];

src/openrct2/network/network.h

@@ -44,6 +44,8 @@ enum {
 #include "NetworkTypes.h"
 
 struct GameAction;
+struct rct_peep;
+struct LocationXYZ16;
 
 #ifndef DISABLE_NETWORK
 

src/openrct2/paint/Paint.h

@@ -17,9 +17,11 @@
 #pragma once
 
 #include "../common.h"
-#include "../world/Map.h"
 #include "../interface/Colour.h"
 #include "../drawing/Drawing.h"
+#include "../world/Location.hpp"
+
+struct rct_tile_element;
 
 #pragma pack(push, 1)
 /* size 0x12 */

src/openrct2/paint/tile_element/Surface.h

@@ -19,7 +19,6 @@
 
 #include "../../common.h"
 #include "../../sprites.h"
-#include "../../world/Map.h"
 
 enum
 {

src/openrct2/peep/Peep.cpp

@@ -22,6 +22,7 @@
 #include "../audio/audio.h"
 #include "../Cheats.h"
 #include "../config/Config.h"
+#include "../core/Guard.hpp"
 #include "../core/Math.hpp"
 #include "../core/Util.hpp"
 #include "../Game.h"

src/openrct2/peep/Peep.h

@@ -19,7 +19,7 @@
 
 #include "../common.h"
 #include "../rct12/RCT12.h"
-#include "../world/Map.h"
+#include "../world/Location.hpp"
 
 #define PEEP_MAX_THOUGHTS 5
 #define PEEP_THOUGHT_ITEM_NONE 255
@@ -38,6 +38,8 @@
 #define PEEP_MAX_ENERGY 128
 #define PEEP_MAX_ENERGY_TARGET 255 // Oddly, this differs from max energy!
 
+struct rct_tile_element;
+
 enum PEEP_TYPE
 {
     PEEP_TYPE_GUEST,

src/openrct2/rct1/RCT1.h

@@ -23,7 +23,6 @@
 #include "../rct12/RCT12.h"
 #include "../ride/Ride.h"
 #include "../world/Banner.h"
-#include "../world/Map.h"
 #include "../world/Sprite.h"
 #include "../world/MapAnimation.h"
 

src/openrct2/rct1/S4Importer.cpp

@@ -32,6 +32,7 @@
 #include "../ParkImporter.h"
 #include "../ride/Station.h"
 #include "../scenario/ScenarioSources.h"
+#include "../scenario/ScenarioRepository.h"
 #include "Tables.h"
 #include "../object/ObjectList.h"
 
@@ -2904,4 +2905,4 @@ static sint32 GetWallType(rct_tile_element * tileElement, sint32 edge)
 static uint8 GetWallColour(rct_tile_element * tileElement)
 {
     return ((tileElement->type & 0xC0) >> 3) | ((tileElement->properties.wall.type & 0xE0) >> 5);
-}
+}

src/openrct2/rct2/RCT2.h

@@ -21,6 +21,7 @@
 #include "../ride/Vehicle.h"
 #include "../common.h"
 #include "../rct12/RCT12.h"
+#include "../world/Location.hpp"
 
 #define RCT2_MAX_STAFF                         200
 #define RCT2_MAX_BANNERS_IN_PARK               250

src/openrct2/rct2/S6Importer.cpp

@@ -44,6 +44,7 @@
 #include "../ride/Ride.h"
 #include "../ride/RideRatings.h"
 #include "../scenario/Scenario.h"
+#include "../scenario/ScenarioRepository.h"
 #include "../util/SawyerCoding.h"
 #include "../world/Climate.h"
 #include "../world/Entrance.h"

src/openrct2/ride/Station.cpp

@@ -17,6 +17,8 @@
 #include "../Game.h"
 #include "Station.h"
 #include "Track.h"
+#include "../scenario/Scenario.h"
+#include "../world/Sprite.h"
 
 static void ride_update_station_blocksection(Ride * ride, sint32 stationIndex);
 static void ride_update_station_bumpercar(Ride * ride, sint32 stationIndex);

src/openrct2/ride/Station.h

@@ -17,7 +17,6 @@
 #pragma once
 
 #include "../common.h"
-#include "../world/Map.h"
 #include "Ride.h"
 
 void ride_update_station(Ride * ride, sint32 stationIndex);
@@ -34,4 +33,4 @@ void ride_clear_entrance_location(Ride * ride, const sint32 stationIndex);
 void ride_clear_exit_location(Ride * ride, const sint32 stationIndex);
 
 void ride_set_entrance_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location);
-void ride_set_exit_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location);
+void ride_set_exit_location(Ride * ride, const sint32 stationIndex, const TileCoordsXYZD location);

src/openrct2/ride/Vehicle.h

@@ -18,7 +18,7 @@
 #define _VEHICLE_H_
 
 #include "../common.h"
-#include "../world/Map.h"
+#include "../world/Location.hpp"
 
 struct rct_vehicle_colour {
     uint8 body_colour;

src/openrct2/world/Park.h

@@ -18,13 +18,14 @@
 #define _PARK_H_
 
 #include "../common.h"
-#include "Map.h"
 
 #define DECRYPT_MONEY(money) ((money32)rol32((money) ^ 0xF4EC9621, 13))
 #define ENCRYPT_MONEY(money) ((money32)(ror32((money), 13) ^ 0xF4EC9621))
 
 #define MAX_ENTRANCE_FEE MONEY(200,00)
 
+struct rct_peep;
+
 enum {
     PARK_FLAGS_PARK_OPEN = (1 << 0),
     PARK_FLAGS_SCENARIO_COMPLETE_NAME_INPUT = (1 << 1),

src/openrct2/world/Sprite.cpp

@@ -17,6 +17,7 @@
 #include <cmath>
 #include "../audio/audio.h"
 #include "../Cheats.h"
+#include "../core/Guard.hpp"
 #include "../core/Math.hpp"
 #include "../Game.h"
 #include "../interface/Viewport.h"

src/openrct2/world/Wall.cpp

@@ -21,10 +21,13 @@
 #include "../Cheats.h"
 #include "../Game.h"
 #include "../localisation/StringIds.h"
+#include "../management/Finance.h"
 #include "../ride/Track.h"
 #include "../ride/TrackData.h"
+#include "Banner.h"
 #include "LargeScenery.h"
 #include "Map.h"
+#include "MapAnimation.h"
 #include "Park.h"
 #include "Scenery.h"
 #include "SmallScenery.h"

test/tests/MultiLaunch.cpp

@@ -7,6 +7,7 @@
 #include <openrct2/core/String.hpp>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/ParkImporter.h>
+#include <openrct2/ride/Ride.h>
 #include "TestData.h"
 
 #include <openrct2/platform/platform.h>

test/tests/RideRatings.cpp

@@ -6,6 +6,7 @@
 #include <openrct2/core/Path.hpp>
 #include <openrct2/core/String.hpp>
 #include <openrct2/OpenRCT2.h>
+#include <openrct2/ride/Ride.h>
 #include "TestData.h"
 
 #include <openrct2/platform/platform.h>