Fix includes

src/openrct2-ui/WindowManager.cpp

@@ -18,11 +18,11 @@
 #include <openrct2/Input.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/core/Console.hpp>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/interface/Viewport.h>
 #include <openrct2/rct2/T6Exporter.h>
 #include <openrct2/ride/Vehicle.h>
 #include <openrct2/ui/WindowManager.h>
-#include <openrct2/world/Sprite.h>
 
 using namespace OpenRCT2::Ui;
 

src/openrct2-ui/interface/ViewportInteraction.cpp

@@ -24,6 +24,9 @@
 #include <openrct2/actions/ParkEntranceRemoveAction.h>
 #include <openrct2/actions/SmallSceneryRemoveAction.h>
 #include <openrct2/actions/WallRemoveAction.h>
+#include <openrct2/entity/Balloon.h>
+#include <openrct2/entity/Duck.h>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/peep/Staff.h>
 #include <openrct2/ride/Ride.h>
@@ -32,15 +35,12 @@
 #include <openrct2/ride/Vehicle.h>
 #include <openrct2/scenario/Scenario.h>
 #include <openrct2/windows/Intent.h>
-#include <openrct2/world/Balloon.h>
 #include <openrct2/world/Banner.h>
-#include <openrct2/world/Duck.h>
 #include <openrct2/world/Footpath.h>
 #include <openrct2/world/LargeScenery.h>
 #include <openrct2/world/Map.h>
 #include <openrct2/world/Park.h>
 #include <openrct2/world/Scenery.h>
-#include <openrct2/world/Sprite.h>
 #include <openrct2/world/Surface.h>
 #include <openrct2/world/Wall.h>
 

src/openrct2-ui/interface/Window.cpp

@@ -20,11 +20,11 @@
 #include <openrct2/audio/audio.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/interface/Widget.h>
 #include <openrct2/localisation/StringIds.h>
 #include <openrct2/sprites.h>
 #include <openrct2/ui/UiContext.h>
-#include <openrct2/world/Sprite.h>
 
 using namespace OpenRCT2;
 

src/openrct2-ui/scripting/ScTitleSequence.hpp

@@ -16,6 +16,7 @@
 #    include <openrct2/OpenRCT2.h>
 #    include <openrct2/ParkImporter.h>
 #    include <openrct2/core/String.hpp>
+#    include <openrct2/entity/Sprite.h>
 #    include <openrct2/object/ObjectManager.h>
 #    include <openrct2/scenario/Scenario.h>
 #    include <openrct2/scripting/ScriptEngine.h>
@@ -23,7 +24,6 @@
 #    include <openrct2/title/TitleSequence.h>
 #    include <openrct2/title/TitleSequenceManager.h>
 #    include <openrct2/title/TitleSequencePlayer.h>
