diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index 54d1ca3fc9..26fcb2f43e 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -53,6 +53,7 @@
 #include <openrct2/sprites.h>
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/Park.h>
+#include <openrct2/world/Sprite.h>
 #include <vector>
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 0ef3d751de..01c64abcb9 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -38,6 +38,7 @@
 #include "world/Footpath.h"
 #include "world/Park.h"
 #include "world/Scenery.h"
+#include "world/Sprite.h"
 
 #include <algorithm>
 #include <array>
diff --git a/src/openrct2/EditorObjectSelectionSession.cpp b/src/openrct2/EditorObjectSelectionSession.cpp
index 9e2c146dc5..ab99d9304c 100644
--- a/src/openrct2/EditorObjectSelectionSession.cpp
+++ b/src/openrct2/EditorObjectSelectionSession.cpp
@@ -21,6 +21,7 @@
 #include "object/ObjectManager.h"
 #include "object/ObjectRepository.h"
 #include "ride/RideData.h"
+#include "ride/Vehicle.h"
 #include "scenario/Scenario.h"
 #include "windows/Intent.h"
 #include "world/Footpath.h"
diff --git a/src/openrct2/actions/BalloonPressAction.cpp b/src/openrct2/actions/BalloonPressAction.cpp
index 053073965d..474722db35 100644
--- a/src/openrct2/actions/BalloonPressAction.cpp
+++ b/src/openrct2/actions/BalloonPressAction.cpp
@@ -9,6 +9,7 @@
 
 #include "BalloonPressAction.h"
 
+#include "../world/Sprite.h"
 #include "GameAction.h"
 
 BalloonPressAction::BalloonPressAction(uint16_t spriteIndex)
diff --git a/src/openrct2/actions/BalloonPressAction.h b/src/openrct2/actions/BalloonPressAction.h
index 88ce856389..0bf2ece5f9 100644
--- a/src/openrct2/actions/BalloonPressAction.h
+++ b/src/openrct2/actions/BalloonPressAction.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include "../world/Sprite.h"
 #include "GameAction.h"
 
 DEFINE_GAME_ACTION(BalloonPressAction, GameCommand::BalloonPress, GameActions::Result)
diff --git a/src/openrct2/interface/Window_internal.h b/src/openrct2/interface/Window_internal.h
index 549cd3275b..60a4a01ffe 100644
--- a/src/openrct2/interface/Window_internal.h
+++ b/src/openrct2/interface/Window_internal.h
@@ -9,7 +9,6 @@
 
 #pragma once
 
-#include "../rct12/RCT12.h"
 #include "Window.h"
 
 #include <list>
diff --git a/src/openrct2/object/RideObject.cpp b/src/openrct2/object/RideObject.cpp
index a49efe3c60..97127a2d32 100644
--- a/src/openrct2/object/RideObject.cpp
+++ b/src/openrct2/object/RideObject.cpp
@@ -24,6 +24,7 @@
 #include "../ride/RideData.h"
 #include "../ride/ShopItem.h"
 #include "../ride/Track.h"
+#include "../ride/Vehicle.h"
 #include "ObjectRepository.h"
 
 #include <algorithm>
diff --git a/src/openrct2/rct1/RCT1.h b/src/openrct2/rct1/RCT1.h
index 4ccb9d2272..3f3c951144 100644
--- a/src/openrct2/rct1/RCT1.h
+++ b/src/openrct2/rct1/RCT1.h
@@ -18,7 +18,6 @@
 #include "../world/Banner.h"
 #include "../world/Climate.h"
 #include "../world/MapAnimation.h"
-#include "../world/Sprite.h"
 
 constexpr const uint16_t RCT1_MAX_TILE_ELEMENTS = 0xC000;
 constexpr const uint16_t RCT1_MAX_SPRITES = 5000;
diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp
index 095a573882..bb4cedc939 100644
--- a/src/openrct2/rct1/S4Importer.cpp
+++ b/src/openrct2/rct1/S4Importer.cpp
@@ -50,6 +50,7 @@
 #include "../world/Park.h"
 #include "../world/Scenery.h"
 #include "../world/SmallScenery.h"
+#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "../world/Wall.h"
 #include "RCT1.h"
diff --git a/src/openrct2/ride/Ride.cpp b/src/openrct2/ride/Ride.cpp
index 7268a2267a..239b4e1700 100644
--- a/src/openrct2/ride/Ride.cpp
+++ b/src/openrct2/ride/Ride.cpp
@@ -63,6 +63,7 @@
 #include "Track.h"
 #include "TrackData.h"
 #include "TrackDesign.h"
+#include "Vehicle.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp
index a0851f3133..4c592c26b1 100644
--- a/src/openrct2/ride/RideData.cpp
+++ b/src/openrct2/ride/RideData.cpp
@@ -28,6 +28,7 @@
 #include "Ride.h"
 #include "ShopItem.h"
 #include "Track.h"
+#include "Vehicle.h"
 #include "coaster/meta/AirPoweredVerticalCoaster.h"
 #include "coaster/meta/BobsleighCoaster.h"
 #include "coaster/meta/ClassicMiniRollerCoaster.h"
diff --git a/src/openrct2/ride/RideData.h b/src/openrct2/ride/RideData.h
index bc855ccd36..1a28f8d4e0 100644
--- a/src/openrct2/ride/RideData.h
+++ b/src/openrct2/ride/RideData.h
@@ -20,6 +20,7 @@
 #define DEFAULT_FLAT_RIDE_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_LIGHT_BLUE, COLOUR_YELLOW })
 #define DEFAULT_STALL_COLOUR_PRESET TRACK_COLOUR_PRESETS({ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED })
 
+#include "../audio/audio.h"
 #include "../common.h"
 #include "../localisation/StringIds.h"
 #include "../sprites.h"
diff --git a/src/openrct2/ride/ShopItem.cpp b/src/openrct2/ride/ShopItem.cpp
index 4f9ccf55d0..8b1192592d 100644
--- a/src/openrct2/ride/ShopItem.cpp
+++ b/src/openrct2/ride/ShopItem.cpp
@@ -12,6 +12,7 @@
 #include "../common.h"
 #include "../localisation/StringIds.h"
 #include "../sprites.h"
+#include "../world/Sprite.h"
 
 ShopItem& operator++(ShopItem& d, int)
 {
diff --git a/src/openrct2/ride/water/SubmarineRide.cpp b/src/openrct2/ride/water/SubmarineRide.cpp
index 666ae317e6..a8a2174d63 100644
--- a/src/openrct2/ride/water/SubmarineRide.cpp
+++ b/src/openrct2/ride/water/SubmarineRide.cpp
@@ -13,6 +13,7 @@
 #include "../RideData.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
+#include "../Vehicle.h"
 #include "../VehiclePaint.h"
 
 #ifndef NO_VEHICLES