Merge branch 'master' into various3

6 files changed, 26 insertions, 10 deletions

diff --git a/include/d/msg/d_msg_class.h b/include/d/msg/d_msg_class.h
index 1b04e9eaf8..ebd33b7940 100644
--- a/include/d/msg/d_msg_class.h
+++ b/include/d/msg/d_msg_class.h
@@ -3,8 +3,11 @@
 
 #include "JSystem/JMessage/control.h"
 #include "JSystem/JMessage/processor.h"
-#include "d/msg/d_msg_out_font.h"
-#include "f_op/f_op_msg.h"
+#include "SSystem/SComponent/c_xyz.h"
+
+class COutFont_c;
+class J2DTextBox;
+class JUTFont;
 
 struct JMSMesgEntry_c {
     /* 0x00 */ u32 mStringOffset;
diff --git a/include/d/msg/d_msg_flow.h b/include/d/msg/d_msg_flow.h
index 74dec026b4..cc14bff58e 100644
--- a/include/d/msg/d_msg_flow.h
+++ b/include/d/msg/d_msg_flow.h
@@ -1,7 +1,10 @@
 #ifndef D_MSG_D_MSG_FLOW_H
 #define D_MSG_D_MSG_FLOW_H
 
-#include "f_op/f_op_msg.h"
+#include "dolphin/types.h"
+
+class fopAc_ac_c;
+class msg_class;
 
 // all mesg_flow_node structs members might be wrong
 struct mesg_flow_node {
diff --git a/include/d/msg/d_msg_object.h b/include/d/msg/d_msg_object.h
index 75a0e42eba..bef18638c3 100644
--- a/include/d/msg/d_msg_object.h
+++ b/include/d/msg/d_msg_object.h
@@ -1,15 +1,19 @@
 #ifndef D_MSG_D_MSG_OBJECT_H
 #define D_MSG_D_MSG_OBJECT_H
 
-#include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JMessage/control.h"
-#include "JSystem/JMessage/processor.h"
 #include "JSystem/JMessage/resource.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/msg/d_msg_class.h"
+#include "f_op/f_op_msg.h"
 
 class COutFont_c;
+class J2DTextBox;
+class JUTFont;
 class dMsgScrnBase_c;
+class dMsgString_c;
+struct jmessage_tReference;
+struct jmessage_tRenderingProcessor;
+struct jmessage_tSequenceProcessor;
 
 class dMsgObject_c : public msg_class {
 public:
diff --git a/include/d/msg/d_msg_out_font.h b/include/d/msg/d_msg_out_font.h
index e11307c730..5f55372c14 100644
--- a/include/d/msg/d_msg_out_font.h
+++ b/include/d/msg/d_msg_out_font.h
@@ -2,8 +2,9 @@
 #define D_MSG_D_MSG_OUT_FONT_H
 
 #include "dolphin/types.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/J2DGraph/J2DPicture.h"
+
+class J2DPicture;
+class J2DTextBox;
 
 class COutFontSet_c {
 public:
diff --git a/include/d/msg/d_msg_string.h b/include/d/msg/d_msg_string.h
index d9943b8384..09ea58b379 100644
--- a/include/d/msg/d_msg_string.h
+++ b/include/d/msg/d_msg_string.h
@@ -2,7 +2,9 @@
 #define D_MSG_D_MSG_STRING_H
 
 #include "d/msg/d_msg_string_base.h"
-#include "d/msg/d_msg_out_font.h"
+
+class COutFont_c;
+class JUTFont;
 
 class dMsgString_c : public dMsgStringBase_c {
 public:
diff --git a/include/d/msg/d_msg_string_base.h b/include/d/msg/d_msg_string_base.h
index 0dcb053c29..838a7dbe66 100644
--- a/include/d/msg/d_msg_string_base.h
+++ b/include/d/msg/d_msg_string_base.h
@@ -1,8 +1,11 @@
 #ifndef D_MSG_D_MSG_STRING_BASE_H
 #define D_MSG_D_MSG_STRING_BASE_H
 
-#include "d/msg/d_msg_object.h"
+#include "JSystem/JMessage/resource.h"
 
+class COutFont_c;
+class J2DTextBox;
+class JUTFont;
 struct jmessage_string_tControl;
 struct jmessage_string_tReference;
 struct jmessage_string_tSequenceProcessor;