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

include/DynamicLink.h

@@ -1,10 +1,12 @@
 #ifndef DYNAMICLINK_H
 #define DYNAMICLINK_H
 
-#include "JSystem/JKernel/JKRFileCache.h"
-#include "dolphin/os/OSLink.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_dvd_thread.h"
+
+typedef struct OSModuleInfo OSModuleInfo;
+class JKRArchive;
+class JKRFileCache;
+class mDoDvdThd_callback_c;
 
 struct DynamicModuleControlBase {
     /* 0x00 */ u16 mLinkCount;

include/JSystem/J2DGraph/J2DAnimation.h

@@ -3,12 +3,14 @@
 
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "JSystem/JUtility/JUTNameTab.h"
-#include "JSystem/JUtility/JUTTexture.h"
-#include "dolphin/gx/GX.h"
-#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
+#include "global.h"
 
+typedef struct _GXColor GXColor;
+typedef struct _GXColorS10 GXColorS10;
 class J2DScreen;
+class JUTPalette;
+struct ResTIMG;
 
 enum J2DAnmKind {
     KIND_TRANSFORM = 0,

include/JSystem/J2DGraph/J2DAnmLoader.h

@@ -2,7 +2,6 @@
 #define J2DANMLOADER_H
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
-#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "dolphin/types.h"
 
 struct J2DAnmLoaderDataBase {

include/JSystem/J2DGraph/J2DManage.h

@@ -1,9 +1,10 @@
 #ifndef J2DMANAGE_H
 #define J2DMANAGE_H
 
-#include "JSystem/JSupport/JSUInputStream.h"
 #include "dolphin/types.h"
 
+class JSUInputStream;
+
 struct J2DResReference {
     /* 0x00 */ u16 mCount;
     /* 0x02 */ u16 mOffsets[1];

include/JSystem/J2DGraph/J2DMatBlock.h

@@ -2,11 +2,18 @@
 #define J2DMATBLOCK_H
 
 #include "JSystem/J2DGraph/J2DTevs.h"
-#include "JSystem/JUtility/JUTResFont.h"
-#include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JUtility/TColor.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
+class JUTFont;
+class JUTPalette;
+class JUTResFont;
+class JUTTexture;
+struct ResFONT;
+struct ResTIMG;
+struct ResTLUT;
+
 struct J2DGXColorS10 : public GXColorS10 {
     /* 802F1B90 */ J2DGXColorS10();
 };

include/JSystem/J2DGraph/J2DMaterial.h

@@ -3,7 +3,6 @@
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DMatBlock.h"
-#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 class J2DMaterial {

include/JSystem/J2DGraph/J2DMaterialFactory.h

@@ -2,16 +2,26 @@
 #define J2DMATERIALFACTORY_H
 
 #include "JSystem/J2DGraph/J2DManage.h"
-#include "JSystem/J2DGraph/J2DMaterial.h"
-#include "JSystem/JKernel/JKRArchive.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 struct J2DMaterialBlock {};
 
-struct J2DMaterialInitData;
-struct J2DIndInitData;
-struct J2DTevSwapModeTableInfo;
+typedef struct _GXColor GXColor;
+typedef struct _GXColorS10 GXColorS10;
 struct J2DAlphaCompInfo;
+struct J2DBlendInfo;
+struct J2DColorChanInfo;
+struct J2DIndInitData;
+class J2DMaterial;
+struct J2DMaterialInitData;
+struct J2DTevStageInfo;
+struct J2DTevSwapModeTableInfo;
+struct J2DTevSwapModeInfo;
+struct J2DTevOrderInfo;
+struct J2DTexCoordInfo;
+struct J2DTexMtxInfo;
+class JKRArchive;
 
 class J2DMaterialFactory {
 public:

include/JSystem/J2DGraph/J2DPane.h

@@ -1,19 +1,26 @@
 #ifndef J2DPANE_H
 #define J2DPANE_H
 
-#include "JSystem/J2DGraph/J2DAnimation.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/JGeometry.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "JSystem/JSupport/JSURandomInputStream.h"
-#include "JSystem/JUtility/JUTFont.h"
-#include "JSystem/JUtility/JUTResFont.h"
-#include "JSystem/JUtility/JUTTexture.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 
+class J2DAnmBase;
+class J2DAnmColor;
+class J2DAnmTransform;
+class J2DAnmTevRegKey;
+class J2DAnmTextureSRTKey;
+class J2DAnmVisibilityFull;
+class J2DAnmVtxColor;
+class J2DGrafContext;
 class J2DScreen;
+class J2DAnmTexPattern;
+class JKRArchive;
+class JSURandomInputStream;
+struct ResFONT;
+struct ResTIMG;
 
 enum J2DRotateAxis {
     /* 0x78 */ ROTATE_X = 'x',

include/JSystem/J2DGraph/J2DPicture.h

@@ -2,10 +2,16 @@
 #define J2DPICTURE_H
 
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/JUtility/JUTTexture.h"
+#include "JSystem/JUtility/TColor.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
+class J2DMaterial;
+class JUTPalette;
+class JUTTexture;
+struct ResTIMG;
+struct ResTLUT;
+
 enum J2DMirror {
     /* 0x0 */ MIRROR0,  // temp, figure out later
 };

include/JSystem/J2DGraph/J2DPictureEx.h

@@ -1,10 +1,13 @@
 #ifndef J2DPICTUREEX_H
 #define J2DPICTUREEX_H
 
-#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPicture.h"
+#include "JSystem/J2DGraph/J2DTevs.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
+class J2DMaterial;
+
 class J2DPictureEx : public J2DPicture {
 public:
     enum stage_enum {};

include/JSystem/J2DGraph/J2DPrint.h

@@ -6,6 +6,8 @@
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dolphin/types.h"
 
+class JUTFont;
+
 class J2DPrint {
 public:
     struct TSize {

include/JSystem/J2DGraph/J2DScreen.h

@@ -2,11 +2,13 @@
 #define J2DSCREEN_H
 
 #include "JSystem/J2DGraph/J2DManage.h"
-#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/JUtility/JUTNameTab.h"
+#include "JSystem/JUtility/TColor.h"
 #include "dolphin/types.h"
 
+class J2DMaterial;
+class JUTNameTab;
+
 struct J2DScrnHeader {
     /* 0x00 */ u32 mTag;
     /* 0x04 */ u32 mType;

include/JSystem/J2DGraph/J2DTevs.h

@@ -1,7 +1,7 @@
 #ifndef J2DTEVS_H
 #define J2DTEVS_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 

include/JSystem/J2DGraph/J2DTextBox.h

@@ -5,6 +5,9 @@
 #include "JSystem/J2DGraph/J2DPane.h"
 #include "dolphin/types.h"
 
+class J2DMaterial;
+class JUTFont;
+
 enum J2DTextBoxVBinding {
     /* 0x0 */ VBIND_CENTER,
     /* 0x1 */ VBIND_BOTTOM,

include/JSystem/J2DGraph/J2DTextBoxEx.h

@@ -1,11 +1,12 @@
 #ifndef J2DTEXTBOXEX_H
 #define J2DTEXTBOXEX_H
 
-#include "JSystem/J2DGraph/J2DMaterial.h"
-#include "JSystem/J2DGraph/J2DPrint.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
+class J2DMaterial;
+
 class J2DTextBoxEx : public J2DTextBox {
 public:
     enum stage_enum {

include/JSystem/J2DGraph/J2DWindow.h

@@ -3,9 +3,11 @@
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/JSupport/JSURandomInputStream.h"
 #include "dolphin/types.h"
 
+class JSURandomInputStream;
+class JUTTexture;
+
 class J2DWindow : public J2DPane {
 public:
     struct TMaterial {

include/JSystem/J2DGraph/J2DWindowEx.h

@@ -3,6 +3,7 @@
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DWindow.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class J2DWindowEx : public J2DWindow {

include/JSystem/J3DGraphAnimator/J3DAnimation.h

@@ -3,8 +3,12 @@
 
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
-#include "dolphin/gx/GX.h"
+#include "JSystem/JUtility/JUTNameTab.h"
 #include "dolphin/types.h"
+#include "global.h"
+
+typedef struct _GXColor GXColor;
+typedef struct _GXColorS10 GXColorS10;
 
 struct J3DAnmKeyTableBase {
     /* 0x00 */ u16 mMaxFrame;

include/JSystem/J3DGraphAnimator/J3DJoint.h

@@ -1,11 +1,12 @@
 #ifndef J3DJOINT_H
 #define J3DJOINT_H
 
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dolphin/types.h"
 
 class J3DAnmTransform;
+class J3DJoint;
+class J3DMaterial;
 class J3DMtxBuffer;
 
 class J3DMtxCalc {

include/JSystem/J3DGraphAnimator/J3DJointTree.h

@@ -2,10 +2,11 @@
 #define J3DJOINTTREE_H
 
 #include "JSystem/J3DGraphAnimator/J3DJoint.h"
-#include "JSystem/JUtility/JUTNameTab.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
 
+class JUTNameTab;
+
 struct J3DModelHierarchy {
     /* 0x0 */ u16 mType;
     /* 0x2 */ u16 mValue;

include/JSystem/J3DGraphAnimator/J3DMaterialAnm.h

@@ -4,6 +4,9 @@
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "dolphin/types.h"
 
+typedef struct _GXColor GXColor;
+typedef struct _GXColorS10 GXColorS10;
+
 class J3DMatColorAnm {
 public:
     /* 8003B2B8 */ ~J3DMatColorAnm();

include/JSystem/J3DGraphAnimator/J3DMaterialAttach.h

@@ -1,7 +1,6 @@
 #ifndef J3DMATERIALATTACH_H
 #define J3DMATERIALATTACH_H
 
-#include "JSystem/JUtility/JUTNameTab.h"
 #include "dolphin/types.h"
 
 struct J3DMaterial;
@@ -10,6 +9,7 @@ struct J3DAnmColor;
 struct J3DAnmTexPattern;
 struct J3DAnmTextureSRTKey;
 struct J3DAnmTevRegKey;
+class JUTNameTab;
 
 class J3DMaterialTable {
 public:

include/JSystem/J3DGraphAnimator/J3DModelData.h

@@ -8,6 +8,9 @@
 #include "JSystem/J3DGraphBase/J3DVertex.h"
 #include "dolphin/types.h"
 
+typedef struct _GXColor GXColor;
+class JUTNameTab;
+
 class J3DModelData {
 public:
     /* 80325D88 */ void clear();

include/JSystem/J3DGraphAnimator/J3DShapeTable.h

@@ -3,9 +3,10 @@
 
 #include "JSystem/J3DGraphBase/J3DShape.h"
 #include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "JSystem/JUtility/JUTNameTab.h"
 #include "dolphin/types.h"
 
+class JUTNameTab;
+
 class J3DShapeTable {
 public:
     J3DShapeTable() {

include/JSystem/J3DGraphBase/J3DMatBlock.h

@@ -4,7 +4,7 @@
 #include "JSystem/J3DGraphBase/J3DStruct.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
 

include/JSystem/J3DGraphBase/J3DStruct.h

@@ -2,7 +2,7 @@
 #define J3DSTRUCT_H
 
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 class J3DLightInfo {

include/JSystem/J3DGraphBase/J3DTexture.h

@@ -2,6 +2,7 @@
 #define J3DTEXTURE_H
 
 #include "JSystem/JUtility/JUTTexture.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/mtx/mtx44.h"
 #include "dolphin/types.h"

include/JSystem/J3DGraphBase/J3DVertex.h

@@ -1,10 +1,12 @@
 #ifndef J3DVERTEX_H
 #define J3DVERTEX_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXAttr.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"
 
+typedef struct _GXColor GXColor;
 class J3DModel;
 struct J3DAnmVtxColor;
 

include/JSystem/J3DGraphLoader/J3DShapeFactory.h

@@ -1,7 +1,8 @@
 #ifndef J3DSHAPEFACTORY_H
 #define J3DSHAPEFACTORY_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXAttr.h"
+#include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"
 
 struct J3DShape;

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();

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;
 

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;

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> {

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"

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*);

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();};

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();

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);

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 {

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() {}

include/JSystem/JFramework/JFWDisplay.h

@@ -1,15 +1,18 @@
 #ifndef JFWDISPLAY_H
 #define JFWDISPLAY_H
 
-#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JSupport/JSUList.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTFader.h"
-#include "JSystem/JUtility/JUTProcBar.h"
 #include "JSystem/JUtility/JUTXfb.h"
 #include "JSystem/JUtility/TColor.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/os/OSAlarm.h"
 #include "dolphin/types.h"
 
+typedef struct _GXColor GXColor;
+typedef struct _GXRenderModeObj GXRenderModeObj;
+class JKRHeap;
+
 typedef void (*JFWDisplayUnkFunc)(void);
 
 class JFWAlarm : public OSAlarm {

include/JSystem/JFramework/JFWSystem.h

@@ -1,13 +1,17 @@
 #ifndef JFWSYSTEM_H
 #define JFWSYSTEM_H
 
-#include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRThread.h"
-#include "JSystem/JUtility/JUTConsole.h"
-#include "JSystem/JUtility/JUTDbPrint.h"
-#include "JSystem/JUtility/JUTResFont.h"
 #include "dolphin/types.h"
 
+typedef struct _GXRenderModeObj GXRenderModeObj;
+class JKRExpHeap;
+class JKRThread;
+class JUTConsole;
+class JUTConsoleManager;
+class JUTDbPrint;
+class JUTResFont;
+struct ResFONT;
+
 struct JFWSystem {
     struct CSetUpParam {
         static s32 maxStdHeaps;

include/JSystem/JGadget/search.h

@@ -1,6 +1,7 @@
 #ifndef SEARCH_H
 #define SEARCH_H
 
+#include "dolphin/types.h"
 #include "global.h"
 
 namespace JGadget {

include/JSystem/JGadget/vector.h

@@ -1,7 +1,7 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include "global.h"
+#include "dolphin/types.h"
 
 extern u8 data_804511E0;
 extern u8 lit_569[];

include/JSystem/JKernel/JKRAram.h

@@ -1,13 +1,13 @@
 #ifndef JKRARAM_H
 #define JKRARAM_H
 
-#include "dolphin/types.h"
-
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRThread.h"
+#include "dolphin/types.h"
 
 class JKRHeap;
+class JKRAMCommand;
 class JKRAramBlock;
 class JKRAram : public JKRThread {
 private:

include/JSystem/JKernel/JKRAramArchive.h

@@ -5,6 +5,9 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "dolphin/types.h"
 
+class JKRAramBlock;
+class JKRDvdFile;
+
 class JKRAramArchive : public JKRArchive {
 public:
     JKRAramArchive(long, JKRArchive::EMountDirection);

include/JSystem/JKernel/JKRAramBlock.h

@@ -1,9 +1,6 @@
 #ifndef JKRARAMBLOCK_H
 #define JKRARAMBLOCK_H
 
-#include "dolphin/types.h"
-
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/types.h"
 

include/JSystem/JKernel/JKRAramHeap.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRAramBlock.h"
 #include "JSystem/JKernel/JKRDisposer.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMutex.h"
 #include "dolphin/types.h"
 
 class JKRAramHeap : public JKRDisposer {

include/JSystem/JKernel/JKRAramPiece.h

@@ -3,7 +3,8 @@
 
 #include "JSystem/JSupport/JSUList.h"
 #include "dolphin/ar/arq.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMessage.h"
+#include "dolphin/os/OSMutex.h"
 #include "dolphin/types.h"
 
 class JKRAramBlock;

include/JSystem/JKernel/JKRArchive.h

@@ -2,12 +2,11 @@
 #define JKRARCHIVE_H
 
 #include "JSystem/JKernel/JKRCompression.h"
-#include "JSystem/JKernel/JKRDecomp.h"
-#include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JKernel/JKRFileLoader.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "global.h"
 
+class JKRHeap;
+
 struct SArcHeader {
     /* 0x00 */ u32 signature;
     /* 0x04 */ u32 file_length;

include/JSystem/JKernel/JKRCompArchive.h

@@ -4,6 +4,9 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "dolphin/types.h"
 
+class JKRAramBlock;
+class JKRDvdFile;
+
 class JKRCompArchive : public JKRArchive {
 public:
     JKRCompArchive(long, JKRArchive::EMountDirection);

include/JSystem/JKernel/JKRDvdAramRipper.h

@@ -2,6 +2,7 @@
 #define JKRDVDARAMRIPPER_H
 
 #include "JSystem/JKernel/JKRDvdRipper.h"
+#include "JSystem/JSupport/JSUList.h"
 #include "dolphin/types.h"
 
 class JKRAramBlock;

include/JSystem/JKernel/JKRDvdFile.h

@@ -3,9 +3,12 @@
 
 #include "JSystem/JKernel/JKRFile.h"
 #include "dolphin/dvd/dvd.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMessage.h"
+#include "dolphin/os/OSMutex.h"
 #include "dolphin/types.h"
 
+struct OSThread;
+
 class JKRADCommand;
 class JKRAramBlock;
 class JSUFileInputStream;

include/JSystem/JKernel/JKRDvdRipper.h

@@ -1,7 +1,7 @@
 #ifndef JKRDVDRIPPER_H
 #define JKRDVDRIPPER_H
 
-#include "JSystem/JKernel/JKRDecomp.h"
+#include "JSystem/JKernel/JKRCompression.h"
 #include "dolphin/types.h"
 
 enum JKRExpandSwitch {

include/JSystem/JKernel/JKRHeap.h

@@ -2,7 +2,7 @@
 #define JKRHEAP_H
 
 #include "JSystem/JKernel/JKRDisposer.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMutex.h"
 #include "dolphin/types.h"
 
 class JKRHeap;

include/JSystem/JKernel/JKRThread.h

@@ -4,7 +4,9 @@
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSMessage.h"
+#include "dolphin/os/OSThread.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 
 struct JKRThreadName_ {
@@ -13,7 +15,6 @@ struct JKRThreadName_ {
 };
 
 class JUTConsole;
-class JKRHeap;
 class JKRThread : JKRDisposer {
 public:
     class TLoad {

include/JSystem/JMessage/processor.h

@@ -2,7 +2,6 @@
 #define JMESSAGE_PROCESSOR_H
 
 #include "JSystem/JMessage/resource.h"
-#include "JSystem/JUtility/JUTFont.h"
 #include "init.h"
 
 namespace JMessage {

include/JSystem/JParticle/JPABaseShape.h

@@ -1,7 +1,8 @@
 #ifndef JPABASESHAPE_H
 #define JPABASESHAPE_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 class JPAEmitterWorkData;

include/JSystem/JParticle/JPAChildShape.h

@@ -1,7 +1,7 @@
 #ifndef JPACHILDSHAPE_H
 #define JPACHILDSHAPE_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 struct JPAChildShapeData {

include/JSystem/JParticle/JPAParticle.h

@@ -1,7 +1,8 @@
 #ifndef JPAPARTICLE_H
 #define JPAPARTICLE_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 #include "JSystem/JGeometry.h"

include/JSystem/JParticle/JPAResourceManager.h

@@ -2,7 +2,7 @@
 #define JPARESOURCEMANAGER_H
 
 #include "JSystem/JParticle/JPATexture.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 class JKRHeap;

include/JSystem/JParticle/JPATexture.h

@@ -2,6 +2,7 @@
 #define JPATEXTURE_H
 
 #include "JSystem/JUtility/JUTTexture.h"
+#include "dolphin/gx/GXEnum.h"
 #include "dolphin/types.h"
 
 struct JPATextureData {

include/JSystem/JStage/JSGAmbientLight.h

@@ -2,7 +2,7 @@
 #define JSGAMBIENTLIGHT_H
 
 #include "JSystem/JStage/JSGObject.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
 
 namespace JStage {
     struct TAmbientLight : public TObject {

include/JSystem/JStage/JSGFog.h

@@ -2,7 +2,8 @@
 #define JSGFOG_H
 
 #include "JSystem/JStage/JSGObject.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
 
 namespace JStage {
     struct TFog : public TObject {

include/JSystem/JStage/JSGLight.h

@@ -2,7 +2,9 @@
 #define JSGLIGHT_H
 
 #include "JSystem/JStage/JSGObject.h"
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
+#include "dolphin/mtx/vec.h"
 
 namespace JStage {
     enum TELight {};

include/JSystem/JStudio/JStudio/functionvalue.h

@@ -4,6 +4,7 @@
 #include "JSystem/JGadget/search.h"
 #include "JSystem/JGadget/vector.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 extern u8 lit_652[];
 

include/JSystem/JStudio/JStudio/jstudio-control.h

@@ -6,6 +6,7 @@
 #include "JSystem/JStudio/JStudio/stb.h"
 #include "JSystem/JStudio/JStudio/ctb.h"
 #include "dolphin/gx/GX.h"
+#include "dolphin/mtx/vec.h"
 
 namespace JStudio {
 struct TCreateObject {

include/JSystem/JStudio/JStudio/jstudio-object.h

@@ -5,7 +5,8 @@
 #include "JSystem/JStudio/JStudio/stb.h"
 #include "JSystem/JStudio/JStudio/ctb.h"
 #include "JSystem/JStudio/JStudio/jstudio-control.h"
-#include "dolphin/gx/GX.h"
+
+typedef struct _GXColor GXColor;
 
 namespace JStudio {
 namespace data {

include/JSystem/JSupport/JSUFileStream.h

@@ -1,10 +1,11 @@
 #ifndef JSUFILESTREAM_H
 #define JSUFILESTREAM_H
 
-#include "JSystem/JKernel/JKRFile.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "dolphin/types.h"
 
+class JKRFile;
+
 class JSUFileInputStream : public JSURandomInputStream {
 public:
     virtual ~JSUFileInputStream() {}

include/JSystem/JUtility/JUTCacheFont.h

@@ -1,9 +1,12 @@
 #ifndef JUTCACHEFONT_H
 #define JUTCACHEFONT_H
 
-#include "dolphin/types.h"
 #include "JSystem/JUtility/JUTResFont.h"
-#include "JSystem/JKernel/JKRAram.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/types.h"
+#include "global.h"
+
+class JKRAramBlock;
 
 class JUTCacheFont : public JUTResFont {
 public:

include/JSystem/JUtility/JUTDbPrint.h

@@ -1,10 +1,11 @@
 #ifndef JUTDBPRINT_H
 #define JUTDBPRINT_H
 
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTFont.h"
 #include "dolphin/types.h"
 
+class JKRHeap;
+
 // TODO: fix struct
 struct unk_print {
     /* 0x00 */ unk_print* mNext;

include/JSystem/JUtility/JUTException.h

@@ -3,14 +3,18 @@
 
 #include "JSystem/JKernel/JKRThread.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
-#include "dolphin/gx/GX.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/os/OSError.h"
+#include "dolphin/os/OSMessage.h"
 #include "dolphin/types.h"
 #include "global.h"
 
+typedef struct _GXRenderModeObj GXRenderModeObj;
+typedef struct OSContext OSContext;
+class JUTDirectPrint;
+
 class JUTExternalFB {
 public:
     /* 802E40CC */ JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32);

include/JSystem/JUtility/JUTFont.h

@@ -3,7 +3,6 @@
 
 #include "JSystem/JUtility/TColor.h"
 #include "MSL_C/string.h"
-#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 struct ResFONT {

include/JSystem/JUtility/JUTGamePad.h

@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JSupport/JSUList.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/pad/Pad.h"
 #include "dolphin/types.h"
 

include/JSystem/JUtility/JUTPalette.h

@@ -1,7 +1,8 @@
 #ifndef JUTPALETTE_H
 #define JUTPALETTE_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 enum JUTTransparency { UNK0, UNK1 };

include/JSystem/JUtility/JUTProcBar.h

@@ -1,10 +1,12 @@
 #ifndef JUTPROCBAR_H
 #define JUTPROCBAR_H
 
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/TColor.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 
+class JKRHeap;
+
 class JUTProcBar {
 public:
     class CTime {

include/JSystem/JUtility/JUTResFont.h

@@ -1,8 +1,11 @@
 #ifndef JUTRESFONT_H
 #define JUTRESFONT_H
 
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTFont.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
+
+class JKRHeap;
 
 typedef bool (*IsLeadByte_func)(int);
 

include/JSystem/JUtility/JUTResource.h

@@ -1,10 +1,11 @@
 #ifndef JUTRESOURCE_H
 #define JUTRESOURCE_H
 
-#include "JSystem/JKernel/JKRArchive.h"
-#include "JSystem/JSupport/JSUInputStream.h"
 #include "dolphin/types.h"
 
+class JKRArchive;
+class JSUInputStream;
+
 class JUTResReference {
 private:
     u8 unk_0x0[0x101];

include/JSystem/JUtility/JUTTexture.h

@@ -1,9 +1,12 @@
 #ifndef JUTTEXTURE_H
 #define JUTTEXTURE_H
 
-#include "JSystem/JUtility/JUTPalette.h"
+#include "dolphin/gx/GXEnum.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
+class JUTPalette;
+
 /*
  * Acts as the header to image data. Usually texture data immediately follows it,
  * so any pointer arithmetic to go past the end of this structure is so that a

include/JSystem/JUtility/JUTVideo.h

@@ -1,8 +1,9 @@
 #ifndef JUTVIDEO_H
 #define JUTVIDEO_H
 
-#include "dolphin/gx/GX.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/gx/GXStruct.h"
+#include "dolphin/os/OSMessage.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 #include "dolphin/vi/vi.h"
 

include/JSystem/JUtility/JUTXfb.h

@@ -1,10 +1,12 @@
 #ifndef JUTXFB_H
 #define JUTXFB_H
 
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
 #include "dolphin/types.h"
 
+typedef struct _GXRenderModeObj GXRenderModeObj;
+class JKRHeap;
+
 class JUTXfb {
 public:
     enum EXfbNumber {  // TODO: placeholder

include/JSystem/JUtility/TColor.h

@@ -1,7 +1,7 @@
 #ifndef TCOLOR_H
 #define TCOLOR_H
 
-#include "dolphin/gx/GX.h"
+#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 
 namespace JUtility {

include/SSystem/SComponent/c_bg_s_shdw_draw.h

@@ -3,11 +3,11 @@
 
 #include "SSystem/SComponent/c_bg_s_chk.h"
 #include "SSystem/SComponent/c_m3d_g_aab.h"
-#include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
 
 struct cBgD_Vtx_t;
+class cM3dGPla;
 
 typedef int (*cBgS_ShdwDraw_Callback)(class cBgS_ShdwDraw*, cBgD_Vtx_t*, int, int, int, cM3dGPla*);
 

include/SSystem/SComponent/c_cc_d.h

@@ -1,16 +1,16 @@
 #ifndef C_CC_D_H
 #define C_CC_D_H
 
-#include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_m3d_g_aab.h"
 #include "SSystem/SComponent/c_m3d_g_cps.h"
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_sph.h"
 #include "SSystem/SComponent/c_m3d_g_tri.h"
-#include "dolphin/gx/GX.h"
-#include "f_op/f_op_actor.h"
 #include "global.h"
 
+typedef struct _GXColor GXColor;
+class fopAc_ac_c;
+
 enum CcG_Tg_HitMark {
     CcG_Tg_UNK_MARK_6 = 6,
     CcG_Tg_UNK_MARK_8 = 8,

include/SSystem/SComponent/c_cc_s.h

@@ -3,6 +3,7 @@
 
 #include "SSystem/SComponent/c_cc_d.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 enum WeightType {
     WeightType_0 = 0,

include/SSystem/SComponent/c_list.h

@@ -1,9 +1,10 @@
 #ifndef C_LIST_H
 #define C_LIST_H
 
-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"
 
+typedef struct node_class node_class;
+
 typedef struct node_list_class {
     node_class* mpHead;
     node_class* mpTail;

include/SSystem/SComponent/c_list_iter.h

@@ -1,10 +1,11 @@
 #ifndef C_LIST_ITER_H
 #define C_LIST_ITER_H
 
-#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node_iter.h"
 #include "dolphin/types.h"
 
+typedef struct node_list_class node_list_class;
+
 int cLsIt_Method(node_list_class* pList, cNdIt_MethodFunc pMethod, void* pUserData);
 void* cLsIt_Judge(node_list_class* pList, cNdIt_JudgeFunc pJudge, void* pUserData);
 

include/SSystem/SComponent/c_m3d_g_aab.h

@@ -3,6 +3,7 @@
 
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 // Axis aligned bounding box
 class cM3dGAab {

include/SSystem/SComponent/c_m3d_g_cps.h

@@ -5,6 +5,7 @@
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 struct cM3dGCpsS {
     /* 0x00 */ Vec mStart;

include/SSystem/SComponent/c_m3d_g_cyl.h

@@ -4,6 +4,7 @@
 #include "SSystem/SComponent/c_m3d.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 // Cylinder
 struct cM3dGCylS {

include/SSystem/SComponent/c_m3d_g_sph.h

@@ -2,9 +2,11 @@
 #define C_M3D_G_SPH_H_
 
 #include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
+#include "global.h"
+
+class cM3dGCyl;
 
 struct cM3dGSphS {
     /* 0x0 */ Vec mCenter;

include/SSystem/SComponent/c_m3d_g_tri.h

@@ -2,11 +2,12 @@
 #define C_M3D_G_TRI_H_
 
 #include "SSystem/SComponent/c_m3d.h"
-#include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
 
+class cM3dGCyl;
+
 class cM3dGTri : public cM3dGPla {
     // private:
 public:

include/SSystem/SComponent/c_malloc.h

@@ -1,9 +1,10 @@
 #ifndef C_MALLOC_H
 #define C_MALLOC_H
 
-#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"
 
+class JKRHeap;
+
 struct cMl {
     static JKRHeap* Heap;
     /* 80263220 */ static void init(JKRHeap*);

include/SSystem/SComponent/c_node_iter.h

@@ -1,9 +1,10 @@
 #ifndef C_NODE_ITER_H
 #define C_NODE_ITER_H
 
-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"
 
+typedef struct node_class node_class;
+
 typedef int (*cNdIt_MethodFunc)(node_class* pNode, void* pUserData);
 int cNdIt_Method(node_class* pNode, cNdIt_MethodFunc pMethod, void* pUserData);
 

include/SSystem/SComponent/c_request.h

@@ -2,7 +2,6 @@
 #define C_REQUEST_H
 
 #include "dolphin/types.h"
-#include "f_pc/f_pc_base.h"
 
 struct request_base_class {
     u8 field_0x0;

include/SSystem/SComponent/c_tag.h

@@ -1,11 +1,12 @@
 #ifndef C_TAG_H
 #define C_TAG_H
 
-#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_node.h"
-#include "SSystem/SComponent/c_tree.h"
 #include "dolphin/types.h"
 
+typedef struct node_list_class node_list_class;
+typedef struct node_lists_tree_class node_lists_tree_class;
+
 typedef struct create_tag_class {
     node_class mpNode;
     void* mpTagData;

include/SSystem/SComponent/c_tag_iter.h

@@ -2,9 +2,10 @@
 #define C_TAG_ITER_H
 
 #include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tag.h"
 #include "dolphin/types.h"
 
+typedef struct create_tag_class create_tag_class;
+
 typedef struct method_filter {
     cNdIt_MethodFunc mpMethodFunc;
     void* mpUserData;

include/SSystem/SComponent/c_tree.h

@@ -1,10 +1,11 @@
 #ifndef C_TREE_H
 #define C_TREE_H
 
-#include "SSystem/SComponent/c_list.h"
-#include "SSystem/SComponent/c_node.h"
 #include "dolphin/types.h"
 
+typedef struct node_class node_class;
+typedef struct node_list_class node_list_class;
+
 typedef struct node_lists_tree_class {
     node_list_class* mpLists;
     int mNumLists;

include/SSystem/SComponent/c_tree_iter.h

@@ -2,9 +2,10 @@
 #define C_TREE_ITER_H
 
 #include "SSystem/SComponent/c_node_iter.h"
-#include "SSystem/SComponent/c_tree.h"
 #include "dolphin/types.h"
 
+typedef struct node_lists_tree_class node_lists_tree_class;
+
 int cTrIt_Method(node_lists_tree_class* pTree, cNdIt_MethodFunc pJudgeFunc, void* pUserData);
 void* cTrIt_Judge(node_lists_tree_class* pTree, cNdIt_JudgeFunc pJudgeFunc, void* pUserData);
 

include/SSystem/SComponent/c_xyz.h

@@ -3,7 +3,6 @@
 
 #include "MSL_C/math.h"
 #include "dolphin/mtx/vec.h"
-#include "global.h"
 
 struct cXyz : Vec {
     static const cXyz Zero;