-#    include <openrct2/world/Sprite.h>
 
 namespace OpenRCT2::Scripting
 {

src/openrct2-ui/title/TitleSequencePlayer.cpp

@@ -23,6 +23,7 @@
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/core/Path.hpp>
 #include <openrct2/core/String.hpp>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/interface/Viewport.h>
 #include <openrct2/interface/Window.h>
 #include <openrct2/management/NewsItem.h>
@@ -38,7 +39,6 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/Map.h>
 #include <openrct2/world/Scenery.h>
-#include <openrct2/world/Sprite.h>
 
 using namespace OpenRCT2;
 

src/openrct2-ui/windows/News.cpp

@@ -13,12 +13,12 @@
 #include <openrct2/Context.h>
 #include <openrct2/audio/audio.h>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/Entity.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/management/NewsItem.h>
 #include <openrct2/peep/Peep.h>
 #include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
-#include <openrct2/world/Entity.h>
 
 static constexpr const rct_string_id WINDOW_TITLE = STR_RECENT_MESSAGES;
 static constexpr const int32_t WH = 300;

src/openrct2-ui/windows/Staff.cpp

@@ -21,13 +21,13 @@
 #include <openrct2/actions/StaffSetOrdersAction.h>
 #include <openrct2/actions/StaffSetPatrolAreaAction.h>
 #include <openrct2/config/Config.h>
+#include <openrct2/entity/Entity.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/management/Finance.h>
 #include <openrct2/network/network.h>
 #include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
 #include <openrct2/windows/Intent.h>
-#include <openrct2/world/Entity.h>
 #include <openrct2/world/Footpath.h>
 #include <openrct2/world/Park.h>
 

src/openrct2-ui/windows/StaffFirePrompt.cpp

@@ -12,10 +12,10 @@
 #include <openrct2/Game.h>
 #include <openrct2/actions/StaffFireAction.h>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/Entity.h>
 #include <openrct2/interface/Colour.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/peep/Staff.h>
-#include <openrct2/world/Entity.h>
 
 static constexpr const rct_string_id WINDOW_TITLE = STR_SACK_STAFF;
 static constexpr const int32_t WW = 200;

src/openrct2-ui/windows/StaffList.cpp

@@ -19,16 +19,16 @@
 #include <openrct2/actions/StaffSetColourAction.h>
 #include <openrct2/config/Config.h>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/EntityList.h>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/management/Finance.h>
 #include <openrct2/peep/Staff.h>
 #include <openrct2/sprites.h>
 #include <openrct2/util/Util.h>
 #include <openrct2/windows/Intent.h>
-#include <openrct2/world/EntityList.h>
 #include <openrct2/world/Footpath.h>
 #include <openrct2/world/Park.h>
-#include <openrct2/world/Sprite.h>
 #include <vector>
 
 enum

src/openrct2-ui/windows/TitleCommandEditor.cpp

@@ -19,6 +19,9 @@
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/core/Memory.hpp>
 #include <openrct2/drawing/Drawing.h>
+#include <openrct2/entity/Balloon.h>
+#include <openrct2/entity/Duck.h>
+#include <openrct2/entity/Entity.h>
 #include <openrct2/localisation/Localisation.h>
 #include <openrct2/peep/Peep.h>
 #include <openrct2/ride/Vehicle.h>
@@ -27,9 +30,6 @@
 #include <openrct2/sprites.h>
 #include <openrct2/title/TitleSequence.h>
 #include <openrct2/util/Util.h>
-#include <openrct2/world/Balloon.h>
-#include <openrct2/world/Duck.h>
-#include <openrct2/world/Entity.h>
 
 // clang-format off
 struct TITLE_COMMAND_ORDER {

src/openrct2/Game.cpp

@@ -25,6 +25,7 @@
 #include "core/Console.hpp"
 #include "core/FileScanner.h"
 #include "core/Path.hpp"
+#include "entity/Sprite.h"
 #include "interface/Colour.h"
 #include "interface/Screenshot.h"
 #include "interface/Viewport.h"
@@ -62,7 +63,6 @@
 #include "world/MapAnimation.h"
 #include "world/Park.h"
 #include "world/Scenery.h"
-#include "world/Sprite.h"
 #include "world/Surface.h"
 #include "world/Water.h"
 

src/openrct2/GameState.cpp

@@ -19,6 +19,7 @@
 #include "ReplayManager.h"
 #include "actions/GameAction.h"
 #include "config/Config.h"
+#include "entity/Sprite.h"
 #include "interface/Screenshot.h"
 #include "localisation/Date.h"
 #include "localisation/Localisation.h"
@@ -37,7 +38,6 @@
 #include "world/MapAnimation.h"
 #include "world/Park.h"
 #include "world/Scenery.h"
-#include "world/Sprite.h"
 
 #include <algorithm>
 #include <chrono>

src/openrct2/GameStateSnapshots.cpp

@@ -10,17 +10,17 @@
 #include "GameStateSnapshots.h"
 
 #include "core/CircularBuffer.h"
+#include "entity/Balloon.h"
+#include "entity/Duck.h"
+#include "entity/EntityList.h"
+#include "entity/Fountain.h"
+#include "entity/Litter.h"
+#include "entity/MoneyEffect.h"
+#include "entity/Particle.h"
+#include "entity/Sprite.h"
 #include "peep/Guest.h"
 #include "peep/Staff.h"
 #include "ride/Vehicle.h"
-#include "world/Balloon.h"
-#include "world/Duck.h"
-#include "world/EntityList.h"
-#include "world/Fountain.h"
-#include "world/Litter.h"
-#include "world/MoneyEffect.h"
-#include "world/Particle.h"
-#include "world/Sprite.h"
 
 static constexpr size_t MaximumGameStateSnapshots = 32;
 static constexpr uint32_t InvalidTick = 0xFFFFFFFF;

src/openrct2/ParkFile.cpp

@@ -23,6 +23,14 @@
 #include "core/OrcaStream.hpp"
 #include "core/Path.hpp"
 #include "drawing/Drawing.h"
+#include "entity/Balloon.h"
+#include "entity/Duck.h"
+#include "entity/EntityList.h"
+#include "entity/Fountain.h"
+#include "entity/Litter.h"
+#include "entity/MoneyEffect.h"
+#include "entity/Particle.h"
+#include "entity/Sprite.h"
 #include "interface/Viewport.h"
 #include "interface/Window.h"
 #include "localisation/Date.h"
@@ -39,18 +47,10 @@
 #include "ride/Vehicle.h"
 #include "scenario/Scenario.h"
 #include "scenario/ScenarioRepository.h"
-#include "world/Balloon.h"
 #include "world/Climate.h"
-#include "world/Duck.h"
-#include "world/EntityList.h"
 #include "world/Entrance.h"
-#include "world/Fountain.h"
-#include "world/Litter.h"
 #include "world/Map.h"
-#include "world/MoneyEffect.h"
 #include "world/Park.h"
-#include "world/Particle.h"
-#include "world/Sprite.h"
 
 #include <cstdint>
 #include <ctime>

src/openrct2/ReplayManager.cpp

@@ -26,13 +26,13 @@
 #include "config/Config.h"
 #include "core/DataSerialiser.h"
 #include "core/Path.hpp"
+#include "entity/EntityTweener.h"
+#include "entity/Sprite.h"
 #include "management/NewsItem.h"
 #include "object/ObjectManager.h"
 #include "object/ObjectRepository.h"
 #include "scenario/Scenario.h"
-#include "world/EntityTweener.h"
 #include "world/Park.h"
-#include "world/Sprite.h"
 #include "zlib.h"
 
 #include <chrono>

src/openrct2/actions/BalloonPressAction.cpp

@@ -9,8 +9,8 @@
 
 #include "BalloonPressAction.h"
 
-#include "../world/Balloon.h"
-#include "../world/Entity.h"
+#include "../entity/Balloon.h"
+#include "../entity/Entity.h"
 #include "GameAction.h"
 
 BalloonPressAction::BalloonPressAction(uint16_t spriteIndex)

src/openrct2/actions/GameAction.cpp

@@ -14,6 +14,7 @@
 #include "../core/Guard.hpp"
 #include "../core/Memory.hpp"
 #include "../core/MemoryStream.h"
+#include "../entity/MoneyEffect.h"
 #include "../localisation/Localisation.h"
 #include "../network/network.h"
 #include "../platform/platform.h"
@@ -23,7 +24,6 @@
 #include "../scripting/ScriptEngine.h"
 #include "../ui/UiContext.h"
 #include "../ui/WindowManager.h"
-#include "../world/MoneyEffect.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"
 

src/openrct2/actions/GuestSetFlagsAction.cpp

@@ -11,7 +11,7 @@
 
 #include "../Context.h"
 #include "../OpenRCT2.h"
-#include "../world/Entity.h"
+#include "../entity/Entity.h"
 
 GuestSetFlagsAction::GuestSetFlagsAction(uint16_t peepId, uint32_t flags)
     : _peepId(peepId)

src/openrct2/actions/GuestSetNameAction.cpp

@@ -13,11 +13,11 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
 #include "../windows/Intent.h"
-#include "../world/Entity.h"
 #include "../world/Park.h"
 
 GuestSetNameAction::GuestSetNameAction(uint16_t spriteIndex, const std::string& name)

src/openrct2/actions/PeepPickupAction.cpp

@@ -10,10 +10,10 @@
 #include "PeepPickupAction.h"
 
 #include "../Input.h"
+#include "../entity/Entity.h"
 #include "../network/network.h"
 #include "../peep/Peep.h"
 #include "../util/Util.h"
-#include "../world/Entity.h"
 
 PeepPickupAction::PeepPickupAction(PeepPickupType type, uint32_t spriteId, const CoordsXYZ& loc, NetworkPlayerId_t owner)
     : _type(type)

src/openrct2/actions/SetCheatAction.cpp

@@ -15,6 +15,8 @@
 #include "../config/Config.h"
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
+#include "../entity/Duck.h"
+#include "../entity/Sprite.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
 #include "../network/network.h"
@@ -27,13 +29,11 @@
 #include "../windows/Intent.h"
 #include "../world/Banner.h"
 #include "../world/Climate.h"
-#include "../world/Duck.h"
 #include "../world/Footpath.h"
 #include "../world/Location.hpp"
 #include "../world/Map.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "ParkSetLoanAction.h"
 #include "ParkSetParameterAction.h"

src/openrct2/actions/StaffFireAction.cpp

@@ -9,9 +9,9 @@
 
 #include "StaffFireAction.h"
 
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../peep/Staff.h"
-#include "../world/Entity.h"
 
 StaffFireAction::StaffFireAction(uint16_t spriteId)
     : _spriteId(spriteId)

src/openrct2/actions/StaffHireNewAction.cpp

@@ -13,6 +13,7 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
@@ -24,7 +25,6 @@
 #include "../ui/WindowManager.h"
 #include "../world/Entrance.h"
 #include "../world/Park.h"
-#include "../world/Sprite.h"
 
 /* rct2: 0x009929FC */
 static constexpr const PeepSpriteType spriteTypes[] = {

src/openrct2/actions/StaffSetColourAction.cpp

@@ -12,12 +12,12 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
+#include "../entity/EntityList.h"
 #include "../localisation/StringIds.h"
 #include "../peep/Staff.h"
 #include "../ui/UiContext.h"
 #include "../ui/WindowManager.h"
 #include "../windows/Intent.h"
-#include "../world/EntityList.h"
 
 StaffSetColourAction::StaffSetColourAction(StaffType staffType, uint8_t colour)
     : _staffType(static_cast<uint8_t>(staffType))

src/openrct2/actions/StaffSetCostumeAction.cpp

@@ -10,11 +10,11 @@
 #include "StaffSetCostumeAction.h"
 
 #include "../Context.h"
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
 #include "../windows/Intent.h"
-#include "../world/Entity.h"
 
 /** rct2: 0x00982134 */
 constexpr const bool peep_slow_walking_types[] = {

src/openrct2/actions/StaffSetNameAction.cpp

@@ -13,12 +13,12 @@
 #include "../Context.h"
 #include "../core/MemoryStream.h"
 #include "../drawing/Drawing.h"
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
 #include "../peep/Staff.h"
 #include "../windows/Intent.h"
-#include "../world/Entity.h"
 #include "../world/Park.h"
 
 StaffSetNameAction::StaffSetNameAction(uint16_t spriteIndex, const std::string& name)

src/openrct2/actions/StaffSetOrdersAction.cpp

@@ -10,12 +10,12 @@
 #include "StaffSetOrdersAction.h"
 
 #include "../Context.h"
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../localisation/StringIds.h"
 #include "../peep/Staff.h"
 #include "../windows/Intent.h"
-#include "../world/Entity.h"
 
 StaffSetOrdersAction::StaffSetOrdersAction(uint16_t spriteIndex, uint8_t ordersId)
     : _spriteIndex(spriteIndex)

src/openrct2/actions/StaffSetPatrolAreaAction.cpp

@@ -9,10 +9,10 @@
 
 #include "StaffSetPatrolAreaAction.h"
 
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../peep/Peep.h"
 #include "../peep/Staff.h"
-#include "../world/Entity.h"
 
 StaffSetPatrolAreaAction::StaffSetPatrolAreaAction(uint16_t spriteId, const CoordsXY& loc, const StaffSetPatrolAreaMode mode)
     : _spriteId(spriteId)

src/openrct2/entity/EntityList.h

@@ -11,9 +11,9 @@
 
 #include "../common.h"
 #include "../rct12/RCT12.h"
+#include "../world/Location.hpp"
 #include "Entity.h"
 #include "EntityBase.h"
-#include "Location.hpp"
 
 #include <list>
 #include <vector>

src/openrct2/entity/Fountain.cpp

@@ -11,9 +11,9 @@
 
 #include "../Game.h"
 #include "../scenario/Scenario.h"
-#include "Footpath.h"
-#include "Map.h"
-#include "Scenery.h"
+#include "../world/Footpath.h"
+#include "../world/Map.h"
+#include "../world/Scenery.h"
 #include "Sprite.h"
 
 enum class PATTERN

src/openrct2/entity/Fountain.h

@@ -10,8 +10,8 @@
 #pragma once
 
 #include "../common.h"
+#include "../world/Map.h"
 #include "EntityBase.h"
-#include "Map.h"
 
 class DataSerialiser;
 

src/openrct2/entity/Litter.cpp

@@ -3,8 +3,8 @@
 #include "../Cheats.h"
 #include "../Game.h"
 #include "../localisation/StringIds.h"
+#include "../world/Map.h"
 #include "EntityList.h"
-#include "Map.h"
 #include "Sprite.h"
 
 static bool isLocationLitterable(const CoordsXYZ& mapPos)

src/openrct2/entity/MoneyEffect.cpp

@@ -14,8 +14,8 @@
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../network/network.h"
+#include "../world/Map.h"
 #include "Entity.h"
-#include "Map.h"
 #include "Sprite.h"
 
 static constexpr const CoordsXY _moneyEffectMoveOffset[] = {

src/openrct2/interface/InteractiveConsole.cpp

@@ -28,6 +28,8 @@
 #include "../core/String.hpp"
 #include "../drawing/Drawing.h"
 #include "../drawing/Font.h"
+#include "../entity/EntityList.h"
+#include "../entity/Sprite.h"
 #include "../interface/Chat.h"
 #include "../interface/Colour.h"
 #include "../interface/Window_internal.h"
@@ -48,10 +50,8 @@
 #include "../util/Util.h"
 #include "../windows/Intent.h"
 #include "../world/Climate.h"
-#include "../world/EntityList.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "Viewport.h"
 
 #include <algorithm>

src/openrct2/interface/Viewport.cpp

@@ -18,6 +18,7 @@
 #include "../core/JobPool.h"
 #include "../drawing/Drawing.h"
 #include "../drawing/IDrawingEngine.h"
+#include "../entity/EntityList.h"
 #include "../paint/Paint.h"
 #include "../peep/Guest.h"
 #include "../peep/Staff.h"
@@ -28,7 +29,6 @@
 #include "../ui/WindowManager.h"
 #include "../util/Math.hpp"
 #include "../world/Climate.h"
-#include "../world/EntityList.h"
 #include "../world/Map.h"
 #include "Colour.h"
 #include "Window.h"

src/openrct2/management/NewsItem.cpp

@@ -13,6 +13,7 @@
 #include "../Input.h"
 #include "../OpenRCT2.h"
 #include "../audio/audio.h"
+#include "../entity/Entity.h"
 #include "../interface/Window.h"
 #include "../interface/Window_internal.h"
 #include "../localisation/Date.h"
@@ -23,7 +24,6 @@
 #include "../ride/Vehicle.h"
 #include "../util/Util.h"
 #include "../windows/Intent.h"
-#include "../world/Entity.h"
 #include "../world/Location.hpp"
 
 News::ItemQueues gNewsItems;

src/openrct2/network/NetworkBase.cpp

@@ -20,6 +20,9 @@
 #include "../actions/PeepPickupAction.h"
 #include "../core/Guard.hpp"
 #include "../core/Json.hpp"
+#include "../entity/EntityList.h"
+#include "../entity/EntityTweener.h"
+#include "../entity/Sprite.h"
 #include "../localisation/Formatting.h"
 #include "../platform/Platform2.h"
 #include "../scenario/Scenario.h"
@@ -27,10 +30,7 @@
 #include "../ui/UiContext.h"
 #include "../ui/WindowManager.h"
 #include "../util/SawyerCoding.h"
-#include "../world/EntityList.h"
-#include "../world/EntityTweener.h"
 #include "../world/Location.hpp"
-#include "../world/Sprite.h"
 #include "network.h"
 
 #include <algorithm>

src/openrct2/paint/sprite/Paint.Sprite.cpp

@@ -11,21 +11,21 @@
 
 #include "../../drawing/Drawing.h"
 #include "../../drawing/LightFX.h"
+#include "../../entity/Balloon.h"
+#include "../../entity/Duck.h"
+#include "../../entity/EntityList.h"
+#include "../../entity/Fountain.h"
+#include "../../entity/Litter.h"
+#include "../../entity/MoneyEffect.h"
+#include "../../entity/Particle.h"
 #include "../../interface/Viewport.h"
 #include "../../peep/Staff.h"
 #include "../../ride/RideData.h"
 #include "../../ride/TrackDesign.h"
 #include "../../ride/VehiclePaint.h"
-#include "../../world/Balloon.h"
 #include "../../world/Climate.h"
-#include "../../world/Duck.h"
-#include "../../world/EntityList.h"
-#include "../../world/Fountain.h"
-#include "../../world/Litter.h"
 #include "../../world/MapAnimation.h"
-#include "../../world/MoneyEffect.h"
 #include "../../world/Park.h"
-#include "../../world/Particle.h"
 #include "../Paint.h"
 
 /**

src/openrct2/paint/tile_element/Paint.Path.cpp

@@ -7,11 +7,14 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../Paint.h"
+
 #include "../../Context.h"
 #include "../../Game.h"
 #include "../../config/Config.h"
 #include "../../core/Numerics.hpp"
 #include "../../drawing/LightFX.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/Localisation.h"
 #include "../../object/FootpathObject.h"
@@ -24,13 +27,11 @@
 #include "../../ride/Track.h"
 #include "../../ride/TrackDesign.h"
 #include "../../ride/TrackPaint.h"
-#include "../../world/Entity.h"
 #include "../../world/Footpath.h"
 #include "../../world/Map.h"
 #include "../../world/Scenery.h"
 #include "../../world/Surface.h"
 #include "../../world/TileInspector.h"
-#include "../Paint.h"
 #include "../Supports.h"
 #include "Paint.Surface.h"
 #include "Paint.TileElement.h"

src/openrct2/paint/tile_element/Paint.Surface.cpp

@@ -16,6 +16,7 @@
 #include "../../core/Guard.hpp"
 #include "../../core/Numerics.hpp"
 #include "../../drawing/Drawing.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Colour.h"
 #include "../../interface/Viewport.h"
 #include "../../object/ObjectManager.h"
@@ -26,7 +27,6 @@
 #include "../../peep/Staff.h"
 #include "../../ride/TrackDesign.h"
 #include "../../sprites.h"
-#include "../../world/Entity.h"
 #include "../../world/Surface.h"
 #include "../../world/TileInspector.h"
 #include "Paint.TileElement.h"

src/openrct2/peep/Guest.cpp

@@ -16,6 +16,10 @@
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
 #include "../core/Numerics.hpp"
+#include "../entity/Balloon.h"
+#include "../entity/MoneyEffect.h"
+#include "../entity/Particle.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window_internal.h"
 #include "../localisation/Localisation.h"
 #include "../management/Finance.h"
@@ -34,16 +38,12 @@
 #include "../scripting/ScriptEngine.h"
 #include "../util/Math.hpp"
 #include "../windows/Intent.h"
-#include "../world/Balloon.h"
 #include "../world/Climate.h"
 #include "../world/Footpath.h"
 #include "../world/LargeScenery.h"
 #include "../world/Map.h"
-#include "../world/MoneyEffect.h"
 #include "../world/Park.h"
-#include "../world/Particle.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "../world/TileElementsView.h"
 #include "GuestPathfinding.h"

src/openrct2/peep/Peep.cpp

@@ -19,6 +19,9 @@
 #include "../audio/audio.h"
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
+#include "../entity/Balloon.h"
+#include "../entity/EntityTweener.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
 #include "../management/Finance.h"
@@ -34,10 +37,8 @@
 #include "../sprites.h"
 #include "../util/Util.h"
 #include "../windows/Intent.h"
-#include "../world/Balloon.h"
 #include "../world/Climate.h"
 #include "../world/ConstructionClearance.h"
-#include "../world/EntityTweener.h"
 #include "../world/Entrance.h"
 #include "../world/Footpath.h"
 #include "../world/LargeScenery.h"
@@ -45,7 +46,6 @@
 #include "../world/Park.h"
 #include "../world/Scenery.h"
 #include "../world/SmallScenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "GuestPathfinding.h"
 #include "Staff.h"

src/openrct2/peep/Peep.h

@@ -11,10 +11,10 @@
 
 #include "../Identifiers.h"
 #include "../common.h"
+#include "../entity/EntityBase.h"
 #include "../ride/RideTypes.h"
 #include "../ride/Station.h"
 #include "../util/Util.h"
-#include "../world/EntityBase.h"
 #include "../world/Location.hpp"
 
 #include <algorithm>

src/openrct2/peep/Staff.cpp

@@ -16,6 +16,7 @@
 #include "../actions/StaffSetOrdersAction.h"
 #include "../audio/audio.h"
 #include "../config/Config.h"
+#include "../entity/Sprite.h"
 #include "../interface/Viewport.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -37,7 +38,6 @@
 #include "../world/Footpath.h"
 #include "../world/Scenery.h"
 #include "../world/SmallScenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "GuestPathfinding.h"
 #include "Peep.h"

src/openrct2/rct1/S4Importer.cpp

@@ -23,6 +23,14 @@
 #include "../core/Memory.hpp"
 #include "../core/Path.hpp"
 #include "../core/String.hpp"
+#include "../entity/Balloon.h"
+#include "../entity/Duck.h"
+#include "../entity/EntityList.h"
+#include "../entity/Fountain.h"
+#include "../entity/Litter.h"
+#include "../entity/MoneyEffect.h"
+#include "../entity/Particle.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -46,22 +54,14 @@
 #include "../scenario/ScenarioSources.h"
 #include "../util/SawyerCoding.h"
 #include "../util/Util.h"
-#include "../world/Balloon.h"
 #include "../world/Climate.h"
-#include "../world/Duck.h"
-#include "../world/EntityList.h"
 #include "../world/Entrance.h"
 #include "../world/Footpath.h"
-#include "../world/Fountain.h"
 #include "../world/LargeScenery.h"
-#include "../world/Litter.h"
 #include "../world/MapAnimation.h"
-#include "../world/MoneyEffect.h"
 #include "../world/Park.h"
-#include "../world/Particle.h"
 #include "../world/Scenery.h"
 #include "../world/SmallScenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "../world/TilePointerIndex.hpp"
 #include "../world/Wall.h"

src/openrct2/rct2/RCT2.h

@@ -11,11 +11,11 @@
 
 #include "../common.h"
 #include "../core/FileSystem.hpp"
+#include "../entity/EntityList.h"
 #include "../object/Object.h"
 #include "../rct12/RCT12.h"
 #include "../ride/RideRatings.h"
 #include "../ride/VehicleColour.h"
-#include "../world/EntityList.h"
 
 #include <tuple>
 #include <vector>

src/openrct2/rct2/S6Importer.cpp

@@ -22,6 +22,15 @@
 #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/EntityTweener.h"
+#include "../entity/Fountain.h"
+#include "../entity/Litter.h"
+#include "../entity/MoneyEffect.h"
+#include "../entity/Particle.h"
+#include "../entity/Sprite.h"
 #include "../interface/Viewport.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -54,20 +63,11 @@
 #include "../scenario/ScenarioRepository.h"
 #include "../util/SawyerCoding.h"
 #include "../util/Util.h"
-#include "../world/Balloon.h"
 #include "../world/Climate.h"
-#include "../world/Duck.h"
-#include "../world/EntityList.h"
-#include "../world/EntityTweener.h"
 #include "../world/Entrance.h"
-#include "../world/Fountain.h"
-#include "../world/Litter.h"
 #include "../world/MapAnimation.h"
-#include "../world/MoneyEffect.h"
 #include "../world/Park.h"
-#include "../world/Particle.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "../world/TilePointerIndex.hpp"
 

src/openrct2/ride/CableLift.cpp

@@ -10,9 +10,9 @@
 #include "CableLift.h"
 
 #include "../audio/audio.h"
+#include "../entity/EntityList.h"
 #include "../rct12/RCT12.h"
 #include "../util/Util.h"
-#include "../world/EntityList.h"
 #include "Ride.h"
 #include "RideData.h"
 #include "Track.h"

src/openrct2/ride/Ride.cpp

@@ -25,6 +25,7 @@
 #include "../core/FixedVector.h"
 #include "../core/Guard.hpp"
 #include "../core/Numerics.hpp"
+#include "../entity/Sprite.h"
 #include "../interface/Window.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -53,7 +54,6 @@
 #include "../world/MapAnimation.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "CableLift.h"
 #include "RideAudio.h"
 #include "RideData.h"

src/openrct2/ride/RideConstruction.cpp

@@ -15,6 +15,9 @@
 #include "../actions/RideSetVehicleAction.h"
 #include "../actions/TrackRemoveAction.h"
 #include "../common.h"
+#include "../entity/Entity.h"
+#include "../entity/EntityList.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -27,8 +30,6 @@
 #include "../windows/Intent.h"
 #include "../world/Banner.h"
 #include "../world/Climate.h"
-#include "../world/Entity.h"
-#include "../world/EntityList.h"
 #include "../world/Entrance.h"
 #include "../world/Footpath.h"
 #include "../world/Location.hpp"
@@ -36,7 +37,6 @@
 #include "../world/MapAnimation.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"
-#include "../world/Sprite.h"
 #include "Ride.h"
 #include "RideData.h"
 #include "Track.h"

src/openrct2/ride/ShopItem.h

@@ -10,8 +10,8 @@
 #pragma once
 
 #include "../common.h"
+#include "../entity/Litter.h"
 #include "../util/Util.h"
-#include "../world/Litter.h"
 
 struct Ride;
 enum class PeepThoughtType : uint8_t;

src/openrct2/ride/Vehicle.cpp

@@ -18,6 +18,8 @@
 #include "../audio/audio.h"
 #include "../config/Config.h"
 #include "../core/Memory.hpp"
+#include "../entity/Particle.h"
+#include "../entity/Sprite.h"
 #include "../interface/Viewport.h"
 #include "../localisation/Localisation.h"
 #include "../management/NewsItem.h"
@@ -31,10 +33,8 @@
 #include "../world/Map.h"
 #include "../world/MapAnimation.h"
 #include "../world/Park.h"
-#include "../world/Particle.h"
 #include "../world/Scenery.h"
 #include "../world/SmallScenery.h"
-#include "../world/Sprite.h"
 #include "../world/Surface.h"
 #include "../world/Wall.h"
 #include "CableLift.h"

src/openrct2/ride/Vehicle.h

@@ -11,8 +11,8 @@
 
 #include "../audio/audio.h"
 #include "../common.h"
+#include "../entity/EntityBase.h"
 #include "../ride/RideTypes.h"
-#include "../world/EntityBase.h"
 #include "../world/Location.hpp"
 #include "Station.h"
 #include "VehicleColour.h"

src/openrct2/ride/VehiclePaint.cpp

@@ -12,12 +12,12 @@
 #include "../Game.h"
 #include "../drawing/Drawing.h"
 #include "../drawing/LightFX.h"
+#include "../entity/Entity.h"
 #include "../interface/Viewport.h"
 #include "../paint/Paint.h"
 #include "../paint/sprite/Paint.Sprite.h"
 #include "../ride/RideData.h"
 #include "../ride/Vehicle.h"
-#include "../world/Entity.h"
 #include "Track.h"
 
 #include <iterator>

src/openrct2/ride/coaster/ReverserRollerCoaster.cpp

@@ -8,12 +8,12 @@
  *****************************************************************************/
 
 #include "../../drawing/Drawing.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../paint/tile_element/Paint.TileElement.h"
 #include "../../sprites.h"
-#include "../../world/Entity.h"
 #include "../../world/Map.h"
 #include "../RideData.h"
 #include "../TrackData.h"

src/openrct2/ride/gentle/FerrisWheel.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 "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../peep/Guest.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"

src/openrct2/ride/gentle/MiniGolf.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 "../../peep/Guest.h"
-#include "../../world/Entity.h"
 #include "../../world/Map.h"
 #include "../../world/Surface.h"
 #include "../RideData.h"

src/openrct2/ride/gentle/SpaceRings.cpp

@@ -8,11 +8,11 @@
  *****************************************************************************/
 
 #include "../../common.h"
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../peep/Guest.h"
-#include "../../world/Entity.h"
 #include "../Track.h"
 #include "../TrackPaint.h"
 #include "../Vehicle.h"

src/openrct2/ride/thrill/TopSpin.cpp

@@ -7,12 +7,12 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
+#include "../../entity/Entity.h"
 #include "../../interface/Viewport.h"
 #include "../../localisation/Localisation.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../sprites.h"
-#include "../../world/Entity.h"
 #include "../../world/Map.h"
 #include "../RideData.h"
 #include "../TrackData.h"

src/openrct2/ride/transport/SuspendedMonorail.cpp

@@ -8,13 +8,13 @@
  *****************************************************************************/
 
 #include "../../drawing/Drawing.h"
+#include "../../entity/Sprite.h"
 #include "../../interface/Viewport.h"
 #include "../../paint/Paint.h"
 #include "../../paint/Supports.h"
 #include "../../paint/tile_element/Paint.TileElement.h"
 #include "../../sprites.h"
 #include "../../world/Map.h"
-#include "../../world/Sprite.h"
 #include "../RideData.h"
 #include "../TrackData.h"
 #include "../TrackPaint.h"

src/openrct2/scenario/Scenario.cpp

@@ -20,6 +20,7 @@
 #include "../config/Config.h"
 #include "../core/Guard.hpp"
 #include "../core/Random.hpp"
+#include "../entity/Duck.h"
 #include "../interface/Viewport.h"
 #include "../localisation/Date.h"
 #include "../localisation/Localisation.h"
@@ -43,7 +44,6 @@
 #include "../util/Util.h"
 #include "../windows/Intent.h"
 #include "../world/Climate.h"
-#include "../world/Duck.h"
 #include "../world/Map.h"
 #include "../world/Park.h"
 #include "../world/Scenery.h"

src/openrct2/scenario/Scenario.h

@@ -11,6 +11,7 @@
 
 #include "../common.h"
 #include "../core/Random.hpp"
+#include "../entity/EntityList.h"
 #include "../management/Finance.h"
 #include "../management/Research.h"
 #include "../object/Object.h"
@@ -18,7 +19,6 @@
 #include "../ride/RideRatings.h"
 #include "../world/Banner.h"
 #include "../world/Climate.h"
-#include "../world/EntityList.h"
 #include "../world/Map.h"
 #include "../world/MapAnimation.h"
 

src/openrct2/scripting/bindings/entity/ScEntity.hpp

@@ -13,10 +13,10 @@
 
 #    include "../../../Context.h"
 #    include "../../../common.h"
+#    include "../../../entity/EntityList.h"
+#    include "../../../entity/Sprite.h"
 #    include "../../../peep/Peep.h"
 #    include "../../../util/Util.h"
-#    include "../../../world/EntityList.h"
-#    include "../../../world/Sprite.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"
 

src/openrct2/scripting/bindings/world/ScMap.cpp

@@ -12,18 +12,18 @@
 #    include "ScMap.hpp"
 
 #    include "../../../common.h"
+#    include "../../../entity/Balloon.h"
+#    include "../../../entity/Duck.h"
+#    include "../../../entity/EntityList.h"
+#    include "../../../entity/Fountain.h"
+#    include "../../../entity/Litter.h"
+#    include "../../../entity/MoneyEffect.h"
+#    include "../../../entity/Particle.h"
 #    include "../../../peep/Guest.h"
 #    include "../../../peep/Staff.h"
 #    include "../../../ride/Ride.h"
 #    include "../../../ride/TrainManager.h"
-#    include "../../../world/Balloon.h"
-#    include "../../../world/Duck.h"
-#    include "../../../world/EntityList.h"
-#    include "../../../world/Fountain.h"
-#    include "../../../world/Litter.h"
 #    include "../../../world/Map.h"
-#    include "../../../world/MoneyEffect.h"
-#    include "../../../world/Particle.h"
 #    include "../../Duktape.hpp"
 #    include "../entity/ScEntity.hpp"
 #    include "../entity/ScGuest.hpp"

src/openrct2/scripting/bindings/world/ScTile.cpp

@@ -14,10 +14,10 @@
 #    include "../../../Context.h"
 #    include "../../../common.h"
 #    include "../../../core/Guard.hpp"
+#    include "../../../entity/Sprite.h"
 #    include "../../../ride/Track.h"
 #    include "../../../world/Footpath.h"
 #    include "../../../world/Scenery.h"
-#    include "../../../world/Sprite.h"
 #    include "../../../world/Surface.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"

src/openrct2/scripting/bindings/world/ScTileElement.cpp

@@ -14,10 +14,10 @@
 #    include "../../../Context.h"
 #    include "../../../common.h"
 #    include "../../../core/Guard.hpp"
+#    include "../../../entity/Sprite.h"
 #    include "../../../ride/Track.h"
 #    include "../../../world/Footpath.h"
 #    include "../../../world/Scenery.h"
-#    include "../../../world/Sprite.h"
 #    include "../../../world/Surface.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"

src/openrct2/scripting/bindings/world/ScTileElement.hpp

@@ -14,10 +14,10 @@
 #    include "../../../Context.h"
 #    include "../../../common.h"
 #    include "../../../core/Guard.hpp"
+#    include "../../../entity/Sprite.h"
 #    include "../../../ride/Track.h"
 #    include "../../../world/Footpath.h"
 #    include "../../../world/Scenery.h"
-#    include "../../../world/Sprite.h"
 #    include "../../../world/Surface.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"

src/openrct2/world/Footpath.cpp

@@ -15,6 +15,8 @@
 #include "../actions/FootpathRemoveAction.h"
 #include "../actions/LandSetRightsAction.h"
 #include "../core/Guard.hpp"
+#include "../entity/EntityList.h"
+#include "../entity/Sprite.h"
 #include "../interface/Window_internal.h"
 #include "../localisation/Localisation.h"
 #include "../management/Finance.h"
@@ -30,11 +32,9 @@
 #include "../ride/Track.h"
 #include "../ride/TrackData.h"
 #include "../util/Util.h"
-#include "EntityList.h"
 #include "Map.h"
 #include "MapAnimation.h"
 #include "Park.h"
-#include "Sprite.h"
 #include "Surface.h"
 
 #include <algorithm>

src/openrct2/world/MapAnimation.cpp

@@ -11,6 +11,7 @@
 
 #include "../Context.h"
 #include "../Game.h"
+#include "../entity/EntityList.h"
 #include "../interface/Viewport.h"
 #include "../object/StationObject.h"
 #include "../peep/Peep.h"
@@ -19,7 +20,6 @@
 #include "../ride/Track.h"
 #include "../world/Wall.h"
 #include "Banner.h"
-#include "EntityList.h"
 #include "Footpath.h"
 #include "LargeScenery.h"
 #include "Map.h"

src/openrct2/world/Park.cpp

@@ -19,6 +19,7 @@
 #include "../config/Config.h"
 #include "../core/Memory.hpp"
 #include "../core/String.hpp"
+#include "../entity/Litter.h"
 #include "../interface/Colour.h"
 #include "../interface/Window.h"
 #include "../localisation/Localisation.h"
@@ -36,7 +37,6 @@
 #include "../util/Util.h"
 #include "../windows/Intent.h"
 #include "Entrance.h"
-#include "Litter.h"
 #include "Map.h"
 #include "Surface.h"
 

src/openrct2/world/Scenery.cpp

@@ -19,6 +19,7 @@
 #include "../actions/SmallSceneryRemoveAction.h"
 #include "../actions/WallRemoveAction.h"
 #include "../common.h"
+#include "../entity/Fountain.h"
 #include "../localisation/Localisation.h"
 #include "../network/network.h"
 #include "../object/ObjectList.h"
@@ -26,7 +27,6 @@
 #include "../scenario/Scenario.h"
 #include "Climate.h"
 #include "Footpath.h"
-#include "Fountain.h"
 #include "LargeScenery.h"
 #include "Map.h"
 #include "Park.h"

test/tests/PlayTests.cpp

@@ -17,15 +17,15 @@
 #include <openrct2/ParkImporter.h>
 #include <openrct2/actions/ParkSetParameterAction.h>
 #include <openrct2/actions/RideSetPriceAction.h>
+#include <openrct2/entity/EntityTweener.h>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/object/ObjectManager.h>
 #include <openrct2/peep/Peep.h>
 #include <openrct2/platform/platform.h>
 #include <openrct2/ride/Ride.h>
-#include <openrct2/world/EntityTweener.h>
 #include <openrct2/world/MapAnimation.h>
 #include <openrct2/world/Park.h>
 #include <openrct2/world/Scenery.h>
-#include <openrct2/world/Sprite.h>
 #include <string>
 
 using namespace OpenRCT2;

test/tests/S6ImportExportTests.cpp

@@ -25,14 +25,14 @@
 #include <openrct2/core/MemoryStream.h>
 #include <openrct2/core/Path.hpp>
 #include <openrct2/core/String.hpp>
+#include <openrct2/entity/EntityTweener.h>
+#include <openrct2/entity/Sprite.h>
 #include <openrct2/network/network.h>
 #include <openrct2/object/ObjectManager.h>
 #include <openrct2/platform/platform.h>
 #include <openrct2/ride/Ride.h>
 #include <openrct2/scenario/Scenario.h>
-#include <openrct2/world/EntityTweener.h>
 #include <openrct2/world/MapAnimation.h>
-#include <openrct2/world/Sprite.h>
 #include <stdio.h>
 #include <string>