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

120 files changed, 174 insertions, 52 deletions

diff --git a/libs/JSystem/J2DGraph/J2DAnimation.cpp b/libs/JSystem/J2DGraph/J2DAnimation.cpp
index 717ce664cf..82ca1aadcd 100644
--- a/libs/JSystem/J2DGraph/J2DAnimation.cpp
+++ b/libs/JSystem/J2DGraph/J2DAnimation.cpp
@@ -5,9 +5,12 @@
 
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
+#include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTResource.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 f32 J2DGetKeyFrameInterpolationf(f32 param_0, J3DAnmKeyTableBase* param_1, f32* param_2);
diff --git a/libs/JSystem/J2DGraph/J2DGrafContext.cpp b/libs/JSystem/J2DGraph/J2DGrafContext.cpp
index 7e95632fe3..10f2a10e68 100644
--- a/libs/JSystem/J2DGraph/J2DGrafContext.cpp
+++ b/libs/JSystem/J2DGraph/J2DGrafContext.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "MSL_C/math.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DManage.cpp b/libs/JSystem/J2DGraph/J2DManage.cpp
index 60318ed15c..6c26035dd5 100644
--- a/libs/JSystem/J2DGraph/J2DManage.cpp
+++ b/libs/JSystem/J2DGraph/J2DManage.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/J2DGraph/J2DManage.h"
+#include "JSystem/JSupport/JSUInputStream.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/J2DGraph/J2DMatBlock.cpp b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
index 1268d8e9ab..a8a158593b 100644
--- a/libs/JSystem/J2DGraph/J2DMatBlock.cpp
+++ b/libs/JSystem/J2DGraph/J2DMatBlock.cpp
@@ -4,7 +4,11 @@
 //
 
 #include "JSystem/J2DGraph/J2DMatBlock.h"
+#include "JSystem/JUtility/JUTPalette.h"
+#include "JSystem/JUtility/JUTResFont.h"
+#include "JSystem/JUtility/JUTTexture.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DMaterial.cpp b/libs/JSystem/J2DGraph/J2DMaterial.cpp
index 3f53cb4c92..a712ba9f12 100644
--- a/libs/JSystem/J2DGraph/J2DMaterial.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterial.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
index ae5007d1cb..ab65ee3cb4 100644
--- a/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
+++ b/libs/JSystem/J2DGraph/J2DMaterialFactory.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "JSystem/J2DGraph/J2DMaterialFactory.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
index 6c68036445..16c56f6436 100644
--- a/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
+++ b/libs/JSystem/J2DGraph/J2DOrthoGraph.cpp
@@ -5,6 +5,8 @@
 
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
+#include "dolphin/mtx/mtx44.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DPane.cpp b/libs/JSystem/J2DGraph/J2DPane.cpp
index caf72f13b4..460a2b1361 100644
--- a/libs/JSystem/J2DGraph/J2DPane.cpp
+++ b/libs/JSystem/J2DGraph/J2DPane.cpp
@@ -4,12 +4,17 @@
 //
 
 #include "JSystem/J2DGraph/J2DPane.h"
+#include "JSystem/J2DGraph/J2DAnimation.h"
+#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DManage.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTResource.h"
+#include "MSL_C/math.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 /* 802F5BF8-802F5CB8 2F0538 00C0+00 0/0 10/10 0/0 .text            __ct__7J2DPaneFv */
diff --git a/libs/JSystem/J2DGraph/J2DPicture.cpp b/libs/JSystem/J2DGraph/J2DPicture.cpp
index 3e3a0ec79b..d0b1fd80e2 100644
--- a/libs/JSystem/J2DGraph/J2DPicture.cpp
+++ b/libs/JSystem/J2DGraph/J2DPicture.cpp
@@ -4,7 +4,10 @@
 //
 
 #include "JSystem/J2DGraph/J2DPicture.h"
+#include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/JUtility/JUTTexture.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J2DGraph/J2DPictureEx.cpp b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
index 62123db41a..0d7c82d8af 100644
--- a/libs/JSystem/J2DGraph/J2DPictureEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DPictureEx.cpp
@@ -4,6 +4,9 @@
 //
 
 #include "JSystem/J2DGraph/J2DPictureEx.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/JKernel/JKRHeap.h"
+#include "JSystem/JUtility/JUTTexture.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DPrint.cpp b/libs/JSystem/J2DGraph/J2DPrint.cpp
index dea6720967..a2f63fa488 100644
--- a/libs/JSystem/J2DGraph/J2DPrint.cpp
+++ b/libs/JSystem/J2DGraph/J2DPrint.cpp
@@ -4,10 +4,13 @@
 //
 
 #include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/stdio.h"
 #include "MSL_C/stdlib.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/J2DGraph/J2DScreen.cpp b/libs/JSystem/J2DGraph/J2DScreen.cpp
index 55e337eb99..a9ef614b2e 100644
--- a/libs/JSystem/J2DGraph/J2DScreen.cpp
+++ b/libs/JSystem/J2DGraph/J2DScreen.cpp
@@ -4,15 +4,19 @@
 //
 
 #include "JSystem/J2DGraph/J2DScreen.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DMaterialFactory.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/J2DGraph/J2DPictureEx.h"
 #include "JSystem/J2DGraph/J2DTextBoxEx.h"
 #include "JSystem/J2DGraph/J2DWindowEx.h"
 #include "JSystem/JGeometry.h"
+#include "JSystem/JKernel/JKRArchive.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/J2DGraph/J2DTextBox.cpp b/libs/JSystem/J2DGraph/J2DTextBox.cpp
index 10fdc19796..39d44594b5 100644
--- a/libs/JSystem/J2DGraph/J2DTextBox.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBox.cpp
@@ -4,8 +4,12 @@
 //
 
 #include "JSystem/J2DGraph/J2DTextBox.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
 #include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
+#include "JSystem/JUtility/JUTResFont.h"
 #include "MSL_C/string.h"
+#include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
index 01a50b6776..25da723acc 100644
--- a/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
+++ b/libs/JSystem/J2DGraph/J2DTextBoxEx.cpp
@@ -4,6 +4,10 @@
 //
 
 #include "JSystem/J2DGraph/J2DTextBoxEx.h"
