From 2f9e3d0c322e4340a12f1cf631128b78499374c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Thu, 14 Jan 2021 12:09:28 +0100
Subject: [PATCH] ksys/map: Fix include cycle

---
 src/KingSystem/Map/mapObject.cpp     | 1 +
 src/KingSystem/Map/mapObject.h       | 1 -
 src/KingSystem/Map/mapObjectLink.cpp | 1 +
 src/KingSystem/Map/mapObjectLink.h   | 9 ++++++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/KingSystem/Map/mapObject.cpp b/src/KingSystem/Map/mapObject.cpp
index 92cfb6af..6d62d9c2 100644
--- a/src/KingSystem/Map/mapObject.cpp
+++ b/src/KingSystem/Map/mapObject.cpp
@@ -1,5 +1,6 @@
 #include "KingSystem/Map/mapObject.h"
 #include "KingSystem/ActorSystem/actBaseProcMgr.h"
+#include "KingSystem/Map/mapObjectLink.h"
 #include "KingSystem/Utils/Debug.h"
 
 namespace ksys::map {
diff --git a/src/KingSystem/Map/mapObject.h b/src/KingSystem/Map/mapObject.h
index 0640d0d1..baf41acf 100644
--- a/src/KingSystem/Map/mapObject.h
+++ b/src/KingSystem/Map/mapObject.h
@@ -8,7 +8,6 @@
 #include "KingSystem/ActorSystem/actDebug.h"
 #include "KingSystem/Map/mapDebug.h"
 #include "KingSystem/Map/mapMubinIter.h"
-#include "KingSystem/Map/mapObjectLink.h"
 #include "KingSystem/Map/mapPlacementMgr.h"
 #include "KingSystem/Utils/Types.h"
 
diff --git a/src/KingSystem/Map/mapObjectLink.cpp b/src/KingSystem/Map/mapObjectLink.cpp
index b2ab0502..8bc85335 100644
--- a/src/KingSystem/Map/mapObjectLink.cpp
+++ b/src/KingSystem/Map/mapObjectLink.cpp
@@ -1,4 +1,5 @@
 #include "KingSystem/Map/mapObjectLink.h"
+#include "KingSystem/Map/mapObject.h"
 
 namespace ksys::map {
 
diff --git a/src/KingSystem/Map/mapObjectLink.h b/src/KingSystem/Map/mapObjectLink.h
index 09ef72e0..b0f25f7b 100644
--- a/src/KingSystem/Map/mapObjectLink.h
+++ b/src/KingSystem/Map/mapObjectLink.h
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "KingSystem/Map/mapObject.h"
+#include <basis/seadTypes.h>
+#include "KingSystem/Map/mapMubinIter.h"
+#include "KingSystem/Utils/Types.h"
+
+namespace ksys::act {
+class ActorLinkConstDataAccess;
+class BaseProc;
+}  // namespace ksys::act
 
 namespace ksys::map {