diff --git a/src/openrct2-ui/windows/GameBottomToolbar.cpp b/src/openrct2-ui/windows/GameBottomToolbar.cpp
index 888c7bb636..9e6cfe7915 100644
--- a/src/openrct2-ui/windows/GameBottomToolbar.cpp
+++ b/src/openrct2-ui/windows/GameBottomToolbar.cpp
@@ -17,6 +17,7 @@
 #include <openrct2/Input.h>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/entity/Entity.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/management/Finance.h>
@@ -25,7 +26,6 @@
 #include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
 #include <openrct2/world/Climate.h>
-#include <openrct2/world/Entity.h>
 #include <openrct2/world/Park.h>
 
 // clang-format off
diff --git a/src/openrct2-ui/windows/GuestList.cpp b/src/openrct2-ui/windows/GuestList.cpp
index 6c9cf7c723..895de1fca0 100644
--- a/src/openrct2-ui/windows/GuestList.cpp
+++ b/src/openrct2-ui/windows/GuestList.cpp
@@ -15,6 +15,7 @@
 #include <openrct2/Game.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/peep/Guest.h>
 #include <openrct2/ride/RideData.h>
@@ -23,7 +24,6 @@
 #include <openrct2/util/Math.hpp>
 #include <openrct2/util/Util.h>
 #include <openrct2/world/Park.h>
-#include <openrct2/world/Sprite.h>
 #include <vector>
 
 static constexpr const rct_string_id WINDOW_TITLE = STR_GUESTS;
diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index a04abb06da..d473f02d3e 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -24,17 +24,17 @@
 #include <openrct2/actions/PlacePeepSpawnAction.h>
 #include <openrct2/actions/SurfaceSetStyleAction.h>
 #include <openrct2/audio/audio.h>
+#include <openrct2/entity/EntityList.h>
+#include <openrct2/entity/EntityRegistry.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/peep/Staff.h>
 #include <openrct2/ride/RideData.h>
 #include <openrct2/ride/Track.h>
 #include <openrct2/ride/TrainManager.h>
 #include <openrct2/ride/Vehicle.h>
-#include <openrct2/world/EntityList.h>
 #include <openrct2/world/Entrance.h>
 #include <openrct2/world/Footpath.h>
 #include <openrct2/world/Scenery.h>
-#include <openrct2/world/Sprite.h>
 #include <openrct2/world/Surface.h>
 #include <vector>
 
diff --git a/src/openrct2-ui/windows/Ride.cpp b/src/openrct2-ui/windows/Ride.cpp
index b09b54eb17..3ef101662c 100644
--- a/src/openrct2-ui/windows/Ride.cpp
+++ b/src/openrct2-ui/windows/Ride.cpp
@@ -31,6 +31,7 @@
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/String.hpp>
+#include <openrct2/entity/EntityList.h>
 #include <openrct2/localisation/Date.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/localisation/LocalisationService.h>
@@ -53,7 +54,6 @@
 #include <openrct2/ride/Vehicle.h>
 #include <openrct2/sprites.h>
 #include <openrct2/windows/Intent.h>
-#include <openrct2/world/EntityList.h>
 #include <openrct2/world/Park.h>
 #include <optional>
 #include <vector>
diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp
index 8c9a49d1c6..a6bad7b8cd 100644
--- a/src/openrct2/Context.cpp
+++ b/src/openrct2/Context.cpp
@@ -39,6 +39,8 @@
 #include "core/String.hpp"
 #include "drawing/IDrawingEngine.h"
 #include "drawing/LightFX.h"
+#include "entity/EntityRegistry.h"
+#include "entity/EntityTweener.h"
 #include "interface/Chat.h"
 #include "interface/InteractiveConsole.h"
 #include "interface/Viewport.h"
@@ -65,9 +67,7 @@
 #include "ui/UiContext.h"
 #include "ui/WindowManager.h"
 #include "util/Util.h"
-#include "world/EntityTweener.h"
 #include "world/Park.h"
-#include "world/Sprite.h"
 
 #include <algorithm>
 #include <cmath>
diff --git a/src/openrct2/Editor.cpp b/src/openrct2/Editor.cpp
index 72f815119d..c76173755a 100644
--- a/src/openrct2/Editor.cpp
+++ b/src/openrct2/Editor.cpp
@@ -19,6 +19,8 @@
 #include "actions/LandBuyRightsAction.h"
 #include "actions/LandSetRightsAction.h"
 #include "audio/audio.h"
+#include "entity/EntityList.h"
+#include "entity/EntityRegistry.h"
 #include "interface/Viewport.h"
 #include "interface/Window_internal.h"
 #include "localisation/Localisation.h"
@@ -36,12 +38,10 @@
 #include "util/Util.h"
 #include "windows/Intent.h"
 #include "world/Climate.h"
-#include "world/EntityList.h"
 #include "world/Entrance.h"
 #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/actions/RideDemolishAction.cpp b/src/openrct2/actions/RideDemolishAction.cpp
index cab6435f44..5b167de738 100644
--- a/src/openrct2/actions/RideDemolishAction.cpp
+++ b/src/openrct2/actions/RideDemolishAction.cpp
@@ -14,6 +14,7 @@
 #include "../GameState.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
+#include "../entity/EntityList.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../management/NewsItem.h"
@@ -23,7 +24,6 @@
 #include "../ui/UiContext.h"
 #include "../ui/WindowManager.h"
 #include "../world/Banner.h"
-#include "../world/EntityList.h"
 #include "../world/Park.h"
 #include "MazeSetTrackAction.h"
 #include "TrackRemoveAction.h"
diff --git a/src/openrct2/cmdline/SimulateCommands.cpp b/src/openrct2/cmdline/SimulateCommands.cpp
index 9709e41634..26a1ff0ea5 100644
--- a/src/openrct2/cmdline/SimulateCommands.cpp
+++ b/src/openrct2/cmdline/SimulateCommands.cpp
@@ -12,9 +12,9 @@
 #include "../GameState.h"
 #include "../OpenRCT2.h"
 #include "../core/Console.hpp"
+#include "../entity/EntityRegistry.h"
 #include "../network/network.h"
 #include "../platform/platform.h"
-#include "../world/Sprite.h"
 #include "CommandLine.hpp"
 
 #include <cstdlib>
diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp
index 30861d5299..5b19babe33 100644
--- a/src/openrct2/drawing/LightFX.cpp
+++ b/src/openrct2/drawing/LightFX.cpp
@@ -14,6 +14,7 @@
 #    include "../Game.h"
 #    include "../common.h"
 #    include "../config/Config.h"
+#    include "../entity/Entity.h"
 #    include "../interface/Viewport.h"
 #    include "../interface/Window.h"
 #    include "../interface/Window_internal.h"
@@ -22,7 +23,6 @@
 #    include "../ride/Vehicle.h"
 #    include "../util/Util.h"
 #    include "../world/Climate.h"
-#    include "../world/Entity.h"
 #    include "../world/Map.h"
 #    include "Drawing.h"
 
