diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index cdde081cbc..923e9dfac3 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -14,12 +14,9 @@
 #include "../Game.h"
 #include "../GameState.h"
 #include "../ParkImporter.h"
-#include "../actions/WallPlaceAction.h"
 #include "../audio/Audio.h"
 #include "../core/BitSet.hpp"
-#include "../core/Collections.hpp"
 #include "../core/Console.hpp"
-#include "../core/EnumUtils.hpp"
 #include "../core/FileStream.h"
 #include "../core/Guard.hpp"
 #include "../core/IStream.hpp"
@@ -29,7 +26,6 @@
 #include "../entity/Balloon.h"
 #include "../entity/Duck.h"
 #include "../entity/EntityList.h"
-#include "../entity/EntityRegistry.h"
 #include "../entity/Fountain.h"
 #include "../entity/Litter.h"
 #include "../entity/MoneyEffect.h"
@@ -38,7 +34,6 @@
 #include "../entity/Peep.h"
 #include "../entity/Staff.h"
 #include "../localisation/Formatting.h"
-#include "../localisation/Localisation.Date.h"
 #include "../management/Award.h"
 #include "../management/Finance.h"
 #include "../management/Marketing.h"
@@ -51,7 +46,6 @@
 #include "../object/PeepAnimationsObject.h"
 #include "../object/ScenarioMetaObject.h"
 #include "../park/Legacy.h"
-#include "../park/ParkPreview.h"
 #include "../peep/RideUseSystem.h"
 #include "../rct12/CSStringConverter.h"
 #include "../rct12/EntryList.h"
@@ -81,15 +75,14 @@
 #include "../world/tile_element/PathElement.h"
 #include "../world/tile_element/SmallSceneryElement.h"
 #include "../world/tile_element/SurfaceElement.h"
+#include "../world/tile_element/TileElement.h"
 #include "../world/tile_element/TrackElement.h"
 #include "../world/tile_element/WallElement.h"
 #include "RCT1.h"
 #include "Tables.h"
 
 #include <cassert>
-#include <iterator>
 #include <memory>
-#include <mutex>
 #include <vector>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index 58f5c1ee07..10d8fa8a2c 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -9,25 +9,14 @@
 
 #include "../Context.h"
 #include "../Diagnostic.h"
-#include "../Editor.h"
 #include "../Game.h"
 #include "../GameState.h"
-#include "../OpenRCT2.h"
 #include "../ParkImporter.h"
-#include "../core/Console.hpp"
-#include "../core/EnumUtils.hpp"
 #include "../core/FileStream.h"
-#include "../core/IStream.hpp"
-#include "../core/MemoryStream.h"
-#include "../core/Numerics.hpp"
 #include "../core/Path.hpp"
-#include "../core/Random.hpp"
 #include "../core/String.hpp"
 #include "../entity/Balloon.h"
 #include "../entity/Duck.h"
-#include "../entity/EntityList.h"
-#include "../entity/EntityRegistry.h"
-#include "../entity/EntityTweener.h"
 #include "../entity/Fountain.h"
 #include "../entity/Guest.h"
 #include "../entity/Litter.h"
@@ -35,21 +24,12 @@
 #include "../entity/Particle.h"
 #include "../entity/PatrolArea.h"
 #include "../entity/Staff.h"
-#include "../interface/Viewport.h"
 #include "../localisation/Formatting.h"
-#include "../management/Award.h"
-#include "../management/Finance.h"
-#include "../management/Marketing.h"
-#include "../management/NewsItem.h"
-#include "../management/Research.h"
-#include "../network/Network.h"
-#include "../object/LargeSceneryEntry.h"
 #include "../object/ObjectLimits.h"
 #include "../object/ObjectList.h"
 #include "../object/ObjectManager.h"
 #include "../object/ObjectRepository.h"
 #include "../object/ScenarioMetaObject.h"
-#include "../object/WallSceneryEntry.h"
 #include "../park/Legacy.h"
 #include "../park/ParkPreview.h"
 #include "../peep/RideUseSystem.h"
@@ -58,13 +38,7 @@
 #include "../rct12/RCT12.h"
 #include "../rct12/ScenarioPatcher.h"
 #include "../rct2/RCT2.h"
-#include "../ride/Ride.h"
 #include "../ride/RideData.h"
-#include "../ride/RideRatings.h"
-#include "../ride/ShopItem.h"
-#include "../ride/Station.h"
-#include "../ride/Track.h"
-#include "../ride/TrainManager.h"
 #include "../ride/Vehicle.h"
 #include "../sawyer_coding/SawyerChunkReader.h"
 #include "../sawyer_coding/SawyerCoding.h"
@@ -88,7 +62,6 @@
 #include "../world/tile_element/WallElement.h"
 
 #include <cassert>
-#include <mutex>
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::SawyerCoding;