Merge branch 'master' into various3

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:

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"
 

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"
 
 //

src/d/msg/d_msg_out_font.cpp

@@ -4,9 +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 "global.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_msg_mng.h"
 

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"

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"
 

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"