diff --git a/src/KingSystem/ActorSystem/actBaseProcCreateTask.cpp b/src/KingSystem/ActorSystem/actBaseProcCreateTask.cpp
index e69b0cb6..9573ee6c 100644
--- a/src/KingSystem/ActorSystem/actBaseProcCreateTask.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcCreateTask.cpp
@@ -1,4 +1,5 @@
 #include "KingSystem/ActorSystem/actBaseProcCreateTask.h"
+#include "KingSystem/ActorSystem/actBaseProc.h"
 #include "KingSystem/ActorSystem/actBaseProcHandle.h"
 #include "KingSystem/ActorSystem/actBaseProcUnit.h"
 #include "KingSystem/Map/mapObject.h"
diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index 0b793c9f..d0b57fde 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -1,4 +1,5 @@
 #include "KingSystem/Map/mapObject.h"
+#include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actBaseProcMgr.h"
 #include "KingSystem/ActorSystem/actInfoData.h"
 #include "KingSystem/GameData/gdtManager.h"
diff --git a/src/KingSystem/Map/mapObject.h b/src/KingSystem/Map/mapObject.h
index 10e9d3c5..39c35eab 100644
--- a/src/KingSystem/Map/mapObject.h
+++ b/src/KingSystem/Map/mapObject.h
@@ -3,7 +3,6 @@
 #include <basis/seadTypes.h>
 #include <heap/seadHeap.h>
 #include <prim/seadTypedBitFlag.h>
-#include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
 #include "KingSystem/ActorSystem/actDebug.h"
 #include "KingSystem/GameData/gdtFlagHandle.h"
@@ -14,6 +13,7 @@
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::act {
+class Actor;
 class BaseProc;
 class BaseProcInitializer;
 class BaseProcCreateTask;
diff --git a/src/KingSystem/Map/mapPlacementMgr.cpp b/src/KingSystem/Map/mapPlacementMgr.cpp
index 3ca5b27c..78e3df81 100644
--- a/src/KingSystem/Map/mapPlacementMgr.cpp
+++ b/src/KingSystem/Map/mapPlacementMgr.cpp
@@ -1,5 +1,6 @@
 #include "KingSystem/Map/mapPlacementMgr.h"
 #include <thread/seadThreadUtil.h>
+#include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorCreator.h"
 #include "KingSystem/ActorSystem/actClusteredRenderer.h"
 #include "KingSystem/ActorSystem/actInfoData.h"
diff --git a/src/KingSystem/Map/mapPlacementMgr.h b/src/KingSystem/Map/mapPlacementMgr.h
index 28ac2700..3cd10767 100644
--- a/src/KingSystem/Map/mapPlacementMgr.h
+++ b/src/KingSystem/Map/mapPlacementMgr.h
@@ -3,10 +3,14 @@
 #include <container/seadObjArray.h>
 #include <heap/seadDisposer.h>
 #include <heap/seadExpHeap.h>
+#include <math/seadVector.h>
+#include <prim/seadDelegate.h>
+#include <prim/seadTypedBitFlag.h>
 #include <thread/seadDelegateThread.h>
-#include "KingSystem/ActorSystem/actActor.h"
+#include "KingSystem/Utils/Types.h"
 
 namespace ksys::act {
+class Actor;
 class ClusteredRenderer;
 class InstParamPack;
 }  // namespace ksys::act
diff --git a/src/KingSystem/Quest/qstStep.cpp b/src/KingSystem/Quest/qstStep.cpp
index b20e32f9..858c18c9 100644
--- a/src/KingSystem/Quest/qstStep.cpp
+++ b/src/KingSystem/Quest/qstStep.cpp
@@ -1,5 +1,6 @@
 #include "KingSystem/Quest/qstStep.h"
 #include <memory>
+#include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/Quest/qstActorData.h"
 #include "KingSystem/Quest/qstIndicator.h"
 
diff --git a/src/KingSystem/Quest/qstStep.h b/src/KingSystem/Quest/qstStep.h
index 551b3c92..59d86d25 100644
--- a/src/KingSystem/Quest/qstStep.h
+++ b/src/KingSystem/Quest/qstStep.h
@@ -2,12 +2,16 @@
 
 #include <container/seadObjArray.h>
 #include <container/seadPtrArray.h>
-#include "KingSystem/ActorSystem/actActor.h"
+#include <prim/seadSafeString.h>
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
 #include "KingSystem/GameData/gdtFlagHandle.h"
 #include "KingSystem/Utils/Byaml/Byaml.h"
 #include "KingSystem/Utils/Types.h"
 
+namespace ksys::act {
+class Actor;
+}
+
 namespace ksys::qst {
 
 struct ActorData;