Merge branch 'master' into various3

2 files changed, 15 insertions, 8 deletions

diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h
index d189cd7cde..57f987cc6f 100644
--- a/include/JSystem/JFramework/JFWDisplay.h
+++ b/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 {
diff --git a/include/JSystem/JFramework/JFWSystem.h b/include/JSystem/JFramework/JFWSystem.h
index 66c89e8c56..e1b878f12a 100644
--- a/include/JSystem/JFramework/JFWSystem.h
+++ b/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;