diff --git a/src/openrct2/entity/Balloon.cpp b/src/openrct2/entity/Balloon.cpp
index 05d41729ca..46c37af892 100644
--- a/src/openrct2/entity/Balloon.cpp
+++ b/src/openrct2/entity/Balloon.cpp
@@ -14,7 +14,7 @@
 #include "../network/network.h"
 #include "../scenario/Scenario.h"
 #include "../util/Util.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 template<> bool EntityBase::Is<Balloon>() const
 {
diff --git a/src/openrct2/entity/Duck.cpp b/src/openrct2/entity/Duck.cpp
index 440ee09412..fc20164eaf 100644
--- a/src/openrct2/entity/Duck.cpp
+++ b/src/openrct2/entity/Duck.cpp
@@ -14,7 +14,7 @@
 #include "../scenario/Scenario.h"
 #include "../sprites.h"
 #include "../world/Surface.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 #include <algorithm>
 #include <iterator>
diff --git a/src/openrct2/entity/EntityTweener.cpp b/src/openrct2/entity/EntityTweener.cpp
index 721c2b715c..ccb350b5e1 100644
--- a/src/openrct2/entity/EntityTweener.cpp
+++ b/src/openrct2/entity/EntityTweener.cpp
@@ -12,7 +12,7 @@
 #include "../peep/Staff.h"
 #include "../ride/Vehicle.h"
 #include "EntityList.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 #include <cmath>
 void EntityTweener::PopulateEntities()
diff --git a/src/openrct2/entity/Fountain.cpp b/src/openrct2/entity/Fountain.cpp
index 65ebf0862a..9d804d7057 100644
--- a/src/openrct2/entity/Fountain.cpp
+++ b/src/openrct2/entity/Fountain.cpp
@@ -14,7 +14,7 @@
 #include "../world/Footpath.h"
 #include "../world/Map.h"
 #include "../world/Scenery.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 enum class PATTERN
 {
diff --git a/src/openrct2/entity/MoneyEffect.cpp b/src/openrct2/entity/MoneyEffect.cpp
index 6fef24af4a..10327bdc6b 100644
--- a/src/openrct2/entity/MoneyEffect.cpp
+++ b/src/openrct2/entity/MoneyEffect.cpp
@@ -16,7 +16,7 @@
 #include "../network/network.h"
 #include "../world/Map.h"
 #include "Entity.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 static constexpr const CoordsXY _moneyEffectMoveOffset[] = {
     { 1, -1 },
diff --git a/src/openrct2/entity/Particle.cpp b/src/openrct2/entity/Particle.cpp
index 1c711420a1..a1690662e4 100644
--- a/src/openrct2/entity/Particle.cpp
+++ b/src/openrct2/entity/Particle.cpp
@@ -11,7 +11,7 @@
 #include "../audio/audio.h"
 #include "../paint/sprite/Paint.Sprite.h"
 #include "../scenario/Scenario.h"
-#include "Sprite.h"
+#include "EntityRegistry.h"
 
 #include <iterator>
 
diff --git a/src/openrct2/interface/Window_internal.cpp b/src/openrct2/interface/Window_internal.cpp
index 35aaa071db..c5ff819125 100644
--- a/src/openrct2/interface/Window_internal.cpp
+++ b/src/openrct2/interface/Window_internal.cpp
@@ -1,7 +1,7 @@
 #include "Window_internal.h"
 
-#include "../world/Entity.h"
-#include "../world/EntityList.h"
+#include "../entity/Entity.h"
+#include "../entity/EntityList.h"
 #include "Viewport.h"
 
 void rct_window::SetLocation(const CoordsXYZ& coords)
diff --git a/src/openrct2/paint/sprite/Paint.Litter.cpp b/src/openrct2/paint/sprite/Paint.Litter.cpp
index b06495eebc..c80fd38ad1 100644
--- a/src/openrct2/paint/sprite/Paint.Litter.cpp
+++ b/src/openrct2/paint/sprite/Paint.Litter.cpp
@@ -7,8 +7,8 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Litter.h"
 #include "../../interface/Viewport.h"
-#include "../../world/Litter.h"
 #include "../Paint.h"
 #include "Paint.Sprite.h"
 
diff --git a/src/openrct2/paint/sprite/Paint.Misc.cpp b/src/openrct2/paint/sprite/Paint.Misc.cpp
index 4e119ace7e..98519cbd37 100644
--- a/src/openrct2/paint/sprite/Paint.Misc.cpp
+++ b/src/openrct2/paint/sprite/Paint.Misc.cpp
@@ -8,13 +8,13 @@
  *****************************************************************************/
 
 #include "../../drawing/Drawing.h"
+#include "../../entity/Balloon.h"
+#include "../../entity/Duck.h"
+#include "../../entity/Fountain.h"
+#include "../../entity/MoneyEffect.h"
+#include "../../entity/Particle.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/StringIds.h"
-#include "../../world/Balloon.h"
-#include "../../world/Duck.h"
-#include "../../world/Fountain.h"
-#include "../../world/MoneyEffect.h"
-#include "../../world/Particle.h"
 #include "../Paint.h"
 #include "Paint.Sprite.h"
 
diff --git a/src/openrct2/ride/TrainManager.cpp b/src/openrct2/ride/TrainManager.cpp
index eea7d347ef..6d12824ace 100644
--- a/src/openrct2/ride/TrainManager.cpp
+++ b/src/openrct2/ride/TrainManager.cpp
@@ -9,8 +9,8 @@
 
 #include "TrainManager.h"
 
-#include "../world/Entity.h"
-#include "../world/EntityList.h"
+#include "../entity/Entity.h"
+#include "../entity/EntityList.h"
 #include "Vehicle.h"
 
 namespace TrainManager
diff --git a/src/openrct2/ride/gentle/Circus.cpp b/src/openrct2/ride/gentle/Circus.cpp
index a26a4bd67e..781afaed2f 100644
--- a/src/openrct2/ride/gentle/Circus.cpp
+++ b/src/openrct2/ride/gentle/Circus.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 
diff --git a/src/openrct2/ride/gentle/CrookedHouse.cpp b/src/openrct2/ride/gentle/CrookedHouse.cpp
index 19e14172e3..baa4f52efb 100644
--- a/src/openrct2/ride/gentle/CrookedHouse.cpp
+++ b/src/openrct2/ride/gentle/CrookedHouse.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 
diff --git a/src/openrct2/ride/gentle/HauntedHouse.cpp b/src/openrct2/ride/gentle/HauntedHouse.cpp
index cc05ce5b17..eec24a95d5 100644
--- a/src/openrct2/ride/gentle/HauntedHouse.cpp
+++ b/src/openrct2/ride/gentle/HauntedHouse.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/gentle/MerryGoRound.cpp b/src/openrct2/ride/gentle/MerryGoRound.cpp
index 545b5fb0af..e49dd47410 100644
--- a/src/openrct2/ride/gentle/MerryGoRound.cpp
+++ b/src/openrct2/ride/gentle/MerryGoRound.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/3dCinema.cpp b/src/openrct2/ride/thrill/3dCinema.cpp
index 4abb5b05e9..358cc0b41f 100644
--- a/src/openrct2/ride/thrill/3dCinema.cpp
+++ b/src/openrct2/ride/thrill/3dCinema.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 
diff --git a/src/openrct2/ride/thrill/Enterprise.cpp b/src/openrct2/ride/thrill/Enterprise.cpp
index c89cc39bd0..c4f09dc2b8 100644
--- a/src/openrct2/ride/thrill/Enterprise.cpp
+++ b/src/openrct2/ride/thrill/Enterprise.cpp
@@ -8,10 +8,10 @@
  *****************************************************************************/
 
 #include "../../common.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/MagicCarpet.cpp b/src/openrct2/ride/thrill/MagicCarpet.cpp
index 8481ea262d..f919c3b47f 100644
--- a/src/openrct2/ride/thrill/MagicCarpet.cpp
+++ b/src/openrct2/ride/thrill/MagicCarpet.cpp
@@ -7,11 +7,11 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/MotionSimulator.cpp b/src/openrct2/ride/thrill/MotionSimulator.cpp
index 0d80da8ad9..f0ed28fcd2 100644
--- a/src/openrct2/ride/thrill/MotionSimulator.cpp
+++ b/src/openrct2/ride/thrill/MotionSimulator.cpp
@@ -7,10 +7,10 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/SwingingInverterShip.cpp b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
index bcbdb97980..76a22e985b 100644
--- a/src/openrct2/ride/thrill/SwingingInverterShip.cpp
+++ b/src/openrct2/ride/thrill/SwingingInverterShip.cpp
@@ -7,11 +7,11 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/SwingingShip.cpp b/src/openrct2/ride/thrill/SwingingShip.cpp
index f57d67cac5..83d22b212d 100644
--- a/src/openrct2/ride/thrill/SwingingShip.cpp
+++ b/src/openrct2/ride/thrill/SwingingShip.cpp
@@ -7,11 +7,11 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../object/StationObject.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/thrill/Twist.cpp b/src/openrct2/ride/thrill/Twist.cpp
index 4422b484ce..0080f3cc49 100644
--- a/src/openrct2/ride/thrill/Twist.cpp
+++ b/src/openrct2/ride/thrill/Twist.cpp
@@ -8,10 +8,10 @@
  *****************************************************************************/
 
 #include "../../common.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"
diff --git a/src/openrct2/ride/water/SplashBoats.cpp b/src/openrct2/ride/water/SplashBoats.cpp
index 097d29bf6b..1e3a21a58b 100644
--- a/src/openrct2/ride/water/SplashBoats.cpp
+++ b/src/openrct2/ride/water/SplashBoats.cpp
@@ -8,11 +8,11 @@
  *****************************************************************************/
 
 #include "../../config/Config.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../paint/sprite/Paint.Sprite.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"