Remove #includes from headers (#334)

* add "global.h" to files that use it

* add MSL_C includes to files that use them

* remove dolphin includes from headers that don't need them

* remove JSupport includes from headers that don't need them

* remove JKernel includes from headers that don't need them

* remove JUtility includes from headers that don't need them

* remove J3D includes from headers that don't need them

* remove J2D includes from headers that don't need them

* remove JAudio2 includes from headers that don't need them

* remove Z2AudioLib includes from headers that don't need them

* remove JMessage includes from headers that don't need them

* remove JParticle includes from headers that don't need them

* remove SComponent includes from headers that don't need them

* remove dol includes from headers that don't need them

* sort includes

13 files changed, 20 insertions, 8 deletions

diff --git a/include/Z2AudioLib/Z2AudioMgr.h b/include/Z2AudioLib/Z2AudioMgr.h
index 9e3b540cc1..1d97542bf1 100644
--- a/include/Z2AudioLib/Z2AudioMgr.h
+++ b/include/Z2AudioLib/Z2AudioMgr.h
@@ -3,8 +3,6 @@
 
 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JASAudioReseter.h"
-#include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JKernel/JKRSolidHeap.h"
 #include "Z2AudioLib/Z2Audience.h"
 #include "Z2AudioLib/Z2FxLineMgr.h"
 #include "Z2AudioLib/Z2SceneMgr.h"
@@ -16,6 +14,10 @@
 #include "Z2AudioLib/Z2SpeechMgr2.h"
 #include "Z2AudioLib/Z2StatusMgr.h"
 #include "dolphin/types.h"
+#include "global.h"
+
+class JKRArchive;
+class JKRSolidHeap;
 
 class Z2AudioMgr {
 public:
diff --git a/include/Z2AudioLib/Z2Creature.h b/include/Z2AudioLib/Z2Creature.h
index 5d4e90279d..f6dac02f0f 100644
--- a/include/Z2AudioLib/Z2Creature.h
+++ b/include/Z2AudioLib/Z2Creature.h
@@ -3,6 +3,7 @@
 
 #include "SSystem/SComponent/c_xyz.h"
 #include "Z2AudioLib/Z2SoundObject.h"
+#include "Z2AudioLib/Z2SoundStarter.h"
 
 class Z2Creature {
 public:
diff --git a/include/Z2AudioLib/Z2EnvSeMgr.h b/include/Z2AudioLib/Z2EnvSeMgr.h
index 34d04e70a5..4cf8ffd976 100644
--- a/include/Z2AudioLib/Z2EnvSeMgr.h
+++ b/include/Z2AudioLib/Z2EnvSeMgr.h
@@ -5,6 +5,7 @@
 #include "Z2AudioLib/Z2Calc.h"
 #include "Z2AudioLib/Z2SeMgr.h"
 #include "dolphin/mtx/mtxvec.h"
+#include "global.h"
 
 struct Z2EnvSeBase {
     /* 802C589C */ Z2EnvSeBase(Vec*);
diff --git a/include/Z2AudioLib/Z2FxLineMgr.h b/include/Z2AudioLib/Z2FxLineMgr.h
index 9655f64517..ecf62b51e2 100644
--- a/include/Z2AudioLib/Z2FxLineMgr.h
+++ b/include/Z2AudioLib/Z2FxLineMgr.h
@@ -1,10 +1,11 @@
 #ifndef Z2FXLINEMGR_H
 #define Z2FXLINEMGR_H
 
-#include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JAudio2/JASGadget.h"
 
+class JKRArchive;
+class JKRHeap;
+
 struct Z2FxLineEditNode {};
 
 struct Z2FxLineConfig {};
diff --git a/include/Z2AudioLib/Z2SeMgr.h b/include/Z2AudioLib/Z2SeMgr.h
index 3f70146733..01f18c87b0 100644
--- a/include/Z2AudioLib/Z2SeMgr.h
+++ b/include/Z2AudioLib/Z2SeMgr.h
@@ -2,6 +2,7 @@
 #define Z2SEMGR_H
 
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JAudio2/JASGadget.h"
 #include "dolphin/mtx/vec.h"
 
diff --git a/include/Z2AudioLib/Z2SeqMgr.h b/include/Z2AudioLib/Z2SeqMgr.h
index 97bc1fba37..acf6c3d2cf 100644
--- a/include/Z2AudioLib/Z2SeqMgr.h
+++ b/include/Z2AudioLib/Z2SeqMgr.h
@@ -2,6 +2,7 @@
 #define Z2SEQMGR_H
 
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JAudio2/JASGadget.h"
 
 // move TTransition / Z2SoundFader ?
diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h
index 8e43695b6e..94a6f84fff 100644
--- a/include/Z2AudioLib/Z2SoundHandles.h
+++ b/include/Z2AudioLib/Z2SoundHandles.h
@@ -2,6 +2,7 @@
 #define Z2SOUNDHANDLES_H
 
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/types.h"
 
diff --git a/include/Z2AudioLib/Z2SoundMgr.h b/include/Z2AudioLib/Z2SoundMgr.h
index 1aadd884f0..852acaf94f 100644
--- a/include/Z2AudioLib/Z2SoundMgr.h
+++ b/include/Z2AudioLib/Z2SoundMgr.h
@@ -6,6 +6,7 @@
 #include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JAudio2/JAIStreamMgr.h"
 #include "JSystem/JAudio2/JASGadget.h"
+#include "global.h"
 
 class Z2SoundMgr : public JASGlobalInstance<Z2SoundMgr> {
 public:
diff --git a/include/Z2AudioLib/Z2SoundObjMgr.h b/include/Z2AudioLib/Z2SoundObjMgr.h
index 8dcf45feee..048fbd46d3 100644
--- a/include/Z2AudioLib/Z2SoundObjMgr.h
+++ b/include/Z2AudioLib/Z2SoundObjMgr.h
@@ -3,7 +3,8 @@
 
 #include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "Z2AudioLib/Z2Creature.h"
+
+class Z2CreatureEnemy;
 
 class Z2SoundObjMgr : protected JSUList<Z2CreatureEnemy>, public JASGlobalInstance<Z2SoundObjMgr> {
 public:
diff --git a/include/Z2AudioLib/Z2SoundObject.h b/include/Z2AudioLib/Z2SoundObject.h
index c6bc6a1d90..80f42ea4c2 100644
--- a/include/Z2AudioLib/Z2SoundObject.h
+++ b/include/Z2AudioLib/Z2SoundObject.h
@@ -2,10 +2,11 @@
 #define Z2SOUNDOBJECT_H
 
 #include "Z2AudioLib/Z2SoundHandles.h"
-#include "Z2AudioLib/Z2SoundStarter.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
+struct Z2SoundStarter;
+
 struct JAUSoundAnimationSound {};
 
 class Z2SoundObjBase : protected Z2SoundHandles {
diff --git a/include/Z2AudioLib/Z2SpeechMgr2.h b/include/Z2AudioLib/Z2SpeechMgr2.h
index 89480ee049..a262c768bf 100644
--- a/include/Z2AudioLib/Z2SpeechMgr2.h
+++ b/include/Z2AudioLib/Z2SpeechMgr2.h
@@ -6,6 +6,7 @@
 #include "JSystem/JMath/random.h"
 #include "Z2AudioLib/Z2SoundStarter.h"
 #include "dolphin/mtx/vec.h"
+#include "global.h"
 
 struct Z2SpeechStarter : public Z2SoundStarter {
     /* 802CCFB8 */ Z2SpeechStarter();
diff --git a/include/Z2AudioLib/Z2StatusMgr.h b/include/Z2AudioLib/Z2StatusMgr.h
index d23b25485b..4c8e248b26 100644
--- a/include/Z2AudioLib/Z2StatusMgr.h
+++ b/include/Z2AudioLib/Z2StatusMgr.h
@@ -1,8 +1,8 @@
 #ifndef Z2STATUSMGR_H
 #define Z2STATUSMGR_H
 
-#include "dolphin/mtx/vec.h"
 #include "JSystem/JAudio2/JASGadget.h"
+#include "dolphin/mtx/vec.h"
 
 struct Z2StatusMgr : public JASGlobalInstance<Z2StatusMgr> {
     Z2StatusMgr();
diff --git a/include/Z2AudioLib/Z2WolfHowlMgr.h b/include/Z2AudioLib/Z2WolfHowlMgr.h
index 8696774a5b..4851637fae 100644
--- a/include/Z2AudioLib/Z2WolfHowlMgr.h
+++ b/include/Z2AudioLib/Z2WolfHowlMgr.h
@@ -2,7 +2,7 @@
 #define Z2WOLFHOWLMGR_H
 
 #include "JSystem/JAudio2/JASGadget.h"
-#include "Z2AudioLib/Z2SoundObject.h"
+#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "dolphin/types.h"
 
 /*