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, 87 insertions, 41 deletions

diff --git a/include/d/menu/d_menu_calibration.h b/include/d/menu/d_menu_calibration.h
index a937a01e51..4498fa3195 100644
--- a/include/d/menu/d_menu_calibration.h
+++ b/include/d/menu/d_menu_calibration.h
@@ -1,8 +1,12 @@
 #ifndef D_MENU_D_MENU_CALIBRATION_H
 #define D_MENU_D_MENU_CALIBRATION_H
 
-#include "d/com/d_com_inf_game.h"
-#include "d/msg/d_msg_string.h"
+#include "JSystem/J2DGraph/J2DTextBox.h"
+
+class CPaneMgr;
+class JKRExpHeap;
+class dMsgString_c;
+class dSelect_cursor_c;
 
 class dMenu_Calibration_c {
 public:
diff --git a/include/d/menu/d_menu_collect.h b/include/d/menu/d_menu_collect.h
index 264ffd7a1d..26ca21fb31 100644
--- a/include/d/menu/d_menu_collect.h
+++ b/include/d/menu/d_menu_collect.h
@@ -1,11 +1,13 @@
 #ifndef D_MENU_D_MENU_COLLECT_H
 #define D_MENU_D_MENU_COLLECT_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
+#include "d/kankyo/d_kankyo.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+struct STControl;
 class dMsgString_c;
 class dMenu_save_c;
 class dMenu_Option_c;
@@ -13,6 +15,7 @@ class dMenu_Letter_c;
 class dMenu_Fishing_c;
 class dMenu_Skill_c;
 class dMenu_Insect_c;
+class dSelect_cursor_c;
 
 class dMenu_Collect2D_c;
 class dMenu_Collect2DTop_c : public dDlst_base_c {
diff --git a/include/d/menu/d_menu_dmap.h b/include/d/menu/d_menu_dmap.h
index 1bef68c63e..1b65c12d92 100644
--- a/include/d/menu/d_menu_dmap.h
+++ b/include/d/menu/d_menu_dmap.h
@@ -1,11 +1,18 @@
 #ifndef D_MENU_D_MENU_DMAP_H
 #define D_MENU_D_MENU_DMAP_H
 
-#include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "d/d_lib.h"
 #include "d/d_select_cursor.h"
+#include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+class J2DOrthoGraph;
+class J2DPicture;
+class J2DScreen;
+class JKRArchive;
+class JKRExpHeap;
+struct STControl;
 class dMenu_DmapMapCtrl_c;
 class dMenu_DmapBg_c;
 class mDoDvdThd_mountArchive_c;
diff --git a/include/d/menu/d_menu_fishing.h b/include/d/menu/d_menu_fishing.h
index a1f99185f6..45e2d7057d 100644
--- a/include/d/menu/d_menu_fishing.h
+++ b/include/d/menu/d_menu_fishing.h
@@ -1,14 +1,15 @@
 #ifndef D_MENU_D_MENU_FISHING_H
 #define D_MENU_D_MENU_FISHING_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_dvd_thread.h"
-#include "d/msg/d_msg_string.h"
-
 
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+struct STControl;
+class dMsgString_c;
+class mDoDvdThd_mountArchive_c;
 
 class dMenu_Fishing_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_fmap.h b/include/d/menu/d_menu_fmap.h
index fdd4e1228f..4b9dd93418 100644
--- a/include/d/menu/d_menu_fmap.h
+++ b/include/d/menu/d_menu_fmap.h
@@ -1,12 +1,16 @@
 #ifndef D_MENU_D_MENU_FMAP_H
 #define D_MENU_D_MENU_FMAP_H
 
-#include "d/d_drawlist.h"
-#include "d/d_lib.h"
+#include "SSystem/SComponent/c_xyz.h"
 #include "d/msg/d_msg_flow.h"
-#include "d/pane/d_pane_class.h"
 #include "dolphin/types.h"
 
+struct CSTControl;
+class J2DAnmTextureSRTKey;
+class JKRArchive;
+class JKRExpHeap;
+class JKRHeap;
+struct STControl;
 class dMenu_Fmap_stage_data_c;
 class dMenu_Fmap_world_data_c;
 class dMenu_Fmap_region_data_c;
diff --git a/include/d/menu/d_menu_insect.h b/include/d/menu/d_menu_insect.h
index 40cc9ebf3f..5ae137e84c 100644
--- a/include/d/menu/d_menu_insect.h
+++ b/include/d/menu/d_menu_insect.h
@@ -1,13 +1,16 @@
 #ifndef D_MENU_D_MENU_INSECT_H
 #define D_MENU_D_MENU_INSECT_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+struct STControl;
 class dMsgScrn3Select_c;
 class dMsgString_c;
+class dSelect_cursor_c;
 
 class dMenu_Insect_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_letter.h b/include/d/menu/d_menu_letter.h
index f4c553562b..efe88ea01a 100644
--- a/include/d/menu/d_menu_letter.h
+++ b/include/d/menu/d_menu_letter.h
@@ -1,14 +1,17 @@
 #ifndef D_MENU_D_MENU_LETTER_H
 #define D_MENU_D_MENU_LETTER_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+struct STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dMsgScrnArrow_c;
+class dSelect_cursor_c;
 
 class dMenu_Letter_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_option.h b/include/d/menu/d_menu_option.h
index 7018bc7526..666de957c5 100644
--- a/include/d/menu/d_menu_option.h
+++ b/include/d/menu/d_menu_option.h
@@ -1,16 +1,20 @@
 #ifndef D_MENU_D_MENU_OPTION_H
 #define D_MENU_D_MENU_OPTION_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+class JUTFont;
+struct STControl;
 class dFile_warning_c;
 class dMenu_Calibration_c;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
 class dMeterHaihai_c;
+class dSelect_cursor_c;
 
 class dMenu_Option_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h
index fe7cd2e8a2..3d1e87f07a 100644
--- a/include/d/menu/d_menu_ring.h
+++ b/include/d/menu/d_menu_ring.h
@@ -1,14 +1,17 @@
 #ifndef D_MENU_D_MENU_RING_H
 #define D_MENU_D_MENU_RING_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
-class dMsgString_c;
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+struct STControl;
 class dKantera_icon_c;
+class dMsgString_c;
 class dMenu_ItemExplain_c;
+class dSelect_cursor_c;
 
 class dMenu_Ring_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_save.h b/include/d/menu/d_menu_save.h
index 201cb0a27b..e57da5ec3a 100644
--- a/include/d/menu/d_menu_save.h
+++ b/include/d/menu/d_menu_save.h
@@ -1,17 +1,23 @@
 #ifndef D_MENU_D_MENU_SAVE_H
 #define D_MENU_D_MENU_SAVE_H
 
-#include "JSystem/J2DGraph/J2DScreen.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_dvd_thread.h"
 #include "d/save/d_save.h"
 
+class CPaneMgr;
+class CPaneMgrAlpha;
+struct CSTControl;
+class J2DAnmColorKey;
+class J2DAnmTransformKey;
+class JUTFont;
+struct STControl;
 class dMsgString_c;
 class dFile_warning_c;
 class dFile_info_c;
 class dMsgScrnExplain_c;
+class dSelect_cursor_c;
+class mDoDvdThd_mountArchive_c;
 
 class dDlst_MenuSaveExplain_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_skill.h b/include/d/menu/d_menu_skill.h
index 62a1f7a7d5..eb46672d0a 100644
--- a/include/d/menu/d_menu_skill.h
+++ b/include/d/menu/d_menu_skill.h
@@ -1,13 +1,16 @@
 #ifndef D_MENU_D_MENU_SKILL_H
 #define D_MENU_D_MENU_SKILL_H
 
-#include "JSystem/J2DGraph/J2DPicture.h"
-#include "d/d_lib.h"
-#include "d/d_select_cursor.h"
+#include "d/d_drawlist.h"
 #include "dolphin/types.h"
 
+class CPaneMgr;
+struct CSTControl;
+class J2DTextBox;
+struct STControl;
 class mDoDvdThd_mountArchive_c;
 class dMsgString_c;
+class dSelect_cursor_c;
 
 class dMenu_Skill_c : public dDlst_base_c {
 public:
diff --git a/include/d/menu/d_menu_window.h b/include/d/menu/d_menu_window.h
index 0713418675..ac7cebce94 100644
--- a/include/d/menu/d_menu_window.h
+++ b/include/d/menu/d_menu_window.h
@@ -2,17 +2,22 @@
 #define D_MENU_D_MENU_WINDOW_H
 
 #include "d/d_drawlist.h"
-#include "d/menu/d_menu_collect.h"
-#include "d/meter/d_meter2_info.h"
 #include "f_op/f_op_msg.h"
 #include "dolphin/types.h"
-#include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
-#include "m_Do/m_Do_mtx.h"
 
-class dMenu_Ring_c;
+struct CSTControl;
+struct STControl;
+class dMenu_Collect_c;
 class dMenu_Dmap_c;
+class dMenu_Fishing_c;
 class dMenu_Fmap_c;
+class dMenu_Insect_c;
+class dMenu_Letter_c;
+class dMenu_Option_c;
+class dMenu_Ring_c;
+class dMenu_Skill_c;
+class dMenu_save_c;
 
 class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
 public: