summaryrefslogtreecommitdiff
path: root/include/JSystem/JKernel
diff options
context:
space:
mode:
authorJcw87 <Jcw87@users.noreply.github.com>2023-05-12 12:10:14 -0700
committerGitHub <noreply@github.com>2023-05-12 12:10:14 -0700
commit221f40e6097dfe76c76602aa21aa07d5f760dce4 (patch)
treeb8f2549712927365bcffd13688729555a4276ff1 /include/JSystem/JKernel
parent8c7cda85891b41cfdbce72ed4efb00292f34a16a (diff)
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
Diffstat (limited to 'include/JSystem/JKernel')
-rw-r--r--include/JSystem/JKernel/JKRAram.h4
-rw-r--r--include/JSystem/JKernel/JKRAramArchive.h3
-rw-r--r--include/JSystem/JKernel/JKRAramBlock.h3
-rw-r--r--include/JSystem/JKernel/JKRAramHeap.h2
-rw-r--r--include/JSystem/JKernel/JKRAramPiece.h3
-rw-r--r--include/JSystem/JKernel/JKRArchive.h5
-rw-r--r--include/JSystem/JKernel/JKRCompArchive.h3
-rw-r--r--include/JSystem/JKernel/JKRDvdAramRipper.h1
-rw-r--r--include/JSystem/JKernel/JKRDvdFile.h5
-rw-r--r--include/JSystem/JKernel/JKRDvdRipper.h2
-rw-r--r--include/JSystem/JKernel/JKRHeap.h2
-rw-r--r--include/JSystem/JKernel/JKRThread.h5
12 files changed, 23 insertions, 15 deletions
diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h
index 80975eba93..5fd1b7820e 100644
--- a/include/JSystem/JKernel/JKRAram.h
+++ b/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:
diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h
index 5a7f7bd44a..33031afbe4 100644
--- a/include/JSystem/JKernel/JKRAramArchive.h
+++ b/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);
diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock.h
index 5f17050f2d..0dcc348cda 100644
--- a/include/JSystem/JKernel/JKRAramBlock.h
+++ b/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"
diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h
index 0a1f912b63..48293cba8d 100644
--- a/include/JSystem/JKernel/JKRAramHeap.h
+++ b/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 {
diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h
index 6e17f67e52..5f522d5d1c 100644
--- a/include/JSystem/JKernel/JKRAramPiece.h
+++ b/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;
diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h
index 2583da20b8..e6e230d415 100644
--- a/include/JSystem/JKernel/JKRArchive.h
+++ b/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;
diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h
index f5fcb31999..74490ddfef 100644
--- a/include/JSystem/JKernel/JKRCompArchive.h
+++ b/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);
diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h
index ed01abe023..a6b59f07a2 100644
--- a/include/JSystem/JKernel/JKRDvdAramRipper.h
+++ b/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;
diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h
index ecb722531a..a1b1295782 100644
--- a/include/JSystem/JKernel/JKRDvdFile.h
+++ b/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;
diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h
index 21f068e3dd..2afe449fb2 100644
--- a/include/JSystem/JKernel/JKRDvdRipper.h
+++ b/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 {
diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 4d8f196f90..c12504d42f 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/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;
diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h
index c4c294dcd5..12ed5241f6 100644
--- a/include/JSystem/JKernel/JKRThread.h
+++ b/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 {