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

12 files changed, 43 insertions, 3 deletions

diff --git a/src/d/menu/d_menu_calibration.cpp b/src/d/menu/d_menu_calibration.cpp
index e3d6041ea1..ed1ba5c5a7 100644
--- a/src/d/menu/d_menu_calibration.cpp
+++ b/src/d/menu/d_menu_calibration.cpp
@@ -4,7 +4,13 @@
  */
 
 #include "d/menu/d_menu_calibration.h"
+#include "d/com/d_com_inf_game.h"
+#include "d/d_select_cursor.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
+#include "d/msg/d_msg_string.h"
+#include "d/pane/d_pane_class.h"
+#include "m_Do/m_Do_controller_pad.h"
 
 /* 803BC238-803BC244 019358 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
 static u8 cNullVec__6Z2Calc[12] = {
diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index a37283bc79..ae5417b21e 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_collect.h"
+#include "d/d_lib.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp
index 450dbd1ff6..b1e3903d8e 100644
--- a/src/d/menu/d_menu_dmap.cpp
+++ b/src/d/menu/d_menu_dmap.cpp
@@ -4,7 +4,9 @@
 //
 
 #include "d/menu/d_menu_dmap.h"
+#include "JSystem/J2DGraph/J2DPicture.h"
 #include "MSL_C/string.h"
+#include "d/d_lib.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp
index 398f0698a5..c143d87183 100644
--- a/src/d/menu/d_menu_fishing.cpp
+++ b/src/d/menu/d_menu_fishing.cpp
@@ -4,6 +4,11 @@
  */
 
 #include "d/menu/d_menu_fishing.h"
+#include "JSystem/J2DGraph/J2DTextBox.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_string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp
index 87bd3ccac6..aaec4f3efc 100644
--- a/src/d/menu/d_menu_fmap.cpp
+++ b/src/d/menu/d_menu_fmap.cpp
@@ -4,10 +4,16 @@
 //
 
 #include "d/menu/d_menu_fmap.h"
+#include "JSystem/JKernel/JKRArchive.h"
+#include "MSL_C/stdio.h"
 #include "MSL_C/string.h"
+#include "d/d_lib.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
 
+struct ResTIMG;
+
 //
 // Types:
 //
@@ -442,7 +448,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void sprintf();
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" extern void* __vt__19dMenuFmapIconDisp_c[3];
 extern "C" extern u8 g_dComIfG_gameInfo[122384];
diff --git a/src/d/menu/d_menu_insect.cpp b/src/d/menu/d_menu_insect.cpp
index f54dbafc1f..19eb040ea3 100644
--- a/src/d/menu/d_menu_insect.cpp
+++ b/src/d/menu/d_menu_insect.cpp
@@ -4,6 +4,7 @@
 //
 
 #include "d/menu/d_menu_insect.h"
+#include "MSL_C/stdio.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
@@ -180,7 +181,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void snprintf();
 extern "C" extern void* __vt__12dDlst_base_c[3];
 extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
 extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp
index 56c6f57215..9e799999b5 100644
--- a/src/d/menu/d_menu_letter.cpp
+++ b/src/d/menu/d_menu_letter.cpp
@@ -4,6 +4,8 @@
 //
 
 #include "d/menu/d_menu_letter.h"
+#include "JSystem/J2DGraph/J2DTextBox.h"
+#include "MSL_C/stdio.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
@@ -190,7 +192,6 @@ extern "C" void _restgpr_26();
 extern "C" void _restgpr_27();
 extern "C" void _restgpr_28();
 extern "C" void _restgpr_29();
-extern "C" void sprintf();
 extern "C" extern void* __vt__12dDlst_base_c[3];
 extern "C" u8 letter_data__12dMenu_Letter[512];
 extern "C" u8 m_cpadInfo__8mDoCPd_c[256];
diff --git a/src/d/menu/d_menu_map_common.cpp b/src/d/menu/d_menu_map_common.cpp
index b4a60f2b05..33d3ecb34e 100644
--- a/src/d/menu/d_menu_map_common.cpp
+++ b/src/d/menu/d_menu_map_common.cpp
@@ -12,6 +12,7 @@
 #include "d/meter/d_meter_HIO.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 struct dMenuMapCommon_c {
     /* 801C2718 */ dMenuMapCommon_c();
diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp
index 97bd179e30..7c3e25e2a8 100644
--- a/src/d/menu/d_menu_option.cpp
+++ b/src/d/menu/d_menu_option.cpp
@@ -6,6 +6,7 @@
 #include "d/menu/d_menu_option.h"
 #include "MSL_C/string.h"
 #include "dol2asm.h"
+#include "dolphin/os/OSRtc.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/d/menu/d_menu_save.cpp b/src/d/menu/d_menu_save.cpp
index d3a970f09d..3891965541 100644
--- a/src/d/menu/d_menu_save.cpp
+++ b/src/d/menu/d_menu_save.cpp
@@ -5,15 +5,24 @@
 
 #include "d/menu/d_menu_save.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
+#include "JSystem/JKernel/JKRMemArchive.h"
 #include "MSL_C/stdio.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/d_lib.h"
+#include "d/d_select_cursor.h"
 #include "d/file/d_file_sel_info.h"
 #include "d/file/d_file_sel_warning.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_MemCard.h"
+#include "m_Do/m_Do_MemCardRWmng.h"
+#include "m_Do/m_Do_Reset.h"
+#include "m_Do/m_Do_controller_pad.h"
+#include "m_Do/m_Do_graphic.h"
 #include "msg/scrn/d_msg_scrn_explain.h"
 
 //
diff --git a/src/d/menu/d_menu_skill.cpp b/src/d/menu/d_menu_skill.cpp
index 9ba5bb7c10..5237e3bcdf 100644
--- a/src/d/menu/d_menu_skill.cpp
+++ b/src/d/menu/d_menu_skill.cpp
@@ -7,6 +7,7 @@
 #include "MSL_C/string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 //
 // Types:
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index 47180550ec..5f4291ca6f 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -4,8 +4,11 @@
 //
 
 #include "d/menu/d_menu_window.h"
+#include "JSystem/JKernel/JKRExpHeap.h"
 #include "Z2AudioLib/Z2AudioMgr.h"
+#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/d_lib.h"
 #include "d/menu/d_menu_collect.h"
 #include "d/menu/d_menu_dmap.h"
 #include "d/menu/d_menu_fishing.h"
@@ -17,11 +20,16 @@
 #include "d/menu/d_menu_save.h"
 #include "d/menu/d_menu_skill.h"
 #include "d/menu/d_menu_window_HIO.h"
+#include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
+#include "d/meter/d_meter_map.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
+#include "dolphin/os/OS.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_msg_mng.h"
+#include "global.h"
+#include "m_Do/m_Do_controller_pad.h"
 
 //
 // Forward References: