diff --git a/src/openrct2/actions/FootpathPlaceAction.cpp b/src/openrct2/actions/FootpathPlaceAction.cpp
index 70eb1d1418..14a19f47cf 100644
--- a/src/openrct2/actions/FootpathPlaceAction.cpp
+++ b/src/openrct2/actions/FootpathPlaceAction.cpp
@@ -29,6 +29,7 @@
 #include "../world/Scenery.h"
 #include "../world/Surface.h"
 #include "../world/TileElementsView.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/EntranceElement.h"
 #include "../world/tile_element/Slope.h"
 
diff --git a/src/openrct2/actions/LandSetHeightAction.cpp b/src/openrct2/actions/LandSetHeightAction.cpp
index a2f6fd8b23..eb7bf19262 100644
--- a/src/openrct2/actions/LandSetHeightAction.cpp
+++ b/src/openrct2/actions/LandSetHeightAction.cpp
@@ -23,6 +23,7 @@
 #include "../world/Scenery.h"
 #include "../world/Surface.h"
 #include "../world/TileElementsView.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/Slope.h"
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp
index 86967f1b03..b4229620a9 100644
--- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp
+++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp
@@ -23,6 +23,7 @@
 #include "../world/MapAnimation.h"
 #include "../world/QuarterTile.h"
 #include "../world/Surface.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/Slope.h"
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/actions/MazePlaceTrackAction.cpp b/src/openrct2/actions/MazePlaceTrackAction.cpp
index d76a737535..5ae8c13497 100644
--- a/src/openrct2/actions/MazePlaceTrackAction.cpp
+++ b/src/openrct2/actions/MazePlaceTrackAction.cpp
@@ -15,6 +15,7 @@
 #include "../ride/RideData.h"
 #include "../ride/TrackData.h"
 #include "../world/ConstructionClearance.h"
+#include "../world/Wall.h"
 
 using namespace OpenRCT2;
 
diff --git a/src/openrct2/actions/MazeSetTrackAction.cpp b/src/openrct2/actions/MazeSetTrackAction.cpp
index b2a2c7043f..ffae52ea7e 100644
--- a/src/openrct2/actions/MazeSetTrackAction.cpp
+++ b/src/openrct2/actions/MazeSetTrackAction.cpp
@@ -23,6 +23,7 @@
 #include "../world/ConstructionClearance.h"
 #include "../world/Footpath.h"
 #include "../world/Park.h"
+#include "../world/Wall.h"
 
 using namespace OpenRCT2;
 
diff --git a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp
index 0c36593739..b10188e9be 100644
--- a/src/openrct2/actions/RideEntranceExitPlaceAction.cpp
+++ b/src/openrct2/actions/RideEntranceExitPlaceAction.cpp
@@ -17,6 +17,7 @@
 #include "../ride/Station.h"
 #include "../world/ConstructionClearance.h"
 #include "../world/MapAnimation.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/EntranceElement.h"
 
 using namespace OpenRCT2;
diff --git a/src/openrct2/actions/SmallSceneryPlaceAction.cpp b/src/openrct2/actions/SmallSceneryPlaceAction.cpp
index 876f04bb09..3f6ee3302c 100644
--- a/src/openrct2/actions/SmallSceneryPlaceAction.cpp
+++ b/src/openrct2/actions/SmallSceneryPlaceAction.cpp
@@ -28,6 +28,7 @@
 #include "../world/Scenery.h"
 #include "../world/Surface.h"
 #include "../world/TileElement.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/Slope.h"
 #include "GameAction.h"
 #include "SmallSceneryRemoveAction.h"
diff --git a/src/openrct2/actions/TrackPlaceAction.cpp b/src/openrct2/actions/TrackPlaceAction.cpp
index 277670afe4..7992d643f8 100644
--- a/src/openrct2/actions/TrackPlaceAction.cpp
+++ b/src/openrct2/actions/TrackPlaceAction.cpp
@@ -22,6 +22,7 @@
 #include "../world/MapAnimation.h"
 #include "../world/QuarterTile.h"
 #include "../world/Surface.h"
+#include "../world/Wall.h"
 #include "../world/tile_element/Slope.h"
 #include "RideSetSettingAction.h"
 
diff --git a/src/openrct2/actions/WaterSetHeightAction.cpp b/src/openrct2/actions/WaterSetHeightAction.cpp
index b5922c6912..283c96892a 100644
--- a/src/openrct2/actions/WaterSetHeightAction.cpp
+++ b/src/openrct2/actions/WaterSetHeightAction.cpp
@@ -16,6 +16,7 @@
 #include "../world/ConstructionClearance.h"
 #include "../world/Park.h"
 #include "../world/Surface.h"
+#include "../world/Wall.h"
 
 using namespace OpenRCT2;
 
diff --git a/src/openrct2/world/Map.h b/src/openrct2/world/Map.h
index d05ac925d9..d877aa6aae 100644
--- a/src/openrct2/world/Map.h
+++ b/src/openrct2/world/Map.h
@@ -200,9 +200,6 @@ void MapExtendBoundarySurfaceX();
 void MapExtendBoundarySurfaceY();
 
 bool MapLargeScenerySignSetColour(const CoordsXYZD& signPos, int32_t sequence, uint8_t mainColour, uint8_t textColour);
-void WallRemoveAt(const CoordsXYRangedZ& wallPos);
-void WallRemoveAtZ(const CoordsXYZ& wallPos);
-void WallRemoveIntersectingWalls(const CoordsXYRangedZ& wallPos, Direction direction);
 
 void MapInvalidateTile(const CoordsXYRangedZ& tilePos);
 void MapInvalidateTileZoom1(const CoordsXYRangedZ& tilePos);
diff --git a/src/openrct2/world/Wall.h b/src/openrct2/world/Wall.h
index 43e39b5e69..1c4db9ca84 100644
--- a/src/openrct2/world/Wall.h
+++ b/src/openrct2/world/Wall.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "TileElement.h"
+#include "Location.hpp"
 
 enum EDGE_SLOPE
 {
@@ -21,4 +21,8 @@ enum EDGE_SLOPE
     EDGE_SLOPE_DOWNWARDS_ELEVATED = EDGE_SLOPE_DOWNWARDS | EDGE_SLOPE_ELEVATED,
 };
 
+void WallRemoveAt(const CoordsXYRangedZ& wallPos);
+void WallRemoveAtZ(const CoordsXYZ& wallPos);
+void WallRemoveIntersectingWalls(const CoordsXYRangedZ& wallPos, Direction direction);
+
 uint8_t GetWallSlopeFromEdgeSlope(uint8_t Slope, uint8_t Edge);