diff --git a/src/openrct2-ui/input/MouseInput.cpp b/src/openrct2-ui/input/MouseInput.cpp
index 2eb21c2ceb..1663124c1f 100644
--- a/src/openrct2-ui/input/MouseInput.cpp
+++ b/src/openrct2-ui/input/MouseInput.cpp
@@ -35,7 +35,6 @@
 #include <openrct2/ui/UiContext.h>
 #include <openrct2/ui/WindowManager.h>
 #include <openrct2/world/Banner.h>
-#include <openrct2/world/Map.h>
 #include <openrct2/world/Scenery.h>
 #include <optional>
 
diff --git a/src/openrct2-ui/interface/LandTool.cpp b/src/openrct2-ui/interface/LandTool.cpp
index d5fce04b1e..63af5d7263 100644
--- a/src/openrct2-ui/interface/LandTool.cpp
+++ b/src/openrct2-ui/interface/LandTool.cpp
@@ -19,7 +19,6 @@
 #include <openrct2/object/ObjectManager.h>
 #include <openrct2/object/TerrainEdgeObject.h>
 #include <openrct2/object/TerrainSurfaceObject.h>
-#include <openrct2/world/Map.h>
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Ui::Windows;
diff --git a/src/openrct2-ui/interface/ViewportInteraction.cpp b/src/openrct2-ui/interface/ViewportInteraction.cpp
index 1a8edf19f9..47cda3fdfe 100644
--- a/src/openrct2-ui/interface/ViewportInteraction.cpp
+++ b/src/openrct2-ui/interface/ViewportInteraction.cpp
@@ -49,7 +49,6 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/Banner.h>
 #include <openrct2/world/Footpath.h>
-#include <openrct2/world/Map.h>
 #include <openrct2/world/Park.h>
 #include <openrct2/world/Scenery.h>
 #include <openrct2/world/tile_element/BannerElement.h>
diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp
index 207157c8f4..4e1588f3d8 100644
--- a/src/openrct2-ui/scripting/CustomMenu.cpp
+++ b/src/openrct2-ui/scripting/CustomMenu.cpp
@@ -18,7 +18,6 @@
     #include <openrct2/Input.h>
     #include <openrct2/ui/UiContext.h>
     #include <openrct2/ui/WindowManager.h>
-    #include <openrct2/world/Map.h>
 
 using namespace OpenRCT2;
 using namespace OpenRCT2::Ui;
diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp
index 6a09c53802..6ba5b930b1 100644
--- a/src/openrct2-ui/scripting/ScViewport.hpp
+++ b/src/openrct2-ui/scripting/ScViewport.hpp
@@ -19,7 +19,6 @@
     #include <openrct2/scripting/Duktape.hpp>
     #include <openrct2/scripting/ScriptEngine.h>
     #include <openrct2/ui/WindowManager.h>