+#include "JSystem/J2DGraph/J2DMaterial.h"
+#include "JSystem/J2DGraph/J2DPrint.h"
+#include "JSystem/JSupport/JSURandomInputStream.h"
+#include "JSystem/JUtility/JUTResFont.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
index d9a14fcc3b..36b5091a82 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DAnimation.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/J3DGraphAnimator/J3DAnimation.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
index bf80c155d3..755abb18e5 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DJoint.cpp
@@ -8,8 +8,8 @@
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
-#include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
+#include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JSystem/JMath/JMath.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp
index e757921fe4..31d54c4eaa 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DJointTree.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/J3DGraphAnimator/J3DJointTree.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DShapeTable.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
index 6dd85ccf63..a29408c8cd 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAnm.cpp
@@ -1,6 +1,8 @@
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
index ba46fd0372..8857e8e615 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
index f717c07639..286bc5eb51 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DModel.cpp
@@ -5,9 +5,10 @@
 
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphBase/J3DTransform.h"
 #include "dol2asm.h"
-#include "dolphin/os/OSCache.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp
index 9bf2bea95e..30276017dc 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DModelData.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphAnimator/J3DModelData.h"
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
index 2ad0f1fdd2..5e069c6b0a 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp
@@ -6,8 +6,8 @@
 #include "JSystem/J3DGraphAnimator/J3DMtxBuffer.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "dol2asm.h"
+#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
-#include "mtx/mtx.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
index f4e4df32c4..5d490d3128 100644
--- a/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
+++ b/libs/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphAnimator/J3DSkinDeform.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
index 9a5324feae..d98e1baf0b 100644
--- a/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DMatBlock.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
index 87770b6c21..561cf05391 100644
--- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp
@@ -16,6 +16,7 @@
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "dolphin/types.h"
 #include "global.h"
 
diff --git a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
index 64f0bb02ae..a0f4076385 100644
--- a/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DShapeDraw.cpp
@@ -10,6 +10,7 @@
 #include "dolphin/gx/GX.h"
 #include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // External References:
diff --git a/libs/JSystem/J3DGraphBase/J3DSys.cpp b/libs/JSystem/J3DGraphBase/J3DSys.cpp
index 2b326a72b0..8ce7f16565 100644
--- a/libs/JSystem/J3DGraphBase/J3DSys.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DSys.cpp
@@ -9,6 +9,7 @@
 #include "dolphin/gx/GXPixel.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 #include "JSystem/J3DGraphBase/J3DTevs.h"
 
diff --git a/libs/JSystem/J3DGraphBase/J3DTexture.cpp b/libs/JSystem/J3DGraphBase/J3DTexture.cpp
index cf575daf32..19e5d19aff 100644
--- a/libs/JSystem/J3DGraphBase/J3DTexture.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DTexture.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 /* 8031204C-803121A4 30C98C 0158+00 0/0 1/1 0/0 .text loadGX__10J3DTextureCFUs11_GXTexMapID */
diff --git a/libs/JSystem/J3DGraphBase/J3DVertex.cpp b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
index 6d3e4e4ba5..65634b9acc 100644
--- a/libs/JSystem/J3DGraphBase/J3DVertex.cpp
+++ b/libs/JSystem/J3DGraphBase/J3DVertex.cpp
@@ -11,6 +11,7 @@
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
+#include "global.h"
 #include "init.h"
 
 /* 80310EF8-80310F78 30B838 0080+00 0/0 1/1 0/0 .text            __ct__13J3DVertexDataFv */
diff --git a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
index 4bac4d2081..c332c292d5 100644
--- a/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DClusterLoader.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
@@ -58,7 +59,6 @@ extern "C" extern char const* const J3DClusterLoader__stringBase0;
 //
 
 SECTION_INIT void memcpy();
-extern "C" void OSReport();
 extern "C" void* __nw__FUl();
 extern "C" void* __nwa__FUl();
 extern "C" void* __nwa__FUli();
@@ -69,7 +69,6 @@ extern "C" void func_8030A530(void* _this, void const*, void const*);
 extern "C" void func_8030A560(void* _this, void const*, void const*);
 extern "C" void __ct__13J3DDeformDataFv();
 extern "C" void __ct__11J3DDeformerFP13J3DDeformData();
-extern "C" void DCStoreRange();
 extern "C" void _savegpr_23();
 extern "C" void _savegpr_26();
 extern "C" void _restgpr_23();
diff --git a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
index 6a21b67580..5447111907 100644
--- a/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
+++ b/libs/JSystem/J3DGraphLoader/J3DShapeFactory.cpp
@@ -10,6 +10,7 @@
 #include "dol2asm.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JAudio2/JAISound.cpp b/libs/JSystem/JAudio2/JAISound.cpp
index 30fe31e204..2d6b1fc82d 100644
--- a/libs/JSystem/JAudio2/JAISound.cpp
+++ b/libs/JSystem/JAudio2/JAISound.cpp
@@ -4,10 +4,14 @@
 //
 
 #include "JSystem/JAudio2/JAISound.h"
+#include "JSystem/JAudio2/JAIAudible.h"
+#include "JSystem/JAudio2/JAIAudience.h"
+#include "JSystem/JAudio2/JAISoundHandles.h"
 #include "JSystem/JAudio2/JASReport.h"
 #include "JSystem/JAudio2/JASTrack.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JAudio2/JAISoundChild.cpp b/libs/JSystem/JAudio2/JAISoundChild.cpp
index 2766156808..c45be5fbbf 100644
--- a/libs/JSystem/JAudio2/JAISoundChild.cpp
+++ b/libs/JSystem/JAudio2/JAISoundChild.cpp
@@ -1,4 +1,5 @@
 #include "JSystem/JAudio2/JAISoundChild.h"
+#include "JSystem/JAudio2/JASTrack.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/JAudio2/JASAudioReseter.cpp b/libs/JSystem/JAudio2/JASAudioReseter.cpp
index fb081b4627..30af7e31cc 100644
--- a/libs/JSystem/JAudio2/JASAudioReseter.cpp
+++ b/libs/JSystem/JAudio2/JASAudioReseter.cpp
@@ -4,12 +4,12 @@
 //
 
 #include "JSystem/JAudio2/JASAudioReseter.h"
-#include "dol2asm.h"
-#include "dolphin/os/OS.h"
-#include "dolphin/types.h"
 #include "JSystem/JAudio2/JAISoundHandles.h"
-#include "JSystem/JAudio2/JASGadget.h"
 #include "JSystem/JAudio2/JASAudioThread.h"
+#include "JSystem/JAudio2/JASDriverIF.h"
+#include "JSystem/JAudio2/JASGadget.h"
+#include "dol2asm.h"
+#include "dolphin/types.h"
 
 //
 // Types:
diff --git a/libs/JSystem/JAudio2/JASDvdThread.cpp b/libs/JSystem/JAudio2/JASDvdThread.cpp
index c73bd6c63f..d3be1880b4 100644
--- a/libs/JSystem/JAudio2/JASDvdThread.cpp
+++ b/libs/JSystem/JAudio2/JASDvdThread.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JAudio2/JASDvdThread.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSThread.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JAudio2/JASResArcLoader.cpp b/libs/JSystem/JAudio2/JASResArcLoader.cpp
index 22ce0d1ca6..5d30fcf444 100644
--- a/libs/JSystem/JAudio2/JASResArcLoader.cpp
+++ b/libs/JSystem/JAudio2/JASResArcLoader.cpp
@@ -5,6 +5,8 @@
 
 #include "JSystem/JAudio2/JASResArcLoader.h"
 #include "JSystem/JAudio2/JASDvdThread.h"
+#include "JSystem/JAudio2/JASTaskThread.h"
+#include "JSystem/JKernel/JKRArchive.h"
 
 
 /* 80290BD0-80290C04 28B510 0034+00 0/0 2/2 0/0 .text
diff --git a/libs/JSystem/JAudio2/JASTaskThread.cpp b/libs/JSystem/JAudio2/JASTaskThread.cpp
index 87fc196a3b..471cd4f582 100644
--- a/libs/JSystem/JAudio2/JASTaskThread.cpp
+++ b/libs/JSystem/JAudio2/JASTaskThread.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JAudio2/JASTaskThread.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
index 5d6d4325d1..bf6104c780 100644
--- a/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
+++ b/libs/JSystem/JAudio2/JASWaveArcLoader.cpp
@@ -4,7 +4,12 @@
 //
 
 #include "JSystem/JAudio2/JASWaveArcLoader.h"
+#include "JSystem/JAudio2/JASDvdThread.h"
+#include "JSystem/JAudio2/JASTaskThread.h"
+#include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include "MSL_C/string.h"
+#include "dolphin/dvd/dvd.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp
index 12ff3f2eab..1a08f01667 100644
--- a/libs/JSystem/JFramework/JFWDisplay.cpp
+++ b/libs/JSystem/JFramework/JFWDisplay.cpp
@@ -8,8 +8,11 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDbPrint.h"
+#include "JSystem/JUtility/JUTProcBar.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/mtx/mtx44.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JFramework/JFWSystem.cpp b/libs/JSystem/JFramework/JFWSystem.cpp
index d2197be068..cd20c2e8da 100644
--- a/libs/JSystem/JFramework/JFWSystem.cpp
+++ b/libs/JSystem/JFramework/JFWSystem.cpp
@@ -5,7 +5,9 @@
 
 #include "JSystem/JFramework/JFWSystem.h"
 #include "JSystem/JKernel/JKRAram.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
+#include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTGamePad.h"
diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp
index 3d0f0e70f3..46682e9626 100644
--- a/libs/JSystem/JKernel/JKRAram.cpp
+++ b/libs/JSystem/JKernel/JKRAram.cpp
@@ -8,11 +8,14 @@
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRAramPiece.h"
 #include "JSystem/JKernel/JKRAramStream.h"
+#include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/ar/ar.h"
+#include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "global.h"
 
 //
diff --git a/libs/JSystem/JKernel/JKRAramArchive.cpp b/libs/JSystem/JKernel/JKRAramArchive.cpp
index 5b2cb23561..d0a71b1d93 100644
--- a/libs/JSystem/JKernel/JKRAramArchive.cpp
+++ b/libs/JSystem/JKernel/JKRAramArchive.cpp
@@ -7,12 +7,13 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
-#include "JSystem/JKernel/JKRFile.h"
+#include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/math.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JKernel/JKRAramHeap.cpp b/libs/JSystem/JKernel/JKRAramHeap.cpp
index 8adf0080c2..2d24b88454 100644
--- a/libs/JSystem/JKernel/JKRAramHeap.cpp
+++ b/libs/JSystem/JKernel/JKRAramHeap.cpp
@@ -5,6 +5,7 @@
 
 #include "JSystem/JKernel/JKRAramHeap.h"
 #include "JSystem/JKernel/JKRHeap.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp
index 4be2fc66ae..00fb68a072 100644
--- a/libs/JSystem/JKernel/JKRAramPiece.cpp
+++ b/libs/JSystem/JKernel/JKRAramPiece.cpp
@@ -8,7 +8,7 @@
 #include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTException.h"
-#include "dolphin/os/OSCache.h"
+#include "dolphin/os/OS.h"
 
 /* 802D3574-802D35F4 2CDEB4 0080+00 1/1 0/0 0/0 .text
  * prepareCommand__12JKRAramPieceFiUlUlUlP12JKRAramBlockPFUl_v  */
diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp
index 8448723513..54ddbc9fa4 100644
--- a/libs/JSystem/JKernel/JKRAramStream.cpp
+++ b/libs/JSystem/JKernel/JKRAramStream.cpp
@@ -9,6 +9,7 @@
 #include "JSystem/JSupport/JSUFileStream.h"
 #include "JSystem/JSupport/JSURandomInputStream.h"
 #include "JSystem/JUtility/JUTException.h"
+#include "global.h"
 
 /* ############################################################################################## */
 /* 80451408-8045140C 000908 0004+00 1/1 0/0 0/0 .sbss            sAramStreamObject__13JKRAramStream
diff --git a/libs/JSystem/JKernel/JKRArchivePri.cpp b/libs/JSystem/JKernel/JKRArchivePri.cpp
index 7743207cce..f628372fd5 100644
--- a/libs/JSystem/JKernel/JKRArchivePri.cpp
+++ b/libs/JSystem/JKernel/JKRArchivePri.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "MSL_C/MSL_Common/Src/ctype.h"
 #include "MSL_C/string.h"
+#include "global.h"
 
 /* ############################################################################################## */
 /* 80451420-80451428 000920 0004+04 1/1 5/5 0/0 .sbss            sCurrentDirID__10JKRArchive */
diff --git a/libs/JSystem/JKernel/JKRCompArchive.cpp b/libs/JSystem/JKernel/JKRCompArchive.cpp
index 9626f9eed3..bb6cca7d1e 100644
--- a/libs/JSystem/JKernel/JKRCompArchive.cpp
+++ b/libs/JSystem/JKernel/JKRCompArchive.cpp
@@ -7,11 +7,13 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JKernel/JKRDvdAramRipper.h"
 #include "JSystem/JKernel/JKRDvdArchive.h"
