7 files changed, 20 insertions, 2 deletions
diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index cbd403363b..8afa4dd99a 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -6,9 +6,12 @@
 #include "d/msg/d_msg_class.h"
 #include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/d_lib.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_unit.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 
 //
 // Forward References:
diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp
index a0d16cf3b6..b22e4a8c92 100644
--- a/src/d/msg/d_msg_flow.cpp
+++ b/src/d/msg/d_msg_flow.cpp
@@ -5,13 +5,17 @@
 
 #include "d/msg/d_msg_flow.h"
 #include "SSystem/SComponent/c_math.h"
+#include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
 #include "d/d_item.h"
+#include "d/d_procname.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "d/shop/d_shop_system.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_audio.h"
 
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 6d50d3ae35..f6c4c6b2f4 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -4,10 +4,13 @@
 //
 
 #include "d/msg/d_msg_object.h"
-#include "d/msg/d_msg_out_font.h"
 #include "JSystem/JGadget/binary.h"
 #include "MSL_C/stdio.h"
+#include "d/meter/d_meter2_info.h"
+#include "d/msg/d_msg_class.h"
+#include "d/msg/d_msg_out_font.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/d/msg/d_msg_out_font.cpp b/src/d/msg/d_msg_out_font.cpp
index 1a5ca727f2..6143d7c01d 100644
--- a/src/d/msg/d_msg_out_font.cpp
+++ b/src/d/msg/d_msg_out_font.cpp
@@ -4,10 +4,12 @@
 //
 
 #include "d/msg/d_msg_out_font.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
-#include "d/com/d_com_inf_game.h"
+#include "global.h"
 
 //
 // Forward References:
diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp
index 8d74180582..db0e5f01fb 100644
--- a/src/d/msg/d_msg_string.cpp
+++ b/src/d/msg/d_msg_string.cpp
@@ -4,6 +4,9 @@
 //
 
 #include "d/msg/d_msg_string.h"
+#include "JSystem/J2DGraph/J2DTextBox.h"
+#include "d/meter/d_meter2_info.h"
+#include "d/msg/d_msg_out_font.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "JSystem/JGeometry.h"
diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp
index d8f2f24ef8..2ee45fdd5d 100644
--- a/src/d/msg/d_msg_string_base.cpp
+++ b/src/d/msg/d_msg_string_base.cpp
@@ -5,6 +5,8 @@
 
 #include "d/msg/d_msg_string_base.h"
 #include "JSystem/JGadget/binary.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp
index bea422bea4..b79380fb02 100644
--- a/src/d/msg/d_msg_unit.cpp
+++ b/src/d/msg/d_msg_unit.cpp
@@ -5,6 +5,7 @@
 
 #include "d/msg/d_msg_unit.h"
 #include "MSL_C/stdio.h"
+#include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "d/kankyo/d_kankyo.h"
 #include "d/meter/d_meter2_info.h"