-    #include <openrct2/world/Map.h>
 
 namespace OpenRCT2::Scripting
 {
diff --git a/src/openrct2-ui/title/TitleSequencePlayer.cpp b/src/openrct2-ui/title/TitleSequencePlayer.cpp
index 35473f07cc..9389ef5fa3 100644
--- a/src/openrct2-ui/title/TitleSequencePlayer.cpp
+++ b/src/openrct2-ui/title/TitleSequencePlayer.cpp
@@ -36,7 +36,6 @@
 #include <openrct2/scenes/title/TitleSequencePlayer.h>
 #include <openrct2/ui/WindowManager.h>
 #include <openrct2/windows/Intent.h>
-#include <openrct2/world/Map.h>
 #include <openrct2/world/MapAnimation.h>
 #include <openrct2/world/Scenery.h>
 #include <stdexcept>
diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index 2b63befbd7..c18b8e1150 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -50,7 +50,6 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2/world/ConstructionClearance.h>
 #include <openrct2/world/Entrance.h>
-#include <openrct2/world/Map.h>
 #include <openrct2/world/Park.h>
 #include <openrct2/world/tile_element/EntranceElement.h>
 #include <openrct2/world/tile_element/PathElement.h>
diff --git a/src/openrct2/world/Banner.cpp b/src/openrct2/world/Banner.cpp
index 5238400baa..2b29b02650 100644
--- a/src/openrct2/world/Banner.cpp
+++ b/src/openrct2/world/Banner.cpp
@@ -27,7 +27,6 @@
 #include "../ride/RideManager.hpp"
 #include "../ride/Track.h"
 #include "../windows/Intent.h"
-#include "Map.h"
 #include "MapAnimation.h"
 #include "Park.h"
 #include "Scenery.h"
diff --git a/src/openrct2/world/ConstructionClearance.h b/src/openrct2/world/ConstructionClearance.h
index eb6cb9e792..6ee98ef763 100644
--- a/src/openrct2/world/ConstructionClearance.h
+++ b/src/openrct2/world/ConstructionClearance.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "../actions/GameActionResult.h"
-#include "Map.h"
+#include "Location.hpp"
 
 #include <cstdint>
 
diff --git a/src/openrct2/world/Entrance.cpp b/src/openrct2/world/Entrance.cpp
index 1ec57fb7bb..bfb2e92947 100644
--- a/src/openrct2/world/Entrance.cpp
+++ b/src/openrct2/world/Entrance.cpp
@@ -27,7 +27,6 @@
 #include "../ride/Station.h"
 #include "../ride/Track.h"
 #include "Footpath.h"
-#include "Map.h"
 #include "MapAnimation.h"
 #include "Park.h"
 #include "tile_element/EntranceElement.h"
diff --git a/src/openrct2/world/Footpath.cpp b/src/openrct2/world/Footpath.cpp
index 9b89a21dbc..3f81b25cf7 100644
--- a/src/openrct2/world/Footpath.cpp
+++ b/src/openrct2/world/Footpath.cpp
@@ -34,7 +34,6 @@
 #include "../ride/Track.h"
 #include "../ride/TrackData.h"
 #include "Location.hpp"
-#include "Map.h"
 #include "MapAnimation.h"
 #include "tile_element/BannerElement.h"
 #include "tile_element/EntranceElement.h"
diff --git a/src/openrct2/world/MapAnimation.cpp b/src/openrct2/world/MapAnimation.cpp
index 8f06244617..69ca1f362d 100644
--- a/src/openrct2/world/MapAnimation.cpp
+++ b/src/openrct2/world/MapAnimation.cpp
@@ -26,7 +26,6 @@
 #include "../ride/Track.h"
 #include "Banner.h"
 #include "Footpath.h"
-#include "Map.h"
 #include "Scenery.h"
 #include "tile_element/EntranceElement.h"
 #include "tile_element/LargeSceneryElement.h"
diff --git a/src/openrct2/world/Park.cpp b/src/openrct2/world/Park.cpp
index 7e906171fa..5357f81285 100644
--- a/src/openrct2/world/Park.cpp
+++ b/src/openrct2/world/Park.cpp
@@ -38,7 +38,6 @@
 #include "../util/Util.h"
 #include "../windows/Intent.h"
 #include "Entrance.h"
-#include "Map.h"
 #include "tile_element/EntranceElement.h"
 #include "tile_element/SurfaceElement.h"
 
diff --git a/src/openrct2/world/Park.h b/src/openrct2/world/Park.h
index 7adab5dba8..a964e86fa0 100644
--- a/src/openrct2/world/Park.h
+++ b/src/openrct2/world/Park.h
@@ -10,9 +10,10 @@
 #pragma once
 
 #include "../management/Finance.h"
-#include "Map.h"
+#include "Location.hpp"
 
 #include <string>
+#include <vector>
 
 constexpr auto kMaxEntranceFee = 999.00_GBP;
 
diff --git a/src/openrct2/world/Scenery.cpp b/src/openrct2/world/Scenery.cpp
index e656c74d20..5b67c7ea7f 100644
--- a/src/openrct2/world/Scenery.cpp
+++ b/src/openrct2/world/Scenery.cpp
@@ -34,7 +34,6 @@
 #include "../object/SmallSceneryEntry.h"
 #include "../object/WallSceneryEntry.h"
 #include "Footpath.h"
-#include "Map.h"
 #include "Park.h"
 #include "tile_element/PathElement.h"
 #include "tile_element/SmallSceneryElement.h"
diff --git a/src/openrct2/world/TileInspector.cpp b/src/openrct2/world/TileInspector.cpp
index 4d5bf10120..833102d5c4 100644
--- a/src/openrct2/world/TileInspector.cpp
+++ b/src/openrct2/world/TileInspector.cpp
@@ -20,7 +20,6 @@
 #include "Banner.h"
 #include "Footpath.h"
 #include "Location.hpp"
-#include "Map.h"
 #include "MapAnimation.h"
 #include "Park.h"
 #include "Scenery.h"
diff --git a/src/openrct2/world/TileInspector.h b/src/openrct2/world/TileInspector.h
index dc34da7ab9..ff7687594f 100644
--- a/src/openrct2/world/TileInspector.h
+++ b/src/openrct2/world/TileInspector.h
@@ -9,9 +9,10 @@
 
 #pragma once
 
-#include "Map.h"
+#include "Location.hpp"
 
 struct Banner;
+struct TileElement;
 
 namespace OpenRCT2::GameActions
 {