6 files changed, 7 insertions, 42 deletions
diff --git a/src/KingSystem/Map/CMakeLists.txt b/src/KingSystem/Map/CMakeLists.txt
index b201b701..52a8c659 100644
--- a/src/KingSystem/Map/CMakeLists.txt
+++ b/src/KingSystem/Map/CMakeLists.txt
@@ -26,6 +26,4 @@ target_sources(uking PRIVATE
   mapPlacementTree.h
   mapRail.cpp
   mapRail.h
-  mapStagePreActorCache.cpp
-  mapStagePreActorCache.h
 )
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index a22274f2..c5e838a7 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -6,7 +6,7 @@
 #include "KingSystem/Graphics/gfxForestRenderer.h"
 #include "KingSystem/Map/mapObjectLink.h"
 #include "KingSystem/Map/mapPlacementMgr.h"
-#include "KingSystem/Map/mapStagePreActorCache.h"
+#include "KingSystem/System/StagePreActorCache.h"
 #include "KingSystem/Terrain/teraSystem.h"
 #include "KingSystem/Utils/Debug.h"
 
diff --git a/src/KingSystem/Map/mapPlacementAreaMgr.h b/src/KingSystem/Map/mapPlacementAreaMgr.h
index dee435f5..e040c417 100644
--- a/src/KingSystem/Map/mapPlacementAreaMgr.h
+++ b/src/KingSystem/Map/mapPlacementAreaMgr.h
@@ -6,8 +6,8 @@
 #include <prim/seadSafeString.h>
 #include <prim/seadTypedBitFlag.h>
 
-#include "KingSystem/Map/mapStagePreActorCache.h"
 #include "KingSystem/Map/mapTypes.h"
+#include "KingSystem/System/StagePreActorCache.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::gdt {
diff --git a/src/KingSystem/Map/mapPlacementMapMgr.h b/src/KingSystem/Map/mapPlacementMapMgr.h
index 913c419a..6fb6d848 100644
--- a/src/KingSystem/Map/mapPlacementMapMgr.h
+++ b/src/KingSystem/Map/mapPlacementMapMgr.h
@@ -8,11 +8,14 @@
 #include "KingSystem/Resource/resHandle.h"
 #include "KingSystem/Utils/Types.h"
 
+namespace ksys::act {
+class FarActorMerge;
+}  // namespace ksys::act
+
 namespace ksys::map {
 
 class MapProperties;
 class Placement18;
-class FarActorMerge;
 class PlacementActors;
 
 class PlacementMap;
@@ -49,7 +52,7 @@ private:
     s32 _18;
     s32 _1c;
     PlacementMapArray mMapArray;
-    FarActorMerge* mFarActorMerge;
+    act::FarActorMerge* mFarActorMerge;
     s32 mNeedLoadDynMap;
     s32 mNeedLoadDynMapPhysics;
     bool mIsShrineOrDivineBeast;
diff --git a/src/KingSystem/Map/mapStagePreActorCache.cpp b/src/KingSystem/Map/mapStagePreActorCache.cpp
deleted file mode 100644
index cc853e2a..00000000
--- a/src/KingSystem/Map/mapStagePreActorCache.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "KingSystem/Map/mapStagePreActorCache.h"
-
-namespace ksys::map {
-
-SEAD_SINGLETON_DISPOSER_IMPL(StagePreActorCache)
-
-}  // namespace ksys::map
diff --git a/src/KingSystem/Map/mapStagePreActorCache.h b/src/KingSystem/Map/mapStagePreActorCache.h
deleted file mode 100644
index 666779e8..00000000
--- a/src/KingSystem/Map/mapStagePreActorCache.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#pragma once
-
-#include <heap/seadDisposer.h>
-#include <math/seadVector.h>
-
-namespace ksys::gfx {
-class ForestRenderer;
-}
-
-namespace ksys::map {
-
-class LazyTraverseList;
-
-// TODO
-class StagePreActorCache {
-    SEAD_SINGLETON_DISPOSER(StagePreActorCache)
-    StagePreActorCache();
-
-public:
-    LazyTraverseList* getObjects() const { return mObjects; }
-    auto* getForestRenderer() { return mForestRenderer; }
-
-private:
-    char _0[0x20];
-    LazyTraverseList* mObjects;
-    gfx::ForestRenderer* mForestRenderer;
-};
-
-}  // namespace ksys::map