diff --git a/src/openrct2-ui/input/KeyboardShortcut.cpp b/src/openrct2-ui/input/KeyboardShortcut.cpp index 3fd2f45767..502e8eb36c 100644 --- a/src/openrct2-ui/input/KeyboardShortcut.cpp +++ b/src/openrct2-ui/input/KeyboardShortcut.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include "KeyboardShortcuts.h" uint8 gKeyboardShortcutChangeId; diff --git a/src/openrct2-ui/windows/MapGen.cpp b/src/openrct2-ui/windows/MapGen.cpp index aedbe32918..449491b12e 100644 --- a/src/openrct2-ui/windows/MapGen.cpp +++ b/src/openrct2-ui/windows/MapGen.cpp @@ -16,6 +16,7 @@ #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/ServerStart.cpp b/src/openrct2-ui/windows/ServerStart.cpp index 5ef120a823..f22c185355 100644 --- a/src/openrct2-ui/windows/ServerStart.cpp +++ b/src/openrct2-ui/windows/ServerStart.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2-ui/windows/StaffList.cpp b/src/openrct2-ui/windows/StaffList.cpp index c4703b2458..604ae6e180 100644 --- a/src/openrct2-ui/windows/StaffList.cpp +++ b/src/openrct2-ui/windows/StaffList.cpp @@ -15,6 +15,7 @@ #pragma endregion #include +#include #include #include diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 76e056ef46..81b319ea87 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index acc148ac30..1657e64705 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -57,7 +57,8 @@ #include "interface/console.h" #include "interface/themes.h" #include "intro.h" -#include "localisation/localisation.h" +#include "localisation/date.h" +#include "localisation/language.h" #include "network/http.h" #include "network/network.h" #include "network/twitch.h" diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index f0fc9a122b..d56dcc7995 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -17,7 +17,16 @@ #pragma once #include "common.h" -#include "windows/Intent.h" + +#ifdef __cplusplus +class Intent; +#else +// Allow C code to use `Intent *` +typedef struct Intent Intent; +#endif + +typedef struct rct_window rct_window; +typedef uint8 rct_windowclass; typedef struct CursorState { diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp index 00e5c7c17a..a4b81ed7e0 100644 --- a/src/openrct2/Editor.cpp +++ b/src/openrct2/Editor.cpp @@ -30,6 +30,7 @@ #include "rct1.h" #include "ParkImporter.h" #include "util/util.h" +#include "windows/Intent.h" #include "world/Climate.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index c2db89fddd..b4bc8e0a4d 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -16,7 +16,6 @@ #include "../config/Config.h" #include "../Context.h" -#include "../core/Collections.hpp" #include "../core/File.h" #include "../core/FileStream.hpp" #include "../core/Memory.hpp" diff --git a/src/openrct2/cmdline/CommandLine.hpp b/src/openrct2/cmdline/CommandLine.hpp index 8c45fb3c1f..3037044b02 100644 --- a/src/openrct2/cmdline/CommandLine.hpp +++ b/src/openrct2/cmdline/CommandLine.hpp @@ -19,7 +19,6 @@ #ifdef __cplusplus #include "../common.h" -#include "../cmdline_sprite.h" /** * Class for enumerating and retrieving values for a set of command line arguments. diff --git a/src/openrct2/cmdline/SpriteCommands.cpp b/src/openrct2/cmdline/SpriteCommands.cpp index bc0b7eaf9a..5c782c337a 100644 --- a/src/openrct2/cmdline/SpriteCommands.cpp +++ b/src/openrct2/cmdline/SpriteCommands.cpp @@ -14,6 +14,7 @@ *****************************************************************************/ #pragma endregion +#include "../cmdline_sprite.h" #include "../core/Memory.hpp" #include "../core/String.hpp" #include "CommandLine.hpp" diff --git a/src/openrct2/cmdline/UriHandler.cpp b/src/openrct2/cmdline/UriHandler.cpp index 51f386d503..4a790d17e8 100644 --- a/src/openrct2/cmdline/UriHandler.cpp +++ b/src/openrct2/cmdline/UriHandler.cpp @@ -15,7 +15,6 @@ #pragma endregion #include "../core/Console.hpp" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../network/network.h" #include "../OpenRCT2.h" diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index a06a0126b8..7d9dd44fec 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -21,7 +21,6 @@ #include #endif -#include "Console.hpp" #include "File.h" #include "FileStream.hpp" #include "String.hpp" diff --git a/src/openrct2/drawing/Image.cpp b/src/openrct2/drawing/Image.cpp index 998c4d3109..4c0c5cff6a 100644 --- a/src/openrct2/drawing/Image.cpp +++ b/src/openrct2/drawing/Image.cpp @@ -18,7 +18,6 @@ #include #include "../core/Console.hpp" #include "../core/Guard.hpp" -#include "../core/Memory.hpp" #include "../OpenRCT2.h" #include "drawing.h" diff --git a/src/openrct2/drawing/NewDrawing.cpp b/src/openrct2/drawing/NewDrawing.cpp index 38fa519711..2dc29b8059 100644 --- a/src/openrct2/drawing/NewDrawing.cpp +++ b/src/openrct2/drawing/NewDrawing.cpp @@ -18,7 +18,6 @@ #include "../Context.h" #include "../ui/UiContext.h" #include "../core/Exception.hpp" -#include "../core/Registration.hpp" #include "../interface/Screenshot.h" #include "../paint/Painter.h" #include "IDrawingContext.h" diff --git a/src/openrct2/drawing/NewDrawing.h b/src/openrct2/drawing/NewDrawing.h index 0237f35780..74ceae57cb 100644 --- a/src/openrct2/drawing/NewDrawing.h +++ b/src/openrct2/drawing/NewDrawing.h @@ -16,7 +16,9 @@ #pragma once -#include "drawing.h" +#include "../common.h" + +typedef struct rct_drawpixelinfo rct_drawpixelinfo; #ifdef __cplusplus extern "C" diff --git a/src/openrct2/drawing/Sprite.cpp b/src/openrct2/drawing/Sprite.cpp index 0f0c26d6fc..12abead28f 100644 --- a/src/openrct2/drawing/Sprite.cpp +++ b/src/openrct2/drawing/Sprite.cpp @@ -18,11 +18,9 @@ #include "../common.h" #include "../config/Config.h" #include "../Context.h" -#include "../core/File.h" #include "../core/FileStream.hpp" #include "../core/Memory.hpp" #include "../core/Path.hpp" -#include "../core/Util.hpp" #include "../OpenRCT2.h" #include "../PlatformEnvironment.h" #include "../sprites.h" diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 288910d1bd..1ad7446fb2 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -30,7 +30,6 @@ #include "../interface/viewport.h" #include "../interface/window.h" #include "../intro.h" -#include "../platform/platform.h" #include "drawing.h" #include "lightfx.h" diff --git a/src/openrct2/game.c b/src/openrct2/game.c index c08911462e..6dc5e7c810 100644 --- a/src/openrct2/game.c +++ b/src/openrct2/game.c @@ -48,6 +48,7 @@ #include "title/TitleScreen.h" #include "util/sawyercoding.h" #include "util/util.h" +#include "windows/Intent.h" #include "windows/tooltip.h" #include "world/banner.h" #include "world/Climate.h" diff --git a/src/openrct2/interface/Screenshot.cpp b/src/openrct2/interface/Screenshot.cpp index 5fe3e634d3..550d512edf 100644 --- a/src/openrct2/interface/Screenshot.cpp +++ b/src/openrct2/interface/Screenshot.cpp @@ -16,7 +16,6 @@ #include #include "../audio/audio.h" -#include "../config/Config.h" #include "../Context.h" #include "../core/Console.hpp" #include "../Imaging.h" diff --git a/src/openrct2/interface/Screenshot.h b/src/openrct2/interface/Screenshot.h index 0fbcc3b6a1..e7cd27d944 100644 --- a/src/openrct2/interface/Screenshot.h +++ b/src/openrct2/interface/Screenshot.h @@ -16,7 +16,9 @@ #pragma once -#include "../drawing/drawing.h" +#include "../common.h" + +typedef struct rct_drawpixelinfo rct_drawpixelinfo; #ifdef __cplusplus extern "C" diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index 8e01ee5cd1..14cfb5bfba 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -31,7 +31,7 @@ #include "../core/Path.hpp" #include "../core/String.hpp" #include "../core/Util.hpp" -#include "../localisation/localisation.h" +#include "../localisation/language.h" #include "../localisation/string_ids.h" struct WindowThemeDesc; diff --git a/src/openrct2/interface/console.c b/src/openrct2/interface/console.c index 2087938510..7d2243a903 100644 --- a/src/openrct2/interface/console.c +++ b/src/openrct2/interface/console.c @@ -39,6 +39,7 @@ #include "../util/sawyercoding.h" #include "../util/util.h" #include "../Version.h" +#include "../windows/Intent.h" #include "../world/Climate.h" #include "../world/park.h" #include "../world/scenery.h" diff --git a/src/openrct2/interface/viewport_interaction.c b/src/openrct2/interface/viewport_interaction.c index 6aefdeaf57..17567494d9 100644 --- a/src/openrct2/interface/viewport_interaction.c +++ b/src/openrct2/interface/viewport_interaction.c @@ -24,6 +24,7 @@ #include "../ride/ride_data.h" #include "../ride/Track.h" #include "../scenario/scenario.h" +#include "../windows/Intent.h" #include "../world/banner.h" #include "../world/footpath.h" #include "../world/map.h" diff --git a/src/openrct2/localisation/Language.cpp b/src/openrct2/localisation/Language.cpp index d21b75d1aa..c019e39caf 100644 --- a/src/openrct2/localisation/Language.cpp +++ b/src/openrct2/localisation/Language.cpp @@ -15,8 +15,6 @@ #pragma endregion #include -#include "../core/Console.hpp" -#include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" #include "../core/StringBuilder.hpp" diff --git a/src/openrct2/management/Award.cpp b/src/openrct2/management/Award.cpp index 697d64f3f5..c6529c0997 100644 --- a/src/openrct2/management/Award.cpp +++ b/src/openrct2/management/Award.cpp @@ -17,11 +17,10 @@ #include "../config/Config.h" #include "../core/Util.hpp" #include "../interface/window.h" -#include "../localisation/localisation.h" +#include "../localisation/string_ids.h" #include "../peep/Peep.h" #include "../ride/ride.h" #include "../scenario/scenario.h" -#include "../world/sprite.h" #include "Award.h" #include "NewsItem.h" diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index d9b74bcb79..bc90d1ac39 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -24,6 +24,7 @@ #include "../OpenRCT2.h" #include "../ride/ride.h" #include "../util/util.h" +#include "../windows/Intent.h" #include "../world/sprite.h" #include "NewsItem.h" diff --git a/src/openrct2/management/Research.h b/src/openrct2/management/Research.h index d5c557d232..eefeaa60e0 100644 --- a/src/openrct2/management/Research.h +++ b/src/openrct2/management/Research.h @@ -17,7 +17,8 @@ #pragma once #include "../common.h" -#include "../ride/ride.h" + +typedef struct rct_ride_entry rct_ride_entry; #pragma pack(push, 1) typedef struct rct_research_item { diff --git a/src/openrct2/network/Http.cpp b/src/openrct2/network/Http.cpp index 67b7bd0938..a0cd0d8517 100644 --- a/src/openrct2/network/Http.cpp +++ b/src/openrct2/network/Http.cpp @@ -27,8 +27,6 @@ void http_dispose() { } #include "../core/Console.hpp" #include "../core/Math.hpp" -#include "../core/Path.hpp" -#include "../core/String.hpp" #include "../Version.h" #ifdef _WIN32 diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 433222bb0c..53156f3004 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -60,8 +60,6 @@ static sint32 _pickup_peep_old_x = LOCATION_NULL; #include "../interface/window.h" #include "../localisation/date.h" #include "../localisation/localisation.h" -#include "../management/Finance.h" -#include "../network/http.h" #include "../scenario/scenario.h" #include "../util/util.h" #include "../cheats.h" diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index 3186dc3890..7b6b51f758 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -28,8 +28,8 @@ #include "NetworkTypes.h" #include "NetworkKey.h" #include "NetworkPacket.h" -#include "TcpSocket.h" +interface ITcpSocket; class NetworkPlayer; struct ObjectRepositoryItem; diff --git a/src/openrct2/object.h b/src/openrct2/object.h index 92965f6778..63964e3606 100644 --- a/src/openrct2/object.h +++ b/src/openrct2/object.h @@ -18,7 +18,6 @@ #define _OBJECT_H_ #include "common.h" -#include "drawing/drawing.h" // First 0xF of rct_object_entry->flags typedef enum diff --git a/src/openrct2/object/BannerObject.cpp b/src/openrct2/object/BannerObject.cpp index a32c732a8b..c9512dcb11 100644 --- a/src/openrct2/object/BannerObject.cpp +++ b/src/openrct2/object/BannerObject.cpp @@ -15,11 +15,10 @@ #pragma endregion #include "../core/IStream.hpp" -#include "../core/Memory.hpp" #include "BannerObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" void BannerObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp index 24ebe52e3e..c2fc60f1f4 100644 --- a/src/openrct2/object/FootpathObject.cpp +++ b/src/openrct2/object/FootpathObject.cpp @@ -18,7 +18,7 @@ #include "FootpathObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" #include "../world/footpath.h" void FootpathObject::ReadLegacy(IReadObjectContext * context, IStream * stream) diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp index 1390968a0d..824bb12897 100644 --- a/src/openrct2/object/ImageTable.cpp +++ b/src/openrct2/object/ImageTable.cpp @@ -14,7 +14,6 @@ *****************************************************************************/ #pragma endregion -#include "../core/Console.hpp" #include "../core/IStream.hpp" #include "../core/Memory.hpp" #include "../OpenRCT2.h" diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index da420d1f1c..653c8942cd 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -19,7 +19,7 @@ #include "LargeSceneryObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" LargeSceneryObject::~LargeSceneryObject() { diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 8303b394d8..19ff6bddf0 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -16,9 +16,10 @@ #include "../core/Memory.hpp" #include "../core/String.hpp" +#include "../localisation/language.h" +#include "../localisation/string_ids.h" #include "Object.h" -#include "../localisation/localisation.h" Object::Object(const rct_object_entry &entry) { diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 18f1dabc3a..c2e98031b3 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -18,7 +18,6 @@ #include "../core/FileStream.hpp" #include "../core/Memory.hpp" #include "../core/MemoryStream.h" -#include "../core/Path.hpp" #include "../core/String.hpp" #include "../rct12/SawyerChunkReader.h" #include "BannerObject.h" @@ -36,7 +35,6 @@ #include "WaterObject.h" #include "../object.h" -#include "../util/sawyercoding.h" class ReadObjectContext : public IReadObjectContext { diff --git a/src/openrct2/object/ObjectRepository.h b/src/openrct2/object/ObjectRepository.h index 8669d08c00..7a87d5dd50 100644 --- a/src/openrct2/object/ObjectRepository.h +++ b/src/openrct2/object/ObjectRepository.h @@ -36,6 +36,8 @@ typedef struct Object Object; #endif +typedef struct rct_drawpixelinfo rct_drawpixelinfo; + typedef struct ObjectRepositoryItem { size_t Id; diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 9423080613..98b34cd3cc 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -17,16 +17,14 @@ #include "../core/IStream.hpp" #include "../core/Memory.hpp" #include "../core/String.hpp" -#include "../core/Util.hpp" #include "../OpenRCT2.h" #include "ObjectRepository.h" #include "RideObject.h" #include "../ride/RideGroupManager.h" -#include "../config/Config.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" -#include "../rct1.h" +#include "../localisation/language.h" +#include "../rct2.h" #include "../ride/ride.h" #include "../ride/Track.h" diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index fe20b0f63f..0d183e672b 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -21,7 +21,7 @@ #include "SceneryGroupObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" SceneryGroupObject::~SceneryGroupObject() { diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 725c782e97..f9c2a49730 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -20,7 +20,7 @@ #include "SmallSceneryObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" SmallSceneryObject::~SmallSceneryObject() { diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index 8da8351d49..abde8c11a6 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -17,12 +17,11 @@ #include #include "../core/IStream.hpp" #include "../core/String.hpp" +#include "../localisation/language.h" #include "../localisation/LanguagePack.h" #include "Object.h" #include "StringTable.h" -#include "../localisation/localisation.h" - static bool StringIsBlank(utf8 * str) { for (utf8 * ch = str; *ch != '\0'; ch++) diff --git a/src/openrct2/object/WallObject.cpp b/src/openrct2/object/WallObject.cpp index e799d45706..e6fd27a070 100644 --- a/src/openrct2/object/WallObject.cpp +++ b/src/openrct2/object/WallObject.cpp @@ -15,11 +15,10 @@ #pragma endregion #include "../core/IStream.hpp" -#include "../core/Memory.hpp" #include "WallObject.h" #include "../drawing/drawing.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" void WallObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp index 1d7b464153..66954ed817 100644 --- a/src/openrct2/object/WaterObject.cpp +++ b/src/openrct2/object/WaterObject.cpp @@ -15,11 +15,11 @@ #pragma endregion #include "../core/IStream.hpp" +#include "../localisation/language.h" +#include "../localisation/string_ids.h" #include "../OpenRCT2.h" #include "WaterObject.h" -#include "../localisation/localisation.h" - void WaterObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { stream->Seek(14, STREAM_SEEK_CURRENT); diff --git a/src/openrct2/paint/Paint.cpp b/src/openrct2/paint/Paint.cpp index ad85992811..5089eca20e 100644 --- a/src/openrct2/paint/Paint.cpp +++ b/src/openrct2/paint/Paint.cpp @@ -22,7 +22,6 @@ #include "../core/Math.hpp" #include "map_element/map_element.h" #include "sprite/sprite.h" -#include "supports.h" #include diff --git a/src/openrct2/paint/Painter.cpp b/src/openrct2/paint/Painter.cpp index 0fbc28eb5a..debe250d41 100644 --- a/src/openrct2/paint/Painter.cpp +++ b/src/openrct2/paint/Painter.cpp @@ -26,7 +26,8 @@ #include "../interface/chat.h" #include "../interface/console.h" #include "../intro.h" -#include "../localisation/localisation.h" +#include "../localisation/language.h" +#include "../localisation/format_codes.h" using namespace OpenRCT2; using namespace OpenRCT2::Drawing; diff --git a/src/openrct2/ride/track_design_save.c b/src/openrct2/ride/track_design_save.c index f3e1258558..caf84c125c 100644 --- a/src/openrct2/ride/track_design_save.c +++ b/src/openrct2/ride/track_design_save.c @@ -22,6 +22,7 @@ #include "../interface/viewport.h" #include "../util/sawyercoding.h" #include "../util/util.h" +#include "../windows/Intent.h" #include "../world/scenery.h" #include "ride_data.h" #include "Track.h" diff --git a/src/openrct2/title/TitleSequencePlayer.cpp b/src/openrct2/title/TitleSequencePlayer.cpp index b57ce85475..5ed4896619 100644 --- a/src/openrct2/title/TitleSequencePlayer.cpp +++ b/src/openrct2/title/TitleSequencePlayer.cpp @@ -35,6 +35,7 @@ #include "../interface/viewport.h" #include "../interface/window.h" #include "../management/NewsItem.h" +#include "../windows/Intent.h" #include "../world/scenery.h" using namespace OpenRCT2; diff --git a/src/openrct2/windows/EditorBottomToolbar.cpp b/src/openrct2/windows/EditorBottomToolbar.cpp index 0d3cd2b46c..43a30b2a34 100644 --- a/src/openrct2/windows/EditorBottomToolbar.cpp +++ b/src/openrct2/windows/EditorBottomToolbar.cpp @@ -27,6 +27,7 @@ #include "../localisation/localisation.h" #include "../interface/themes.h" #include "../interface/widget.h" +#include "../windows/Intent.h" #include "../world/scenery.h" enum { diff --git a/src/openrct2/windows/EditorObjectSelection.cpp b/src/openrct2/windows/EditorObjectSelection.cpp index 1690f285ea..ac0b026b12 100644 --- a/src/openrct2/windows/EditorObjectSelection.cpp +++ b/src/openrct2/windows/EditorObjectSelection.cpp @@ -32,6 +32,7 @@ #include "../rct1.h" #include "../ride/ride_data.h" #include "../util/util.h" +#include "../windows/Intent.h" #include "dropdown.h" #include "../sprites.h" #include "_legacy.h" diff --git a/src/openrct2/windows/TopToolbar.cpp b/src/openrct2/windows/TopToolbar.cpp index f1851bd032..8d7562b7a3 100644 --- a/src/openrct2/windows/TopToolbar.cpp +++ b/src/openrct2/windows/TopToolbar.cpp @@ -36,6 +36,7 @@ #include "../network/twitch.h" #include "../peep/Staff.h" #include "../util/util.h" +#include "../windows/Intent.h" #include "../world/footpath.h" #include "../world/scenery.h" #include "dropdown.h" diff --git a/src/openrct2/windows/TrackList.cpp b/src/openrct2/windows/TrackList.cpp index 2702a10cf4..e4a7444ab3 100644 --- a/src/openrct2/windows/TrackList.cpp +++ b/src/openrct2/windows/TrackList.cpp @@ -27,6 +27,7 @@ #include "../localisation/localisation.h" #include "../rct1.h" #include "../sprites.h" +#include "../windows/Intent.h" enum { WIDX_BACKGROUND, diff --git a/src/openrct2/world/map.c b/src/openrct2/world/map.c index aedde2dc6a..6ce12209f6 100644 --- a/src/openrct2/world/map.c +++ b/src/openrct2/world/map.c @@ -32,6 +32,7 @@ #include "../ride/track_data.h" #include "../scenario/scenario.h" #include "../util/util.h" +#include "../windows/Intent.h" #include "banner.h" #include "Climate.h" #include "footpath.h"