+#include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/math.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSCache.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
index aa0375b7aa..0b3fa6ecf7 100644
--- a/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdAramRipper.cpp
@@ -8,9 +8,9 @@
 #include "JSystem/JKernel/JKRAramStream.h"
 #include "JSystem/JKernel/JKRDvdFile.h"
 #include "JSystem/JSupport/JSUFileStream.h"
-#include "JSystem/JSupport/JSUList.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "dolphin/vi/vi.h"
 #include "global.h"
 
diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp
index aedca6c4ef..9351e97929 100644
--- a/libs/JSystem/JKernel/JKRDvdFile.cpp
+++ b/libs/JSystem/JKernel/JKRDvdFile.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "dol2asm.h"
-#include "global.h"
 
 /* 8043436C-80434378 06108C 000C+00 4/4 0/0 0/0 .bss             sDvdList__10JKRDvdFile */
 JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
diff --git a/libs/JSystem/JKernel/JKRDvdRipper.cpp b/libs/JSystem/JKernel/JKRDvdRipper.cpp
index 59fa399fd1..20a1be97ed 100644
--- a/libs/JSystem/JKernel/JKRDvdRipper.cpp
+++ b/libs/JSystem/JKernel/JKRDvdRipper.cpp
@@ -9,6 +9,7 @@
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "global.h"
 
 //
diff --git a/libs/JSystem/JKernel/JKRHeap.cpp b/libs/JSystem/JKernel/JKRHeap.cpp
index edc5fd935a..2f438e5414 100644
--- a/libs/JSystem/JKernel/JKRHeap.cpp
+++ b/libs/JSystem/JKernel/JKRHeap.cpp
@@ -6,6 +6,8 @@
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTException.h"
+#include "dolphin/os/OS.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JKernel/JKRMemArchive.cpp b/libs/JSystem/JKernel/JKRMemArchive.cpp
index c4c3edf333..48df23e5cb 100644
--- a/libs/JSystem/JKernel/JKRMemArchive.cpp
+++ b/libs/JSystem/JKernel/JKRMemArchive.cpp
@@ -4,11 +4,14 @@
 //
 
 #include "JSystem/JKernel/JKRMemArchive.h"
+#include "JSystem/JKernel/JKRDecomp.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSCache.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JMath/JMATrigonometric.cpp b/libs/JSystem/JMath/JMATrigonometric.cpp
index 88c107cb14..f504e659cf 100644
--- a/libs/JSystem/JMath/JMATrigonometric.cpp
+++ b/libs/JSystem/JMath/JMATrigonometric.cpp
@@ -7,6 +7,7 @@
 // #include "JSystem/JMath/JMATrigonometric.h"
 #include "MSL_C/math.h"
 #include "dol2asm.h"
