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

12 files changed, 39 insertions, 25 deletions

diff --git a/include/m_Do/m_Do_DVDError.h b/include/m_Do/m_Do_DVDError.h
index 171f941715..0f51463465 100644
--- a/include/m_Do/m_Do_DVDError.h
+++ b/include/m_Do/m_Do_DVDError.h
@@ -1,7 +1,8 @@
 #ifndef M_DO_M_DO_DVDERROR_H
 #define M_DO_M_DO_DVDERROR_H
 
-#include "JSystem/JKernel/JKRThread.h"
+typedef struct OSAlarm OSAlarm;
+typedef struct OSContext OSContext;
 
 void mDoDvdErr_ThdCleanup();
 static void mDoDvdErr_Watch(void*);
diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h
index 180e68c436..c6a12f0b55 100644
--- a/include/m_Do/m_Do_MemCard.h
+++ b/include/m_Do/m_Do_MemCard.h
@@ -1,10 +1,9 @@
 #ifndef M_DO_M_DO_MEMCARD_H
 #define M_DO_M_DO_MEMCARD_H
 
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMutex.h"
 #include "dolphin/types.h"
 #include "global.h"
-#include "m_Do/m_Do_MemCardRWmng.h"
 
 class mDoMemCd_Ctrl_c {
 public:
diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h
index 935ef9dd4a..bfaf2a5cbf 100644
--- a/include/m_Do/m_Do_MemCardRWmng.h
+++ b/include/m_Do/m_Do_MemCardRWmng.h
@@ -1,9 +1,10 @@
 #ifndef M_DO_M_DO_MEMCARDRWMNG_H
 #define M_DO_M_DO_MEMCARDRWMNG_H
 
-#include "dolphin/card/card.h"
 #include "dolphin/types.h"
 
+typedef struct CARDFileInfo CARDFileInfo;
+
 struct mDoMemCdRWm_HeaderData {
     /* 0x0000 */ u8 mBannerTexData[0xC00];
     /* 0x0C00 */ u8 mBannerPalData[0x200];
diff --git a/include/m_Do/m_Do_audio.h b/include/m_Do/m_Do_audio.h
index 58c70de4b2..5e8fd55189 100644
--- a/include/m_Do/m_Do_audio.h
+++ b/include/m_Do/m_Do_audio.h
@@ -1,13 +1,8 @@
 #ifndef M_DO_M_DO_AUDIO_H
 #define M_DO_M_DO_AUDIO_H
 
-#include "JSystem/JAudio2/JASGadget.h"
-#include "JSystem/JAudio2/JASTrack.h"
-#include "JSystem/JAudio2/JAUSoundTable.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "Z2AudioLib/Z2EnvSeMgr.h"
-#include "Z2AudioLib/Z2SoundInfo.h"
-#include "Z2AudioLib/Z2WolfHowlMgr.h"
 
 class mDoAud_zelAudio_c {
 public:
diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h
index cd2c82b5fd..c7b6fea361 100644
--- a/include/m_Do/m_Do_controller_pad.h
+++ b/include/m_Do/m_Do_controller_pad.h
@@ -4,7 +4,6 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_Reset.h"
 
 // Controller Ports 1 - 4
 enum { PAD_1, PAD_2, PAD_3, PAD_4 };
diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h
index de4e2f567b..ba5e37e1ec 100644
--- a/include/m_Do/m_Do_dvd_thread.h
+++ b/include/m_Do/m_Do_dvd_thread.h
@@ -2,11 +2,15 @@
 #define M_DO_M_DO_DVD_THREAD_H
 
 #include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "JSystem/JKernel/JKRMemArchive.h"
+#include "dolphin/os/OSMessage.h"
+#include "dolphin/os/OSMutex.h"
+#include "dolphin/os/OSThread.h"
 #include "dolphin/types.h"
 #include "f_pc/f_pc_node.h"
 
+class JKRHeap;
+class JKRMemArchive;
+
 typedef void* (*mDoDvdThd_callback_func)(void*);
 
 class mDoDvdThd_command_c : public node_class {
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 580ad36664..ab3d266745 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -3,13 +3,22 @@
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
-#include "JSystem/JKernel/JKRAssertHeap.h"
-#include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRSolidHeap.h"
+#include "SSystem/SComponent/c_sxyz.h"
+#include "SSystem/SComponent/c_xyz.h"
+#include "Z2AudioLib/Z2SoundObject.h"
+#include "dolphin/gx/GXStruct.h"
 #include "global.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_mtx.h"
 
+class JKRArchive;
+class JKRAssertHeap;
+class JKRExpHeap;
+class JKRHeap;
+class JKRSolidHeap;
+struct ResTIMG;
+class Z2Creature;
+
 class mDoExt_baseAnm {
 public:
     mDoExt_baseAnm() {}
diff --git a/include/m_Do/m_Do_graphic.h b/include/m_Do/m_Do_graphic.h
index 71d79aa0e0..68ebab896b 100644
--- a/include/m_Do/m_Do_graphic.h
+++ b/include/m_Do/m_Do_graphic.h
@@ -2,10 +2,12 @@
 #define M_DO_M_DO_GRAPHIC_H
 
 #include "JSystem/JFramework/JFWDisplay.h"
-#include "JSystem/JUtility/JUTFader.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
+#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 
+class JUTFader;
+
 int mDoGph_Create();
 
 extern u8 mBlureFlag__13mDoGph_gInf_c;  // Blure
diff --git a/include/m_Do/m_Do_lib.h b/include/m_Do/m_Do_lib.h
index b64756a219..42b303bee3 100644
--- a/include/m_Do/m_Do_lib.h
+++ b/include/m_Do/m_Do_lib.h
@@ -3,7 +3,11 @@
 
 #include "JSystem/J3DU/J3DUClipper.h"
 #include "dolphin/types.h"
-#include "JSystem/JUtility/JUTTexture.h"
+
+typedef struct _GXTexObj GXTexObj;
+typedef struct _GXTlutObj GXTlutObj;
+typedef struct Vec Vec;
+struct ResTIMG;
 
 struct mDoLib_clipper {
     /* 8001528C */ void setup(f32, f32, f32, f32);
diff --git a/include/m_Do/m_Do_machine.h b/include/m_Do/m_Do_machine.h
index 88cf77a4eb..cbdcdb7d6f 100644
--- a/include/m_Do/m_Do_machine.h
+++ b/include/m_Do/m_Do_machine.h
@@ -1,12 +1,11 @@
 #ifndef M_DO_M_DO_MACHINE_H
 #define M_DO_M_DO_MACHINE_H
 
-#include "JSystem/JUtility/JUTConsole.h"
-#include "JSystem/JUtility/JUTGamePad.h"
-#include "JSystem/JUtility/JUTVideo.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_main.h"
+
+typedef struct OSContext OSContext;
+class JKRHeap;
 
 void myHeapCheckRecursive(JKRHeap*);
 BOOL mDoMch_IsProgressiveMode();
diff --git a/include/m_Do/m_Do_machine_exception.h b/include/m_Do/m_Do_machine_exception.h
index 6d81404a7c..1c98c7980e 100644
--- a/include/m_Do/m_Do_machine_exception.h
+++ b/include/m_Do/m_Do_machine_exception.h
@@ -2,7 +2,6 @@
 #define M_DO_M_DO_MACHINE_EXCEPTION_H
 
 #include "dolphin/types.h"
-#include "dolphin/gx/GX.h"
 
 struct JUTConsole;
 
diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h
index 83cd8645a0..81b89b31bf 100644
--- a/include/m_Do/m_Do_main.h
+++ b/include/m_Do/m_Do_main.h
@@ -2,9 +2,11 @@
 #define M_DO_M_DO_MAIN_H
 
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 
+class JKRExpHeap;
+
 void version_check();
 s32 LOAD_COPYDATE(void*);