summaryrefslogtreecommitdiff
path: root/include/d/msg
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/d/msg
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/d/msg')
-rw-r--r--include/d/msg/d_msg_class.h7
-rw-r--r--include/d/msg/d_msg_flow.h5
-rw-r--r--include/d/msg/d_msg_object.h10
-rw-r--r--include/d/msg/d_msg_out_font.h5
-rw-r--r--include/d/msg/d_msg_string.h4
-rw-r--r--include/d/msg/d_msg_string_base.h5
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 4e975d941b..6ea756bba7 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 e82c0ecc33..99642f6463 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;