+#include "dolphin/types.h"
 #include "global.h"
 
 namespace std {
diff --git a/libs/JSystem/JParticle/JPABaseShape.cpp b/libs/JSystem/JParticle/JPABaseShape.cpp
index 7f385824f9..6e72ee6e3a 100644
--- a/libs/JSystem/JParticle/JPABaseShape.cpp
+++ b/libs/JSystem/JParticle/JPABaseShape.cpp
@@ -9,6 +9,7 @@
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JParticle/JPAChildShape.cpp b/libs/JSystem/JParticle/JPAChildShape.cpp
index 43044dd4ad..1b3e183cf9 100644
--- a/libs/JSystem/JParticle/JPAChildShape.cpp
+++ b/libs/JSystem/JParticle/JPAChildShape.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JParticle/JPAChildShape.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/JParticle/JPAEmitterManager.cpp b/libs/JSystem/JParticle/JPAEmitterManager.cpp
index bf11dba204..0d1b1ff76f 100644
--- a/libs/JSystem/JParticle/JPAEmitterManager.cpp
+++ b/libs/JSystem/JParticle/JPAEmitterManager.cpp
@@ -8,6 +8,7 @@
 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JParticle/JPAExTexShape.cpp b/libs/JSystem/JParticle/JPAExTexShape.cpp
index 5f5cfc414d..8371457d58 100644
--- a/libs/JSystem/JParticle/JPAExTexShape.cpp
+++ b/libs/JSystem/JParticle/JPAExTexShape.cpp
@@ -8,6 +8,7 @@
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 /* 8027B040-8027B13C 275980 00FC+00 0/0 1/1 0/0 .text JPALoadExTex__FP18JPAEmitterWorkData */
diff --git a/libs/JSystem/JParticle/JPAExtraShape.cpp b/libs/JSystem/JParticle/JPAExtraShape.cpp
index 9d08e8ccf7..9f22d5d868 100644
--- a/libs/JSystem/JParticle/JPAExtraShape.cpp
+++ b/libs/JSystem/JParticle/JPAExtraShape.cpp
@@ -9,6 +9,7 @@
 #include "JSystem/JParticle/JPAResource.h"
 #include "JSystem/JParticle/JPAResourceManager.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
diff --git a/libs/JSystem/JParticle/JPAResource.cpp b/libs/JSystem/JParticle/JPAResource.cpp
index d9430992d6..5e65f60201 100644
--- a/libs/JSystem/JParticle/JPAResource.cpp
+++ b/libs/JSystem/JParticle/JPAResource.cpp
@@ -8,6 +8,7 @@
 #include "JSystem/JParticle/JPAMath.h"
 #include "JSystem/JParticle/JPAParticle.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/mtx/mtx.h"
 #include "dolphin/mtx/mtxvec.h"
 #include "dolphin/types.h"
diff --git a/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp b/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp
index 6d1f9665eb..d350b549dd 100644
--- a/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp
+++ b/libs/JSystem/JStudio/JStudio/functionvalue-inline.cpp
@@ -1,5 +1,4 @@
 #include "JSystem/JStudio/JStudio/functionvalue.h"
-#include "global.h"
 
 namespace std {
 template <typename A1>
diff --git a/libs/JSystem/JStudio/JStudio/functionvalue.cpp b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
index d51fd487fa..6efec2e5b1 100644
--- a/libs/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/libs/JSystem/JStudio/JStudio/functionvalue.cpp
@@ -9,6 +9,7 @@
 #include "MSL_C/stdlib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/JSystem/JStudio/JStudio/fvb.cpp b/libs/JSystem/JStudio/JStudio/fvb.cpp
index c7c256244f..19d4fa8355 100644
--- a/libs/JSystem/JStudio/JStudio/fvb.cpp
+++ b/libs/JSystem/JStudio/JStudio/fvb.cpp
@@ -7,6 +7,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/JSystem/JStudio/JStudio/stb.cpp b/libs/JSystem/JStudio/JStudio/stb.cpp
index 38af2c2c3a..05552f38bc 100644
--- a/libs/JSystem/JStudio/JStudio/stb.cpp
+++ b/libs/JSystem/JStudio/JStudio/stb.cpp
@@ -2,6 +2,7 @@
 #include "JSystem/JUtility/JUTException.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/JSystem/JSupport/JSUFileStream.cpp b/libs/JSystem/JSupport/JSUFileStream.cpp
index afd5e3316e..42790bb45f 100644
--- a/libs/JSystem/JSupport/JSUFileStream.cpp
+++ b/libs/JSystem/JSupport/JSUFileStream.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JSupport/JSUFileStream.h"
+#include "JSystem/JKernel/JKRFile.h"
 
 /* 802DC638-802DC67C 2D6F78 0044+00 0/0 1/1 0/0 .text __ct__18JSUFileInputStreamFP7JKRFile */
 JSUFileInputStream::JSUFileInputStream(JKRFile* pFile) {
diff --git a/libs/JSystem/JUtility/JUTCacheFont.cpp b/libs/JSystem/JUtility/JUTCacheFont.cpp
index 4cde5591b5..1130e67295 100644
--- a/libs/JSystem/JUtility/JUTCacheFont.cpp
+++ b/libs/JSystem/JUtility/JUTCacheFont.cpp
@@ -4,8 +4,10 @@
 //
 
 #include "JSystem/JUtility/JUTCacheFont.h"
+#include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JUtility/JUTConsole.cpp b/libs/JSystem/JUtility/JUTConsole.cpp
index dea05eb4dc..87ff86d2df 100644
--- a/libs/JSystem/JUtility/JUTConsole.cpp
+++ b/libs/JSystem/JUtility/JUTConsole.cpp
@@ -10,6 +10,7 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include "MSL_C/stdio.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JUtility/JUTDbPrint.cpp b/libs/JSystem/JUtility/JUTDbPrint.cpp
index fc03e639a3..e2107cf463 100644
--- a/libs/JSystem/JUtility/JUTDbPrint.cpp
+++ b/libs/JSystem/JUtility/JUTDbPrint.cpp
@@ -5,8 +5,10 @@
 
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTVideo.h"
 #include "MSL_C/stdio.h"
+#include "Runtime.PPCEABI.H/__va_arg.h"
 
 /* 802E0148-802E0190 2DAA88 0048+00 1/1 0/0 0/0 .text __ct__10JUTDbPrintFP7JUTFontP7JKRHeap */
 JUTDbPrint::JUTDbPrint(JUTFont* pFont, JKRHeap* pHeap) {
diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp
index 92f615b636..0ef9d23ec6 100644
--- a/libs/JSystem/JUtility/JUTException.cpp
+++ b/libs/JSystem/JUtility/JUTException.cpp
@@ -12,6 +12,8 @@
 #include "MSL_C/stdlib.h"
 #include "Runtime.PPCEABI.H/__va_arg.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JUtility/JUTGamePad.cpp b/libs/JSystem/JUtility/JUTGamePad.cpp
index fc30108667..82f4370c4e 100644
--- a/libs/JSystem/JUtility/JUTGamePad.cpp
+++ b/libs/JSystem/JUtility/JUTGamePad.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "MSL_C/math.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSResetSW.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JUtility/JUTPalette.cpp b/libs/JSystem/JUtility/JUTPalette.cpp
index 6b1cd63333..a85b2149cc 100644
--- a/libs/JSystem/JUtility/JUTPalette.cpp
+++ b/libs/JSystem/JUtility/JUTPalette.cpp
@@ -1,4 +1,5 @@
 #include "JSystem/JUtility/JUTPalette.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/os/OS.h"
 
 void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) {
diff --git a/libs/JSystem/JUtility/JUTProcBar.cpp b/libs/JSystem/JUtility/JUTProcBar.cpp
index 578b1351bf..5b9cd00122 100644
--- a/libs/JSystem/JUtility/JUTProcBar.cpp
+++ b/libs/JSystem/JUtility/JUTProcBar.cpp
@@ -8,6 +8,7 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/JSystem/JUtility/JUTResFont.cpp b/libs/JSystem/JUtility/JUTResFont.cpp
index e5786a5339..b8377e442c 100644
--- a/libs/JSystem/JUtility/JUTResFont.cpp
+++ b/libs/JSystem/JUtility/JUTResFont.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JUtility/JUTResFont.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
diff --git a/libs/JSystem/JUtility/JUTTexture.cpp b/libs/JSystem/JUtility/JUTTexture.cpp
index eb7e6e97ba..5193f4c630 100644
--- a/libs/JSystem/JUtility/JUTTexture.cpp
+++ b/libs/JSystem/JUtility/JUTTexture.cpp
@@ -4,7 +4,9 @@
 //
 
 #include "JSystem/JUtility/JUTTexture.h"
+#include "JSystem/JUtility/JUTPalette.h"
 #include "dol2asm.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp
index c1ae47ae00..b6bd3b266e 100644
--- a/libs/JSystem/JUtility/JUTVideo.cpp
+++ b/libs/JSystem/JUtility/JUTVideo.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JUtility/JUTVideo.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTXfb.h"
+#include "dolphin/gx/GX.h"
 #include "dolphin/vi/vi.h"
 
 /* 80451538-8045153C 000A38 0004+00 4/4 18/18 1/1 .sbss            sManager__8JUTVideo */
diff --git a/libs/JSystem/JUtility/JUTXfb.cpp b/libs/JSystem/JUtility/JUTXfb.cpp
index 8c71e430da..dc058b03fb 100644
--- a/libs/JSystem/JUtility/JUTXfb.cpp
+++ b/libs/JSystem/JUtility/JUTXfb.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "JSystem/JUtility/JUTXfb.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GX.h"
 
diff --git a/libs/SSystem/SComponent/c_list.cpp b/libs/SSystem/SComponent/c_list.cpp
index f616f11778..f4a6b3d7ee 100644
--- a/libs/SSystem/SComponent/c_list.cpp
+++ b/libs/SSystem/SComponent/c_list.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_list.h"
+#include "SSystem/SComponent/c_node.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_list_iter.cpp b/libs/SSystem/SComponent/c_list_iter.cpp
index 4e81bbc0ae..bdf3eb28eb 100644
--- a/libs/SSystem/SComponent/c_list_iter.cpp
+++ b/libs/SSystem/SComponent/c_list_iter.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_list_iter.h"
+#include "SSystem/SComponent/c_list.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_m3d.cpp b/libs/SSystem/SComponent/c_m3d.cpp
index 64308c6b2a..c9c83afa10 100644
--- a/libs/SSystem/SComponent/c_m3d.cpp
+++ b/libs/SSystem/SComponent/c_m3d.cpp
@@ -16,6 +16,7 @@
 #include "SSystem/SComponent/c_xyz.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/SSystem/SComponent/c_malloc.cpp b/libs/SSystem/SComponent/c_malloc.cpp
index 9710456ab0..677238e18b 100644
--- a/libs/SSystem/SComponent/c_malloc.cpp
+++ b/libs/SSystem/SComponent/c_malloc.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_malloc.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_node_iter.cpp b/libs/SSystem/SComponent/c_node_iter.cpp
index 979c33679f..bc2474a957 100644
--- a/libs/SSystem/SComponent/c_node_iter.cpp
+++ b/libs/SSystem/SComponent/c_node_iter.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_node_iter.h"
+#include "SSystem/SComponent/c_node.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_tag.cpp b/libs/SSystem/SComponent/c_tag.cpp
index 0244594f3b..2812e56bf9 100644
--- a/libs/SSystem/SComponent/c_tag.cpp
+++ b/libs/SSystem/SComponent/c_tag.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_tag.h"
+#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_tree.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/libs/SSystem/SComponent/c_tag_iter.cpp b/libs/SSystem/SComponent/c_tag_iter.cpp
index bf4310f6f3..f5e6ac61c5 100644
--- a/libs/SSystem/SComponent/c_tag_iter.cpp
+++ b/libs/SSystem/SComponent/c_tag_iter.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_tag_iter.h"
+#include "SSystem/SComponent/c_tag.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_tree.cpp b/libs/SSystem/SComponent/c_tree.cpp
index 67911c6d3b..a490ee415c 100644
--- a/libs/SSystem/SComponent/c_tree.cpp
+++ b/libs/SSystem/SComponent/c_tree.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "SSystem/SComponent/c_tree.h"
+#include "SSystem/SComponent/c_list.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_tree_iter.cpp b/libs/SSystem/SComponent/c_tree_iter.cpp
index a91a420661..d7201fb71d 100644
--- a/libs/SSystem/SComponent/c_tree_iter.cpp
+++ b/libs/SSystem/SComponent/c_tree_iter.cpp
@@ -4,7 +4,9 @@
 //
 
 #include "SSystem/SComponent/c_tree_iter.h"
+#include "SSystem/SComponent/c_list.h"
 #include "SSystem/SComponent/c_list_iter.h"
+#include "SSystem/SComponent/c_tree.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/SSystem/SComponent/c_xyz.cpp b/libs/SSystem/SComponent/c_xyz.cpp
index 084ec83ab3..d45d0c0515 100644
--- a/libs/SSystem/SComponent/c_xyz.cpp
+++ b/libs/SSystem/SComponent/c_xyz.cpp
@@ -7,7 +7,6 @@
 #include "MSL_C/float.h"
 #include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"
-#include "global.h"
 
 //
 // Declarations:
diff --git a/libs/Z2AudioLib/Z2Audience.cpp b/libs/Z2AudioLib/Z2Audience.cpp
index dc1b05f580..f8c9402495 100644
--- a/libs/Z2AudioLib/Z2Audience.cpp
+++ b/libs/Z2AudioLib/Z2Audience.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "Z2AudioLib/Z2Audience.h"
+#include "JSystem/JAudio2/JAISound.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/Z2AudioLib/Z2AudioMgr.cpp b/libs/Z2AudioLib/Z2AudioMgr.cpp
index 9356e2a86f..7fff13d9a0 100644
--- a/libs/Z2AudioLib/Z2AudioMgr.cpp
+++ b/libs/Z2AudioLib/Z2AudioMgr.cpp
@@ -5,8 +5,10 @@
 
 #include "Z2AudioLib/Z2AudioMgr.h"
 #include "JSystem/JAudio2/JASDriverIF.h"
+#include "MSL_C/stdio.h"
 #include "MSL_C/stdlib.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
@@ -213,7 +215,6 @@ extern "C" void _restgpr_24();
 extern "C" void _restgpr_25();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void fprintf();
 extern "C" extern void* __vt__12JAUSoundInfo[4 + 1 /* padding */];
 extern "C" extern void* __vt__16JAIStreamAramMgr[5];
 extern "C" extern void* __vt__16JAIStreamDataMgr[4 + 1 /* padding */];
diff --git a/libs/Z2AudioLib/Z2Calc.cpp b/libs/Z2AudioLib/Z2Calc.cpp
index 1ba9e478e6..d7bd7a7d6e 100644
--- a/libs/Z2AudioLib/Z2Calc.cpp
+++ b/libs/Z2AudioLib/Z2Calc.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JMath/random.h"
 #include "MSL_C/math.h"
 #include "dol2asm.h"
-#include "global.h"
 
 //
 // Declarations:
diff --git a/libs/Z2AudioLib/Z2LinkMgr.cpp b/libs/Z2AudioLib/Z2LinkMgr.cpp
index 4c4e9add05..a17e909711 100644
--- a/libs/Z2AudioLib/Z2LinkMgr.cpp
+++ b/libs/Z2AudioLib/Z2LinkMgr.cpp
@@ -4,9 +4,12 @@
 //
 
 #include "Z2AudioLib/Z2LinkMgr.h"
+#include "JSystem/J2DGraph/J2DScreen.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/Z2AudioLib/Z2SceneMgr.cpp b/libs/Z2AudioLib/Z2SceneMgr.cpp
index 09ad2d587d..bad0c63461 100644
--- a/libs/Z2AudioLib/Z2SceneMgr.cpp
+++ b/libs/Z2AudioLib/Z2SceneMgr.cpp
@@ -10,6 +10,7 @@
 #include "Z2AudioLib/Z2StatusMgr.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/Z2AudioLib/Z2SeMgr.cpp b/libs/Z2AudioLib/Z2SeMgr.cpp
index c354869ac1..f936b5b331 100644
--- a/libs/Z2AudioLib/Z2SeMgr.cpp
+++ b/libs/Z2AudioLib/Z2SeMgr.cpp
@@ -6,6 +6,7 @@
 #include "Z2AudioLib/Z2SeMgr.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/libs/Z2AudioLib/Z2SoundObjMgr.cpp b/libs/Z2AudioLib/Z2SoundObjMgr.cpp
index 32c9fd8f1e..e2bb6c50fe 100644
--- a/libs/Z2AudioLib/Z2SoundObjMgr.cpp
+++ b/libs/Z2AudioLib/Z2SoundObjMgr.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "Z2AudioLib/Z2SoundObjMgr.h"
+#include "Z2AudioLib/Z2Creature.h"
 #include "Z2AudioLib/Z2SeqMgr.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/libs/Z2AudioLib/Z2SoundObject.cpp b/libs/Z2AudioLib/Z2SoundObject.cpp
index d876f9f290..fa72125af7 100644
--- a/libs/Z2AudioLib/Z2SoundObject.cpp
+++ b/libs/Z2AudioLib/Z2SoundObject.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "Z2AudioLib/Z2SoundObject.h"
+#include "JSystem/JAudio2/JASGadget.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/libs/Z2AudioLib/Z2StatusMgr.cpp b/libs/Z2AudioLib/Z2StatusMgr.cpp
index d5e468f256..3da4b98492 100644
--- a/libs/Z2AudioLib/Z2StatusMgr.cpp
+++ b/libs/Z2AudioLib/Z2StatusMgr.cpp
@@ -6,6 +6,7 @@
 #include "Z2AudioLib/Z2StatusMgr.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/libs/dolphin/ar/arq.c b/libs/dolphin/ar/arq.c
index 138c15676d..bc583aafcd 100644
--- a/libs/dolphin/ar/arq.c
+++ b/libs/dolphin/ar/arq.c
@@ -4,7 +4,9 @@
 //
 
 #include "dolphin/ar/arq.h"
+#include "dolphin/ar/ar.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
@@ -17,16 +19,6 @@ void __ARQInterruptServiceRoutine();
 void ARQInit();
 
 //
-// External References:
-//
-
-void OSRegisterVersion();
-BOOL OSDisableInterrupts();
-void OSRestoreInterrupts();
-void ARRegisterDMACallback();
-void ARStartDMA();
-
-//
 // Declarations:
 //
 
diff --git a/libs/dolphin/card/CARDBios.c b/libs/dolphin/card/CARDBios.c
index 4bdb226e98..8cde7616bf 100644
--- a/libs/dolphin/card/CARDBios.c
+++ b/libs/dolphin/card/CARDBios.c
@@ -8,6 +8,7 @@
 #include "dolphin/dsp/dsp.h"
 #include "dolphin/dvd/dvd.h"
 #include "dolphin/exi/EXIBios.h"
+#include "dolphin/os/OS.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDBlock.c b/libs/dolphin/card/CARDBlock.c
index 40ca946fde..411017e82d 100644
--- a/libs/dolphin/card/CARDBlock.c
+++ b/libs/dolphin/card/CARDBlock.c
@@ -8,7 +8,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDCheck.c b/libs/dolphin/card/CARDCheck.c
index a35974e8d6..c07de3c1e4 100644
--- a/libs/dolphin/card/CARDCheck.c
+++ b/libs/dolphin/card/CARDCheck.c
@@ -8,7 +8,7 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/os/OSRtc.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDDir.c b/libs/dolphin/card/CARDDir.c
index 68d15bf9e6..f430f2a731 100644
--- a/libs/dolphin/card/CARDDir.c
+++ b/libs/dolphin/card/CARDDir.c
@@ -8,7 +8,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDFormat.c b/libs/dolphin/card/CARDFormat.c
index 9532329bf7..6cdae58526 100644
--- a/libs/dolphin/card/CARDFormat.c
+++ b/libs/dolphin/card/CARDFormat.c
@@ -8,7 +8,7 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
+#include "dolphin/os/OSRtc.h"
 #include "dolphin/vi/vi.h"
 
 #include "dolphin/card/CARDPriv.h"
diff --git a/libs/dolphin/card/CARDMount.c b/libs/dolphin/card/CARDMount.c
index cb33f9e4aa..d0e1917f3c 100644
--- a/libs/dolphin/card/CARDMount.c
+++ b/libs/dolphin/card/CARDMount.c
@@ -7,8 +7,8 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 #include "dolphin/exi/EXIBios.h"
+#include "dolphin/os/OSRtc.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDNet.c b/libs/dolphin/card/CARDNet.c
index 087361de62..83ab866d42 100644
--- a/libs/dolphin/card/CARDNet.c
+++ b/libs/dolphin/card/CARDNet.c
@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDRdwr.c b/libs/dolphin/card/CARDRdwr.c
index 6a8ca19f68..f1cd5a3c6f 100644
--- a/libs/dolphin/card/CARDRdwr.c
+++ b/libs/dolphin/card/CARDRdwr.c
@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDRead.c b/libs/dolphin/card/CARDRead.c
index 4b80389295..e38979a8f1 100644
--- a/libs/dolphin/card/CARDRead.c
+++ b/libs/dolphin/card/CARDRead.c
@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDStat.c b/libs/dolphin/card/CARDStat.c
index 965367466e..e3955dab58 100644
--- a/libs/dolphin/card/CARDStat.c
+++ b/libs/dolphin/card/CARDStat.c
@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDUnlock.c b/libs/dolphin/card/CARDUnlock.c
index 5a541a4f9b..f2389431a0 100644
--- a/libs/dolphin/card/CARDUnlock.c
+++ b/libs/dolphin/card/CARDUnlock.c
@@ -7,8 +7,8 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/dvd/dvd.h"
 #include "dolphin/exi/EXIBios.h"
+#include "dolphin/os/OS.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/card/CARDWrite.c b/libs/dolphin/card/CARDWrite.c
index d3f3cd0cb9..ae8820e033 100644
--- a/libs/dolphin/card/CARDWrite.c
+++ b/libs/dolphin/card/CARDWrite.c
@@ -7,7 +7,7 @@
 #include "dol2asm.h"
 #include "dolphin/card/card.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSTime.h"
 
 #include "dolphin/card/CARDPriv.h"
 
diff --git a/libs/dolphin/dsp/dsp.c b/libs/dolphin/dsp/dsp.c
index 0feefca3ac..be2d4327b5 100644
--- a/libs/dolphin/dsp/dsp.c
+++ b/libs/dolphin/dsp/dsp.c
@@ -1,6 +1,7 @@
 #include "dolphin/dsp/dsp.h"
 #include "dolphin/dsp/dsp_debug.h"
 #include "dolphin/dsp/dsp_task.h"
+#include "dolphin/os/OS.h"
 
 /* 80450A58-80450A60 -00001 0004+04 1/1 0/0 0/0 .sdata           __DSPVersion */
 static char* __DSPVersion = "<< Dolphin SDK - DSP\trelease build: Apr  5 2004 04:15:32 (0x2301) >>";
diff --git a/libs/dolphin/dvd/dvdlow.c b/libs/dolphin/dvd/dvdlow.c
index f910fbaefb..6e794167d0 100644
--- a/libs/dolphin/dvd/dvdlow.c
+++ b/libs/dolphin/dvd/dvdlow.c
@@ -8,9 +8,10 @@
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "dolphin/os/OSAlarm.h"
-#include "dolphin/os/OSTime.h"
 #include "dolphin/os/OSContext.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "dolphin/os/OSReset.h"
+#include "dolphin/os/OSTime.h"
 
 //
 // Forward References:
@@ -42,15 +43,6 @@ BOOL __DVDLowTestAlarm(OSAlarm* alarm);
 // External References:
 //
 
-void OSInitAlarm();
-void OSCreateAlarm();
-void OSSetAlarm();
-void OSCancelAlarm();
-BOOL OSDisableInterrupts();
-void OSRestoreInterrupts(BOOL enabled);
-void __OSMaskInterrupts();
-OSTime __OSGetSystemTime();
-
 //
 // Declarations:
 //
diff --git a/libs/dolphin/exi/EXIUart.c b/libs/dolphin/exi/EXIUart.c
index 62234c7141..9c2b0dc401 100644
--- a/libs/dolphin/exi/EXIUart.c
+++ b/libs/dolphin/exi/EXIUart.c
@@ -6,6 +6,7 @@
 #include "dolphin/exi/EXIUart.h"
 #include "dol2asm.h"
 #include "dolphin/exi/EXIBios.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/dolphin/gd/GDBase.c b/libs/dolphin/gd/GDBase.c
index 700d63635d..b6e7a77f6b 100644
--- a/libs/dolphin/gd/GDBase.c
+++ b/libs/dolphin/gd/GDBase.c
@@ -4,7 +4,7 @@
  */
 
 #include "dolphin/gd/GDBase.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSCache.h"
 
 /* 80360F98-80360FB0 35B8D8 0018+00 0/0 6/6 0/0 .text            GDInitGDLObj */
 void GDInitGDLObj(GDLObj* obj, u8* start, u32 len) {
diff --git a/libs/dolphin/gx/GXFifo.c b/libs/dolphin/gx/GXFifo.c
index 8755ba3f01..878e58f370 100644
--- a/libs/dolphin/gx/GXFifo.c
+++ b/libs/dolphin/gx/GXFifo.c
@@ -5,6 +5,7 @@
 
 #include "dolphin/gx/GXFifo.h"
 #include "dolphin/gx/GX.h"
+#include "dolphin/os/OSInterrupt.h"
 #include "dol2asm.h"
 
 //
diff --git a/libs/dolphin/gx/GXInit.c b/libs/dolphin/gx/GXInit.c
index 3a4574f092..e635e83fc7 100644
--- a/libs/dolphin/gx/GXInit.c
+++ b/libs/dolphin/gx/GXInit.c
@@ -6,6 +6,7 @@
 #include "dolphin/gx/GXInit.h"
 #include "dolphin/gx/GX.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
 
 //
diff --git a/libs/dolphin/os/OSAudioSystem.c b/libs/dolphin/os/OSAudioSystem.c
index e431a1327a..8094a40cbf 100644
--- a/libs/dolphin/os/OSAudioSystem.c
+++ b/libs/dolphin/os/OSAudioSystem.c
@@ -6,7 +6,9 @@
 #include "dolphin/os/OSAudioSystem.h"
 #include "dol2asm.h"
 #include "dolphin/dsp/dsp.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSArena.h"
+#include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSTime.h"
 
 //
 // External References:
diff --git a/libs/dolphin/os/OSMessage.c b/libs/dolphin/os/OSMessage.c
index 620eebb01e..b44e34b696 100644
--- a/libs/dolphin/os/OSMessage.c
+++ b/libs/dolphin/os/OSMessage.c
@@ -5,7 +5,8 @@
 
 #include "dolphin/os/OSMessage.h"
 #include "dol2asm.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSInterrupt.h"
+#include "dolphin/os/OSThread.h"
 
 //
 // Declarations:
diff --git a/libs/dolphin/os/OSRtc.c b/libs/dolphin/os/OSRtc.c
index cda2d31b28..5392264435 100644
--- a/libs/dolphin/os/OSRtc.c
+++ b/libs/dolphin/os/OSRtc.c
@@ -6,7 +6,8 @@
 #include "dolphin/os/OSRtc.h"
 #include "dol2asm.h"
 #include "dolphin/exi/EXIBios.h"
-#include "dolphin/os/OS.h"
+#include "dolphin/os/OSCache.h"
+#include "dolphin/os/OSInterrupt.h"
 
 static void WriteSramCallback(s32 chan, OSContext* context);
 static BOOL WriteSram(void* buffer, u32 offset, u32 size);
diff --git a/libs/dolphin/pad/Pad.c b/libs/dolphin/pad/Pad.c
index 11235c960b..c4cdb38783 100644
--- a/libs/dolphin/pad/Pad.c
+++ b/libs/dolphin/pad/Pad.c
@@ -6,6 +6,7 @@
 #include "dolphin/pad/Pad.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/si/SIBios.h"
 #include "dolphin/si/SISamplingRate.h"
 
diff --git a/libs/dolphin/si/SIBios.c b/libs/dolphin/si/SIBios.c
index 5b2e0d1fb7..493620fca6 100644
--- a/libs/dolphin/si/SIBios.c
+++ b/libs/dolphin/si/SIBios.c
@@ -5,6 +5,7 @@
 
 #include "dolphin/si/SIBios.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/si/SISamplingRate.h"
 #include "dolphin/vi/vi.h"
 
diff --git a/libs/dolphin/si/SISamplingRate.c b/libs/dolphin/si/SISamplingRate.c
index c7c02cf188..58aa245620 100644
--- a/libs/dolphin/si/SISamplingRate.c
+++ b/libs/dolphin/si/SISamplingRate.c
@@ -5,6 +5,7 @@
 
 #include "dolphin/si/SISamplingRate.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/si/SIBios.h"
 #include "dolphin/vi/vi.h"
 
diff --git a/libs/dolphin/vi/vi.c b/libs/dolphin/vi/vi.c
index f21ede5700..4db8ea96cb 100644
--- a/libs/dolphin/vi/vi.c
+++ b/libs/dolphin/vi/vi.c
@@ -5,6 +5,7 @@
 
 #include "dolphin/vi/vi.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //