diff --git a/src/openrct2-ui/TextComposition.cpp b/src/openrct2-ui/TextComposition.cpp index 5fd44f9b36..911472f4cb 100644 --- a/src/openrct2-ui/TextComposition.cpp +++ b/src/openrct2-ui/TextComposition.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/src/openrct2/actions/GameActionRunner.cpp b/src/openrct2/actions/GameActionRunner.cpp index 0da89879e7..422646bbfa 100644 --- a/src/openrct2/actions/GameActionRunner.cpp +++ b/src/openrct2/actions/GameActionRunner.cpp @@ -15,7 +15,6 @@ #include "../GameState.h" #include "../ReplayManager.h" #include "../core/Guard.hpp" -#include "../core/Memory.hpp" #include "../core/MemoryStream.h" #include "../entity/MoneyEffect.h" #include "../localisation/Formatter.h" diff --git a/src/openrct2/actions/ride/RideCreateAction.cpp b/src/openrct2/actions/ride/RideCreateAction.cpp index 180f6d4eba..072a783423 100644 --- a/src/openrct2/actions/ride/RideCreateAction.cpp +++ b/src/openrct2/actions/ride/RideCreateAction.cpp @@ -13,7 +13,6 @@ #include "../../Context.h" #include "../../Diagnostic.h" #include "../../GameState.h" -#include "../../core/Memory.hpp" #include "../../core/MemoryStream.h" #include "../../localisation/Localisation.Date.h" #include "../../localisation/StringIds.h" diff --git a/src/openrct2/audio/Audio.cpp b/src/openrct2/audio/Audio.cpp index 43e11b7eae..55a44bea97 100644 --- a/src/openrct2/audio/Audio.cpp +++ b/src/openrct2/audio/Audio.cpp @@ -16,7 +16,6 @@ #include "../core/EnumUtils.hpp" #include "../core/File.h" #include "../core/FileStream.h" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../entity/Peep.h" #include "../interface/Viewport.h" diff --git a/src/openrct2/command_line/RootCommands.cpp b/src/openrct2/command_line/RootCommands.cpp index 31ecadc68b..3d5d0d47d7 100644 --- a/src/openrct2/command_line/RootCommands.cpp +++ b/src/openrct2/command_line/RootCommands.cpp @@ -15,7 +15,6 @@ #include "../core/Console.hpp" #include "../core/File.h" #include "../core/Guard.hpp" -#include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" #include "../localisation/Language.h" diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 2638887a5d..79ac931da1 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -21,7 +21,6 @@ #include "../platform/Platform.h" #include "FileScanner.h" -#include "Memory.hpp" #include "Numerics.hpp" #include "Path.hpp" #include "String.hpp" diff --git a/src/openrct2/core/Imaging.cpp b/src/openrct2/core/Imaging.cpp index e9fda0c62c..5c6373fd5c 100644 --- a/src/openrct2/core/Imaging.cpp +++ b/src/openrct2/core/Imaging.cpp @@ -17,7 +17,6 @@ #include "FileSystem.hpp" #include "Guard.hpp" #include "IStream.hpp" -#include "Memory.hpp" #include "String.hpp" #include diff --git a/src/openrct2/core/Json.cpp b/src/openrct2/core/Json.cpp index 3ec99b4775..391c446cd8 100644 --- a/src/openrct2/core/Json.cpp +++ b/src/openrct2/core/Json.cpp @@ -11,7 +11,6 @@ #include "../Diagnostic.h" #include "FileStream.h" -#include "Memory.hpp" #include "String.hpp" namespace OpenRCT2::Json diff --git a/src/openrct2/core/Path.cpp b/src/openrct2/core/Path.cpp index e8ed912f7c..c31c3be99e 100644 --- a/src/openrct2/core/Path.cpp +++ b/src/openrct2/core/Path.cpp @@ -12,7 +12,6 @@ #include "../platform/Platform.h" #include "File.h" #include "FileSystem.hpp" -#include "Memory.hpp" #include "String.hpp" #include diff --git a/src/openrct2/core/String.cpp b/src/openrct2/core/String.cpp index 8136cd6988..35607ac752 100644 --- a/src/openrct2/core/String.cpp +++ b/src/openrct2/core/String.cpp @@ -8,9 +8,11 @@ *****************************************************************************/ #include "../Diagnostic.h" +#include "../core/Guard.hpp" #include #include +#include #include #include #include @@ -33,7 +35,6 @@ #include #endif -#include "Memory.hpp" #include "String.hpp" #include "StringBuilder.h" #include "UTF8.h" diff --git a/src/openrct2/core/ZipAndroid.cpp b/src/openrct2/core/ZipAndroid.cpp index 8b7bb9774e..1b2876d1d3 100644 --- a/src/openrct2/core/ZipAndroid.cpp +++ b/src/openrct2/core/ZipAndroid.cpp @@ -12,7 +12,6 @@ #include "../Diagnostic.h" #include "../platform/Platform.h" #include "IStream.hpp" - #include "Memory.hpp" #include "MemoryStream.h" #include "Zip.h" diff --git a/src/openrct2/management/Research.cpp b/src/openrct2/management/Research.cpp index c7891d56ce..9d894eac78 100644 --- a/src/openrct2/management/Research.cpp +++ b/src/openrct2/management/Research.cpp @@ -21,7 +21,6 @@ #include "../core/BitSet.hpp" #include "../core/EnumUtils.hpp" #include "../core/Guard.hpp" -#include "../core/Memory.hpp" #include "../localisation/Formatter.h" #include "../localisation/StringIds.h" #include "../object/ObjectEntryManager.h" diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index 69bda4122c..008d93efea 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -20,7 +20,6 @@ #include "../core/Guard.hpp" #include "../core/Http.h" #include "../core/Json.hpp" - #include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" #include "../localisation/Language.h" diff --git a/src/openrct2/object/LargeSceneryObject.cpp b/src/openrct2/object/LargeSceneryObject.cpp index 4d40fb51b3..f0578e6d5f 100644 --- a/src/openrct2/object/LargeSceneryObject.cpp +++ b/src/openrct2/object/LargeSceneryObject.cpp @@ -11,9 +11,9 @@ #include "LargeSceneryObject.h" +#include "../core/Guard.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" -#include "../core/Memory.hpp" #include "../drawing/Drawing.h" #include "../drawing/ScrollingText.h" #include "../interface/Cursors.h" diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 5a56031c98..1f0b4ae767 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../core/File.h" #include "../core/FileStream.h" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../core/ZipStream.hpp" #include "../drawing/Image.h" diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index 0392f5d9f8..fa94f59a57 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -18,8 +18,8 @@ #include "../core/EnumMap.hpp" #include "../core/File.h" #include "../core/FileStream.h" +#include "../core/Guard.hpp" #include "../core/Json.hpp" -#include "../core/Memory.hpp" #include "../core/MemoryStream.h" #include "../core/Path.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/object/ObjectManager.cpp b/src/openrct2/object/ObjectManager.cpp index 230e4b1e03..3e268dee4c 100644 --- a/src/openrct2/object/ObjectManager.cpp +++ b/src/openrct2/object/ObjectManager.cpp @@ -16,7 +16,6 @@ #include "../core/Console.hpp" #include "../core/EnumUtils.hpp" #include "../core/JobPool.h" -#include "../core/Memory.hpp" #include "../localisation/StringIds.h" #include "../ride/Ride.h" #include "../ride/RideAudio.h" diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp index 1e3cc56cf3..c7f3016d4c 100644 --- a/src/openrct2/object/RideObject.cpp +++ b/src/openrct2/object/RideObject.cpp @@ -17,7 +17,6 @@ #include "../core/FlagHolder.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" -#include "../core/Memory.hpp" #include "../core/Numerics.hpp" #include "../core/String.hpp" #include "../drawing/Drawing.h" diff --git a/src/openrct2/object/SceneryGroupObject.cpp b/src/openrct2/object/SceneryGroupObject.cpp index ee556303a6..1797c1eade 100644 --- a/src/openrct2/object/SceneryGroupObject.cpp +++ b/src/openrct2/object/SceneryGroupObject.cpp @@ -12,9 +12,9 @@ #include "SceneryGroupObject.h" #include "../Context.h" +#include "../core/Guard.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../entity/Staff.h" diff --git a/src/openrct2/object/SmallSceneryObject.cpp b/src/openrct2/object/SmallSceneryObject.cpp index 678f1276c8..4aafddd488 100644 --- a/src/openrct2/object/SmallSceneryObject.cpp +++ b/src/openrct2/object/SmallSceneryObject.cpp @@ -11,9 +11,9 @@ #include "SmallSceneryObject.h" +#include "../core/Guard.hpp" #include "../core/IStream.hpp" #include "../core/Json.hpp" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../drawing/Drawing.h" #include "../interface/Cursors.h" diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp index 760d0ed140..e956e44fed 100644 --- a/src/openrct2/platform/Platform.Posix.cpp +++ b/src/openrct2/platform/Platform.Posix.cpp @@ -14,7 +14,6 @@ #include "../Date.h" #include "../Diagnostic.h" - #include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 4b5e98a572..379d51f8e4 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -20,7 +20,6 @@ #include "../core/FileStream.h" #include "../core/Guard.hpp" #include "../core/IStream.hpp" -#include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" #include "../entity/Balloon.h" diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 8afc2029f9..9be41de4f0 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -19,7 +19,6 @@ #include "../config/Config.h" #include "../core/EnumUtils.hpp" #include "../core/FixedPoint.hpp" -#include "../core/Memory.hpp" #include "../core/Speed.hpp" #include "../entity/EntityList.h" #include "../entity/EntityRegistry.h" diff --git a/src/openrct2/scenes/title/TitleSequence.cpp b/src/openrct2/scenes/title/TitleSequence.cpp index f629b961c0..9dc5462b41 100644 --- a/src/openrct2/scenes/title/TitleSequence.cpp +++ b/src/openrct2/scenes/title/TitleSequence.cpp @@ -16,7 +16,6 @@ #include "../../core/FileScanner.h" #include "../../core/FileStream.h" #include "../../core/Guard.hpp" -#include "../../core/Memory.hpp" #include "../../core/MemoryStream.h" #include "../../core/Path.hpp" #include "../../core/String.hpp" diff --git a/src/openrct2/scenes/title/TitleSequenceManager.cpp b/src/openrct2/scenes/title/TitleSequenceManager.cpp index 3352bacf6f..11bdd89033 100644 --- a/src/openrct2/scenes/title/TitleSequenceManager.cpp +++ b/src/openrct2/scenes/title/TitleSequenceManager.cpp @@ -15,7 +15,6 @@ #include "../../core/Collections.hpp" #include "../../core/File.h" #include "../../core/FileScanner.h" -#include "../../core/Memory.hpp" #include "../../core/Path.hpp" #include "../../core/String.hpp" #include "../../localisation/Language.h" diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp index 81e2167c5a..380505432c 100644 --- a/src/openrct2/world/Banner.cpp +++ b/src/openrct2/world/Banner.cpp @@ -13,7 +13,6 @@ #include "../Diagnostic.h" #include "../Game.h" #include "../GameState.h" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../localisation/Formatter.h" #include "../localisation/Formatting.h" diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp index 31be062d73..f812d8f1bf 100644 --- a/src/openrct2/world/Park.cpp +++ b/src/openrct2/world/Park.cpp @@ -17,7 +17,6 @@ #include "../OpenRCT2.h" #include "../actions/GameActionRunner.h" #include "../actions/park/ParkSetParameterAction.h" -#include "../core/Memory.hpp" #include "../core/String.hpp" #include "../entity/EntityList.h" #include "../entity/Litter.h"