diff --git a/src/openrct2/libopenrct2.vcxproj b/src/openrct2/libopenrct2.vcxproj
index f1878287a4..65e4f442e2 100644
--- a/src/openrct2/libopenrct2.vcxproj
+++ b/src/openrct2/libopenrct2.vcxproj
@@ -1085,6 +1085,7 @@
     <ClCompile Include="Version.cpp" />
     <ClCompile Include="windows\Intent.cpp" />
     <ClCompile Include="world\tile_element\EntranceElement.cpp" />
+    <ClCompile Include="world\tile_element\TileElementBase.cpp" />
     <ClCompile Include="world\Banner.cpp" />
     <ClCompile Include="world\Climate.cpp" />
     <ClCompile Include="world\ConstructionClearance.cpp" />
@@ -1101,7 +1102,6 @@
     <ClCompile Include="world\Surface.cpp" />
     <ClCompile Include="world\SurfaceData.cpp" />
     <ClCompile Include="world\TileElement.cpp" />
-    <ClCompile Include="world/TileElementBase.cpp" />
     <ClCompile Include="world\TileInspector.cpp" />
     <ClCompile Include="world\Wall.cpp" />
     <ClCompile Include="..\thirdparty\duktape\duktape.cpp">
diff --git a/src/openrct2/world/TileElement.cpp b/src/openrct2/world/TileElement.cpp
index c42080c9ab..c8bae8ceaa 100644
--- a/src/openrct2/world/TileElement.cpp
+++ b/src/openrct2/world/TileElement.cpp
@@ -160,71 +160,3 @@ const QuarterTile QuarterTile::Rotate(uint8_t amount) const
             return QuarterTile{ 0 };
     }
 }
-
-const SurfaceElement* TileElementBase::AsSurface() const
-{
-    return as<SurfaceElement>();
-}
-SurfaceElement* TileElementBase::AsSurface()
-{
-    return as<SurfaceElement>();
-}
-const PathElement* TileElementBase::AsPath() const
-{
-    return as<PathElement>();
-}
-PathElement* TileElementBase::AsPath()
-{
-    return as<PathElement>();
-}
-const TrackElement* TileElementBase::AsTrack() const
-{
-    return as<TrackElement>();
-}
-TrackElement* TileElementBase::AsTrack()
-{
-    return as<TrackElement>();
-}
-const SmallSceneryElement* TileElementBase::AsSmallScenery() const
-{
-    return as<SmallSceneryElement>();
-}
-SmallSceneryElement* TileElementBase::AsSmallScenery()
-{
-    return as<SmallSceneryElement>();
-}
-const LargeSceneryElement* TileElementBase::AsLargeScenery() const
-{
-    return as<LargeSceneryElement>();
-}
-LargeSceneryElement* TileElementBase::AsLargeScenery()
-{
-    return as<LargeSceneryElement>();
-}
-const WallElement* TileElementBase::AsWall() const
-{
-    return as<WallElement>();
-}
-WallElement* TileElementBase::AsWall()
-{
-    return as<WallElement>();
-}
-
-const EntranceElement* TileElementBase::AsEntrance() const
-{
-    return as<EntranceElement>();
-}
-
-EntranceElement* TileElementBase::AsEntrance()
-{
-    return as<EntranceElement>();
-}
-
-const BannerElement* TileElementBase::AsBanner() const
-{
-    return as<BannerElement>();
-}
-BannerElement* TileElementBase::AsBanner()
-{
-    return as<BannerElement>();
-}
diff --git a/src/openrct2/world/TileElementBase.cpp b/src/openrct2/world/tile_element/TileElementBase.cpp
similarity index 66%
rename from src/openrct2/world/TileElementBase.cpp
rename to src/openrct2/world/tile_element/TileElementBase.cpp
index 5a3ce735bb..3541e6c02e 100644
--- a/src/openrct2/world/TileElementBase.cpp
+++ b/src/openrct2/world/tile_element/TileElementBase.cpp
@@ -7,8 +7,9 @@
  * OpenRCT2 is licensed under the GNU General Public License version 3.
  *****************************************************************************/
 
-#include "Map.h"
-#include "TileElement.h"
+#include "../Map.h"
+#include "../TileElement.h"
+#include "EntranceElement.h"
 
 TileElementType TileElementBase::GetType() const
 {
@@ -126,3 +127,71 @@ void TileElementBase::SetOwner(uint8_t newOwner)
     Owner &= ~OWNER_MASK;
     Owner |= (newOwner & OWNER_MASK);
 }
+
+const SurfaceElement* TileElementBase::AsSurface() const
+{
+    return as<SurfaceElement>();
+}
+SurfaceElement* TileElementBase::AsSurface()
+{
+    return as<SurfaceElement>();
+}
+const PathElement* TileElementBase::AsPath() const
+{
+    return as<PathElement>();
+}
+PathElement* TileElementBase::AsPath()
+{
+    return as<PathElement>();
+}
+const TrackElement* TileElementBase::AsTrack() const
+{
+    return as<TrackElement>();
+}
+TrackElement* TileElementBase::AsTrack()
+{
+    return as<TrackElement>();
+}
+const SmallSceneryElement* TileElementBase::AsSmallScenery() const
+{
+    return as<SmallSceneryElement>();
+}
+SmallSceneryElement* TileElementBase::AsSmallScenery()
+{
+    return as<SmallSceneryElement>();
+}
+const LargeSceneryElement* TileElementBase::AsLargeScenery() const
+{
+    return as<LargeSceneryElement>();
+}
+LargeSceneryElement* TileElementBase::AsLargeScenery()
+{
+    return as<LargeSceneryElement>();
+}
+const WallElement* TileElementBase::AsWall() const
+{
+    return as<WallElement>();
+}
+WallElement* TileElementBase::AsWall()
+{
+    return as<WallElement>();
+}
+
+const EntranceElement* TileElementBase::AsEntrance() const
+{
+    return as<EntranceElement>();
+}
+
+EntranceElement* TileElementBase::AsEntrance()
+{
+    return as<EntranceElement>();
+}
+
+const BannerElement* TileElementBase::AsBanner() const
+{
+    return as<BannerElement>();
+}
+BannerElement* TileElementBase::AsBanner()
+{
+    return as<BannerElement>();
+}