From 819798cac1d0767aae1ef438acbd4226a63c4b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Thu, 11 Mar 2021 15:10:26 +0100
Subject: [PATCH] Fix include cycles and useless includes

---
 src/Game/Damage/dmgDamageCallback.h              | 2 --
 src/Game/Damage/dmgDamageManagerBase.cpp         | 1 +
 src/Game/Damage/dmgDamageManagerBase.h           | 3 ++-
 src/KingSystem/ActorSystem/actBaseProcHandle.cpp | 1 +
 src/KingSystem/ActorSystem/actBaseProcHandle.h   | 1 -
 src/KingSystem/ActorSystem/actBaseProcUnit.cpp   | 3 ++-
 src/KingSystem/ActorSystem/actBaseProcUnit.h     | 1 -
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Game/Damage/dmgDamageCallback.h b/src/Game/Damage/dmgDamageCallback.h
index 7c7e0e4d..b62e2658 100644
--- a/src/Game/Damage/dmgDamageCallback.h
+++ b/src/Game/Damage/dmgDamageCallback.h
@@ -2,8 +2,6 @@
 
 #include <basis/seadTypes.h>
 
-#include "Game/Damage/dmgDamageManagerBase.h"
-
 namespace uking::dmg {
 
 class DamageManagerBase;
diff --git a/src/Game/Damage/dmgDamageManagerBase.cpp b/src/Game/Damage/dmgDamageManagerBase.cpp
index 18864e98..3738cf4e 100644
--- a/src/Game/Damage/dmgDamageManagerBase.cpp
+++ b/src/Game/Damage/dmgDamageManagerBase.cpp
@@ -1,5 +1,6 @@
 #include "Game/Damage/dmgDamageManagerBase.h"
 #include "Game/DLC/aoc2.h"
+#include "Game/Damage/dmgDamageCallback.h"
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorConstDataAccess.h"
 #include "KingSystem/ActorSystem/actActorParam.h"
diff --git a/src/Game/Damage/dmgDamageManagerBase.h b/src/Game/Damage/dmgDamageManagerBase.h
index 7beeeef3..a324f3eb 100644
--- a/src/Game/Damage/dmgDamageManagerBase.h
+++ b/src/Game/Damage/dmgDamageManagerBase.h
@@ -5,7 +5,6 @@
 #include <heap/seadExpHeap.h>
 #include <prim/seadRuntimeTypeInfo.h>
 
-#include "Game/Damage/dmgDamageCallback.h"
 #include "Game/Damage/dmgInfoManager.h"
 #include "Game/Damage/dmgStruct20.h"
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
@@ -17,6 +16,8 @@ class ActorParam;
 
 namespace uking::dmg {
 
+class DamageCallback;
+
 // FIXME: Unknown base. This base seems to handle callbacks and messaging, so maybe a shared base?
 class DamageManagerBase_UnknownBase1 {
 public:
diff --git a/src/KingSystem/ActorSystem/actBaseProcHandle.cpp b/src/KingSystem/ActorSystem/actBaseProcHandle.cpp
index 3db5c2b2..35a1b13d 100644
--- a/src/KingSystem/ActorSystem/actBaseProcHandle.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcHandle.cpp
@@ -1,4 +1,5 @@
 #include "KingSystem/ActorSystem/actBaseProcHandle.h"
+#include "KingSystem/ActorSystem/actBaseProcUnit.h"
 #include "KingSystem/Utils/InitTimeInfo.h"
 
 namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actBaseProcHandle.h b/src/KingSystem/ActorSystem/actBaseProcHandle.h
index a1481d75..7b0301a2 100644
--- a/src/KingSystem/ActorSystem/actBaseProcHandle.h
+++ b/src/KingSystem/ActorSystem/actBaseProcHandle.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <basis/seadTypes.h>
-#include "KingSystem/ActorSystem/actBaseProcUnit.h"
 #include "KingSystem/Utils/Types.h"
 
 namespace ksys::act {
diff --git a/src/KingSystem/ActorSystem/actBaseProcUnit.cpp b/src/KingSystem/ActorSystem/actBaseProcUnit.cpp
index 09bd6c81..b0b466b2 100644
--- a/src/KingSystem/ActorSystem/actBaseProcUnit.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcUnit.cpp
@@ -3,6 +3,7 @@
 #include <prim/seadScopedLock.h>
 #include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h"
 #include "KingSystem/ActorSystem/actBaseProc.h"
+#include "KingSystem/ActorSystem/actBaseProcHandle.h"
 #include "KingSystem/Utils/Debug.h"
 
 namespace ksys::act {
@@ -55,4 +56,4 @@ bool BaseProcUnit::isParentHandleDefault() const {
     return mHandle == &BaseProcHandle::sDummyHandle;
 }
 
-}  // namespace ksys::act
\ No newline at end of file
+}  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/actBaseProcUnit.h b/src/KingSystem/ActorSystem/actBaseProcUnit.h
index f3ef3f34..06045e1a 100644
--- a/src/KingSystem/ActorSystem/actBaseProcUnit.h
+++ b/src/KingSystem/ActorSystem/actBaseProcUnit.h
@@ -3,7 +3,6 @@
 #include <basis/seadTypes.h>
 #include <thread/seadAtomic.h>
 #include <thread/seadCriticalSection.h>
-#include "KingSystem/ActorSystem/actBaseProcHandle.h"
 
 namespace ksys::act {