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

11 files changed, 25 insertions, 20 deletions

diff --git a/include/JSystem/JAudio2/JAIAudible.h b/include/JSystem/JAudio2/JAIAudible.h
index 047b913295..1f89a60d73 100644
--- a/include/JSystem/JAudio2/JAIAudible.h
+++ b/include/JSystem/JAudio2/JAIAudible.h
@@ -2,7 +2,8 @@
 #define JAIAUDIBLE_H
 
 #include "dolphin/types.h"
-#include "JSystem/JAudio2/JASSoundParams.h"
+
+struct JASSoundParams;
 
 struct JAIAudible {
     virtual ~JAIAudible();
diff --git a/include/JSystem/JAudio2/JAIAudience.h b/include/JSystem/JAudio2/JAIAudience.h
index 1621386ad8..8b54ffe9f4 100644
--- a/include/JSystem/JAudio2/JAIAudience.h
+++ b/include/JSystem/JAudio2/JAIAudience.h
@@ -1,11 +1,10 @@
 #ifndef JAIAUDIENCE_H
 #define JAIAUDIENCE_H
 
-#include "JSystem/JAudio2/JAIAudible.h"
-#include "JSystem/JAudio2/JAISound.h"
 #include "JSystem/JGeometry.h"
 #include "dolphin/types.h"
 
+struct JAIAudible;
 class JAISoundID;
 struct JASSoundParams;
 
diff --git a/include/JSystem/JAudio2/JAISeMgr.h b/include/JSystem/JAudio2/JAISeMgr.h
index 627445f912..d4f6886b19 100644
--- a/include/JSystem/JAudio2/JAISeMgr.h
+++ b/include/JSystem/JAudio2/JAISeMgr.h
@@ -1,11 +1,15 @@
 #ifndef JAISEMGR_H
 #define JAISEMGR_H
 
-#include "JSystem/JAudio2/JAIAudience.h"
 #include "JSystem/JAudio2/JAISeqDataMgr.h"
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAISoundParams.h"
 #include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JSupport/JSUList.h"
+#include "global.h"
+
+struct JAIAudience;
+struct JASSoundParams;
 
 struct JASNonCopyable {
     /* 0x0 */ int field_0x0;
diff --git a/include/JSystem/JAudio2/JAISeqMgr.h b/include/JSystem/JAudio2/JAISeqMgr.h
index 9550331211..9176681530 100644
--- a/include/JSystem/JAudio2/JAISeqMgr.h
+++ b/include/JSystem/JAudio2/JAISeqMgr.h
@@ -1,12 +1,13 @@
 #ifndef JAISEQMGR_H
 #define JAISEQMGR_H
 
-#include "JSystem/JAudio2/JAIAudience.h"
 #include "JSystem/JAudio2/JAISeqDataMgr.h"
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAISoundParams.h"
 #include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JSupport/JSUList.h"
 
+struct JAIAudience;
 struct JAISeq;
 
 class JAISeqMgr : public JAISeqDataUser, public JASGlobalInstance<JAISeqMgr> {
diff --git a/include/JSystem/JAudio2/JAISound.h b/include/JSystem/JAudio2/JAISound.h
index b45793de42..92a376f836 100644
--- a/include/JSystem/JAudio2/JAISound.h
+++ b/include/JSystem/JAudio2/JAISound.h
@@ -1,8 +1,6 @@
 #ifndef JAISOUND_H
 #define JAISOUND_H
 
-#include "JSystem/JAudio2/JAIAudience.h"
-#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JAudio2/JAISoundParams.h"
 #include "JSystem/JGeometry.h"
 #include "dolphin/types.h"
diff --git a/include/JSystem/JAudio2/JAISoundChild.h b/include/JSystem/JAudio2/JAISoundChild.h
index 257e89eb40..b3ac7d6942 100644
--- a/include/JSystem/JAudio2/JAISoundChild.h
+++ b/include/JSystem/JAudio2/JAISoundChild.h
@@ -2,9 +2,10 @@
 #define JAISOUNDCHILD_H
 
 #include "JSystem/JAudio2/JAISoundParams.h"
-#include "JSystem/JAudio2/JASTrack.h"
 #include "dolphin/types.h"
 
+struct JASTrack;
+
 struct JAISoundChild {
     /* 802A2AB0 */ void init();
     /* 802A2B28 */ void mixOut(JASTrack*);
diff --git a/include/JSystem/JAudio2/JASAudioReseter.h b/include/JSystem/JAudio2/JASAudioReseter.h
index 66d466f3f5..45813a6016 100644
--- a/include/JSystem/JAudio2/JASAudioReseter.h
+++ b/include/JSystem/JAudio2/JASAudioReseter.h
@@ -1,9 +1,8 @@
 #ifndef JASAUDIORESETER_H
 #define JASAUDIORESETER_H
 
-#include "JSystem/JAudio2/JASDriverIF.h"
 #include "dolphin/types.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSInterrupt.h"
 
 struct JASCriticalSection {
     inline JASCriticalSection() {mInterruptState = OSDisableInterrupts();};
diff --git a/include/JSystem/JAudio2/JASDvdThread.h b/include/JSystem/JAudio2/JASDvdThread.h
index 0e05c452d9..061f7bd496 100644
--- a/include/JSystem/JAudio2/JASDvdThread.h
+++ b/include/JSystem/JAudio2/JASDvdThread.h
@@ -1,9 +1,10 @@
 #ifndef JASDVDTHREAD_H
 #define JASDVDTHREAD_H
 
-#include "JSystem/JAudio2/JASTaskThread.h"
 #include "dolphin/types.h"
 
+class JASTaskThread;
+
 class JASDvd {
 public:
     /* 8028FEFC */ static JASTaskThread* getThreadPointer();
diff --git a/include/JSystem/JAudio2/JASResArcLoader.h b/include/JSystem/JAudio2/JASResArcLoader.h
index 8e32fb6b06..baab677594 100644
--- a/include/JSystem/JAudio2/JASResArcLoader.h
+++ b/include/JSystem/JAudio2/JASResArcLoader.h
@@ -1,7 +1,10 @@
 #ifndef JASRESARCLOADER_H
 #define JASRESARCLOADER_H
 
-#include "JSystem/JKernel/JKRArchive.h"
+#include "dolphin/types.h"
+
+typedef struct OSMessageQueue OSMessageQueue;
+class JKRArchive;
 
 namespace JASResArcLoader {
     /* 80290BD0 */ size_t getResSize(JKRArchive const*, u16);
diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h
index 4166ea1502..12465a470c 100644
--- a/include/JSystem/JAudio2/JASTrack.h
+++ b/include/JSystem/JAudio2/JASTrack.h
@@ -2,7 +2,8 @@
 #define JASTRACK_H
 
 #include "JSystem/JAudio2/JASGadget.h"
-#include "JSystem/JAudio2/JASSoundParams.h"
+
+struct JASSoundParams;
 
 struct JASDsp {
     struct TChannel {
diff --git a/include/JSystem/JAudio2/JASWaveArcLoader.h b/include/JSystem/JAudio2/JASWaveArcLoader.h
index 95fb0280b0..9e3610c651 100644
--- a/include/JSystem/JAudio2/JASWaveArcLoader.h
+++ b/include/JSystem/JAudio2/JASWaveArcLoader.h
@@ -1,16 +1,13 @@
 #ifndef JASWAVEARCLOADER_H
 #define JASWAVEARCLOADER_H
 
+#include "JSystem/JSupport/JSUList.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-#include "global.h"
-
 #include "dolphin/os/OSMutex.h"
+#include "dolphin/types.h"
 
-#include "JSystem/JAudio2/JASDvdThread.h"
-#include "JSystem/JAudio2/JASHeapCtrl.h"
-#include "JSystem/JKernel/JKRDvdAramRipper.h"
-#include "JSystem/JKernel/JKRSolidHeap.h"
+class JKRHeap;
+class JKRSolidHeap;
 
 struct JASDisposer {
     JASDisposer() {}