Reduce header inclusions

src/openrct2/CmdlineSprite.cpp

@@ -22,7 +22,6 @@
 #include "CmdlineSprite.h"
 #include "drawing/Drawing.h"
 #include "Imaging.h"
-#include "localisation/Language.h"
 #include "OpenRCT2.h"
 #include "platform/platform.h"
 #include "util/Util.h"

src/openrct2/OpenRCT2.cpp

@@ -14,14 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "core/Console.hpp"
-#include "core/File.h"
-#include "core/FileStream.hpp"
 #include "OpenRCT2.h"
 
-#include "audio/audio.h"
-#include "platform/platform.h"
-
 sint32 gExitCode;
 sint32 gOpenRCT2StartupAction = STARTUP_ACTION_TITLE;
 utf8 gOpenRCT2StartupActionPath[512] = { 0 };
@@ -46,4 +40,3 @@ uint32 gCurrentDrawCount = 0;
 uint8 gScreenFlags;
 uint32 gScreenAge;
 uint8 gSavePromptMode;
-

src/openrct2/Version.cpp

@@ -15,7 +15,6 @@
 #pragma endregion
 
 #include <string>
-#include "core/String.hpp"
 #include "Version.h"
 
 #ifdef OPENRCT2_BUILD_INFO_HEADER

src/openrct2/cmdline/CommandLine.cpp

@@ -19,8 +19,8 @@
 #include "../core/Console.hpp"
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
-#include "CommandLine.hpp"
 #include "../OpenRCT2.h"
+#include "CommandLine.hpp"
 
 #pragma region CommandLineArgEnumerator
 

src/openrct2/cmdline/RootCommands.cpp

@@ -16,8 +16,6 @@
 
 #include <ctime>
 
-#include "../core/Guard.hpp"
-
 #include "../config/Config.h"
 #include "../platform/Crash.h"
 #include "../platform/platform.h"

src/openrct2/config/IniReader.cpp

@@ -20,7 +20,7 @@
 #include <unordered_map>
 #include <vector>
 #include "../common.h"
-#include "../core/FileStream.hpp"
+#include "../core/IStream.hpp"
 #include "../core/String.hpp"
 #include "../core/StringBuilder.hpp"
 #include "IniReader.hpp"

src/openrct2/config/IniWriter.cpp

@@ -15,7 +15,8 @@
 #pragma endregion
 
 #include <sstream>
-#include "../core/FileStream.hpp"
+#include "../core/IStream.hpp"
+#include "../core/String.hpp"
 #include "IniWriter.hpp"
 
 #include "../platform/platform.h"

src/openrct2/core/FileScanner.cpp

@@ -40,8 +40,6 @@
 #include "Path.hpp"
 #include "String.hpp"
 
-#include "../platform/platform.h"
-
 enum class DIRECTORY_CHILD_TYPE
 {
     DC_DIRECTORY,

src/openrct2/core/Guard.cpp

@@ -15,8 +15,7 @@
 #pragma endregion
 
 #include <cassert>
-#include <cstdarg>
-#include <cstdio>
+#include <cstdlib>
 
 #include "../common.h"
 

src/openrct2/core/Path.cpp

@@ -20,7 +20,6 @@
 #endif
 
 #include "../platform/platform.h"
-#include "../localisation/Localisation.h"
 #include "../util/Util.h"
 
 #include "File.h"
@@ -28,7 +27,6 @@
 #include "Memory.hpp"
 #include "Path.hpp"
 #include "String.hpp"
-#include "Util.hpp"
 
 namespace Path
 {

src/openrct2/core/String.cpp

@@ -14,12 +14,11 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <algorithm>
 #include <cwctype>
 #include <stdexcept>
 #include <vector>
 
-#include "../localisation/Localisation.h"
+#include "../localisation/Language.h"
 #include "../util/Util.h"
 
 #include "Math.hpp"

src/openrct2/drawing/Drawing.cpp

@@ -17,8 +17,6 @@
 #include "../common.h"
 #include "../Context.h"
 #include "../core/Guard.hpp"
-#include "../interface/Window.h"
-#include "../localisation/Localisation.h"
 #include "../object/Object.h"
 #include "../OpenRCT2.h"
 #include "../platform/platform.h"

src/openrct2/drawing/Image.cpp

@@ -16,7 +16,6 @@
 
 #include <algorithm>
 #include <list>
-#include "../core/Console.hpp"
 #include "../core/Guard.hpp"
 #include "../OpenRCT2.h"
 

src/openrct2/drawing/NewDrawing.cpp

@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <stdexcept>
 #include "../Context.h"
 #include "../ui/UiContext.h"
 #include "../interface/Screenshot.h"
@@ -26,7 +25,6 @@
 #include "../config/Config.h"
 #include "../drawing/Drawing.h"
 #include "../localisation/StringIds.h"
-#include "../platform/platform.h"
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Drawing;

src/openrct2/drawing/TTFSDLPort.cpp

@@ -27,7 +27,7 @@ misrepresented as being the original software.
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <math.h>
+#include <cmath>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/openrct2/interface/Console.cpp

@@ -25,13 +25,10 @@
 #include "../core/Guard.hpp"
 #include "../core/Math.hpp"
 #include "../core/String.hpp"
-#include "../core/Util.hpp"
 #include "../drawing/Drawing.h"
 #include "../drawing/Font.h"
-#include "../Editor.h"
 #include "../EditorObjectSelectionSession.h"
 #include "../Game.h"
-#include "../Input.h"
 #include "../interface/Colour.h"
 #include "../interface/themes.h"
 #include "../localisation/Localisation.h"
@@ -39,17 +36,14 @@
 #include "../management/Finance.h"
 #include "../management/Research.h"
 #include "../network/network.h"
-#include "../network/twitch.h"
 #include "../object/Object.h"
 #include "../object/ObjectList.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
 #include "../OpenRCT2.h"
 #include "../peep/Staff.h"
-#include "../platform/platform.h"
 #include "../ride/Ride.h"
 #include "../ride/RideData.h"
-#include "../util/SawyerCoding.h"
 #include "../util/Util.h"
 #include "../Version.h"
 #include "../windows/Intent.h"

src/openrct2/interface/Fonts.cpp

@@ -15,13 +15,10 @@
 #pragma endregion
 
 #include "../config/Config.h"
-#include "../core/Console.hpp"
 #include "../core/String.hpp"
-#include "../localisation/LanguagePack.h"
 #include "Fonts.h"
 #include "FontFamilies.h"
 
-#include "../drawing/Drawing.h"
 #include "../drawing/TTF.h"
 #include "../localisation/Language.h"
 

src/openrct2/interface/Theme.cpp

@@ -26,12 +26,11 @@
 #include "../Context.h"
 #include "../core/File.h"
 #include "../core/FileScanner.h"
+#include "../core/Guard.hpp"
 #include "../core/Json.hpp"
 #include "../core/Math.hpp"
-#include "../core/Memory.hpp"
 #include "../core/Path.hpp"
 #include "../core/String.hpp"
-#include "../core/Util.hpp"
 #include "../localisation/Language.h"
 #include "../localisation/StringIds.h"
 #include "../PlatformEnvironment.h"

src/openrct2/interface/Viewport.cpp

@@ -15,25 +15,19 @@
 #pragma endregion
 
 #include <algorithm>
+#include <cstring>
+
 #include "../config/Config.h"
 #include "../Context.h"
 #include "../core/Math.hpp"
 #include "../drawing/Drawing.h"
 #include "../Game.h"
 #include "../Input.h"
-#include "../localisation/Localisation.h"
 #include "../OpenRCT2.h"
 #include "../paint/Paint.h"
-#include "../paint/Supports.h"
 #include "../peep/Staff.h"
-#include "../ride/RideData.h"
-#include "../ride/TrackData.h"
-#include "../world/Banner.h"
 #include "../world/Climate.h"
-#include "../world/Entrance.h"
-#include "../world/Footpath.h"
 #include "../world/Map.h"
-#include "../world/Scenery.h"
 #include "../world/Sprite.h"
 #include "Colour.h"
 #include "Viewport.h"

src/openrct2/interface/ViewportInteraction.cpp

@@ -14,7 +14,6 @@
  *****************************************************************************/
 #pragma endregion
 
-#include "../Cheats.h"
 #include "../core/Math.hpp"
 #include "../Editor.h"
 #include "../Game.h"

src/openrct2/interface/Widget.cpp

@@ -16,10 +16,8 @@
 
 #include <algorithm>
 #include <cmath>
-#include "../drawing/Drawing.h"
 #include "../Input.h"
 #include "../sprites.h"
-#include "../platform/platform.h"
 #include "../localisation/Localisation.h"
 #include "../util/Util.h"
 #include "../Context.h"