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

27 files changed, 37 insertions, 6 deletions

diff --git a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
index d00d3ce40c..fde7bd6916 100644
--- a/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
+++ b/include/rel/d/a/b/d_a_b_ob/d_a_b_ob.h
@@ -1,6 +1,7 @@
 #ifndef D_A_B_OB_H
 #define D_A_B_OB_H
 
+#include "Z2AudioLib/Z2Creature.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/com/d_com_inf_game.h"
 
diff --git a/include/rel/d/a/d_a_arrow/d_a_arrow.h b/include/rel/d/a/d_a_arrow/d_a_arrow.h
index 31d7392100..ab04bdf1cd 100644
--- a/include/rel/d/a/d_a_arrow/d_a_arrow.h
+++ b/include/rel/d/a/d_a_arrow/d_a_arrow.h
@@ -1,12 +1,13 @@
 #ifndef D_A_ARROW_H
 #define D_A_ARROW_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "d/a/d_a_player.h"
 #include "d/d_procname.h"
 #include "d/cc/d_cc_d.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/bg/d_bg_s_lin_chk.h"
 #include "d/particle/d_particle.h"
+#include "f_op/f_op_actor_mng.h"
 
 class daArrow_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
index 93e99f7301..63cf4daeb9 100644
--- a/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
+++ b/include/rel/d/a/d_a_boomerang/d_a_boomerang.h
@@ -4,6 +4,7 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "Z2AudioLib/Z2SoundObject.h"
 #include "d/bg/d_bg_s_acch.h"
+#include "d/bg/d_bg_s_lin_chk.h"
 #include "d/cc/d_cc_d.h"
 #include "d/particle/d_particle_copoly.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
index 4ae90e6271..bbd183c09b 100644
--- a/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
+++ b/include/rel/d/a/d_a_cstaF/d_a_cstaF.h
@@ -1,8 +1,10 @@
 #ifndef D_A_CSTAF_H
 #define D_A_CSTAF_H
 
+#include "Z2AudioLib/Z2Creature.h"
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/particle/d_particle_copoly.h"
 
 class daCstaF_c : public dBgS_MoveBgActor {
 public:
diff --git a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
index 8b0135832a..3533acc1ce 100644
--- a/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
+++ b/include/rel/d/a/d_a_cstatue/d_a_cstatue.h
@@ -2,6 +2,7 @@
 #define D_A_CSTATUE_H
 
 #include "SSystem/SComponent/c_phase.h"
+#include "Z2AudioLib/Z2Creature.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
 #include "d/particle/d_particle_copoly.h"
diff --git a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
index 46e9113819..282cbc655b 100644
--- a/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
+++ b/include/rel/d/a/d_a_guard_mng/d_a_guard_mng.h
@@ -1,9 +1,11 @@
 #ifndef D_A_GUARD_MNG_H
 #define D_A_GUARD_MNG_H
 
+#include "JSystem/JKernel/JKRHeap.h"
+#include "d/a/d_a_player.h"
+#include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 #include "rel/d/a/tag/d_a_tag_guard/d_a_tag_guard.h"
-#include "d/com/d_com_inf_game.h"
 
 class daGuardMng_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/d_a_horse/d_a_horse.h b/include/rel/d/a/d_a_horse/d_a_horse.h
index 4252b18e89..757eae2930 100644
--- a/include/rel/d/a/d_a_horse/d_a_horse.h
+++ b/include/rel/d/a/d_a_horse/d_a_horse.h
@@ -2,7 +2,10 @@
 #define D_A_HORSE_H
 
 #include "Z2AudioLib/Z2Creature.h"
+#include "d/a/d_a_player.h"
 #include "d/bg/d_bg_s.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/bg/d_bg_s_lin_chk.h"
 #include "d/cc/d_cc_d.h"
 #include "d/msg/d_msg_flow.h"
 #include "dolphin/types.h"
diff --git a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
index 48fe2419d4..0663639130 100644
--- a/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
+++ b/include/rel/d/a/d_a_skip_2D/d_a_skip_2D.h
@@ -3,6 +3,8 @@
 
 #include "d/com/d_com_inf_game.h"
 
+class dMeterButton_c;
+
 class daSkip2D_c : public fopAc_ac_c {
 public:
     daSkip2D_c() {
diff --git a/include/rel/d/a/d_a_spinner/d_a_spinner.h b/include/rel/d/a/d_a_spinner/d_a_spinner.h
index f139147ad6..31f85cc404 100644
--- a/include/rel/d/a/d_a_spinner/d_a_spinner.h
+++ b/include/rel/d/a/d_a_spinner/d_a_spinner.h
@@ -2,6 +2,7 @@
 #define D_A_SPINNER_H
 
 #include "d/com/d_com_inf_game.h"
+#include "d/particle/d_particle_copoly.h"
 #include "dolphin/types.h"
 
 class daSpinner_c : public fopAc_ac_c {
diff --git a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h
index be52d7f2cd..9271288722 100644
--- a/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h
+++ b/include/rel/d/a/e/d_a_e_yk/d_a_e_yk.h
@@ -1,6 +1,7 @@
 #ifndef D_A_E_YK_H
 #define D_A_E_YK_H
 
+#include "Z2AudioLib/Z2Creature.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
index 75ae6fd416..16ae6f8791 100644
--- a/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
+++ b/include/rel/d/a/e/d_a_e_ym/d_a_e_ym.h
@@ -1,6 +1,7 @@
 #ifndef D_A_E_YM_H
 #define D_A_E_YM_H
 
+#include "Z2AudioLib/Z2Creature.h"
 #include "d/cc/d_cc_uty.h"
 #include "d/com/d_com_inf_game.h"
 
diff --git a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
index 9e225e4156..47be9da007 100644
--- a/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
+++ b/include/rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h
@@ -5,6 +5,7 @@
 #include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor.h"
 
 class daObjCarry_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
index eafbdabf4c..6bca7f1125 100644
--- a/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
+++ b/include/rel/d/a/obj/d_a_obj_cboard/d_a_obj_cboard.h
@@ -3,6 +3,7 @@
 
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 
 class daObjBoard_c : public dBgS_MoveBgActor {
 public:
diff --git a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
index 7f65865c11..ea7fd6691f 100644
--- a/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
+++ b/include/rel/d/a/obj/d_a_obj_mgate/d_a_obj_mgate.h
@@ -3,6 +3,7 @@
 
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 
 class daObjMGate_c : public dBgS_MoveBgActor {
 public:
diff --git a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
index fa880eb032..1d55238d52 100644
--- a/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
+++ b/include/rel/d/a/obj/d_a_obj_stone/d_a_obj_stone.h
@@ -3,6 +3,7 @@
 
 #include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 
 enum {
     OBJ_STONE_TYPE_SMALL = 0,
diff --git a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h
index 45b4e09a2f..d9d77a8fbf 100644
--- a/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h
+++ b/include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h
@@ -2,6 +2,7 @@
 #define D_A_OBJ_YOBIKUSA_H
 
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 
 class daObjYobikusa_c;
 typedef void (daObjYobikusa_c::*actionFunc)();
diff --git a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h
index e6992306e6..ae36097347 100644
--- a/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h
+++ b/include/rel/d/a/tag/d_a_tag_CstaSw/d_a_tag_CstaSw.h
@@ -2,6 +2,7 @@
 #define D_A_TAG_CSTASW_H
 
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_hostIO.h"
 
 class daTagCstaSw_c : public fopAc_ac_c {
diff --git a/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h b/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h
index 9101c69d51..cf10cb8a61 100644
--- a/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h
+++ b/include/rel/d/a/tag/d_a_tag_arena/d_a_tag_arena.h
@@ -1,6 +1,7 @@
 #ifndef D_A_TAG_ARENA_H
 #define D_A_TAG_ARENA_H
 
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
diff --git a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
index 977192f2f6..b315862a41 100644
--- a/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
+++ b/include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
@@ -1,6 +1,7 @@
 #ifndef D_A_TAG_ASSISTANCE_H
 #define D_A_TAG_ASSISTANCE_H
 
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h b/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h
index 07d779bb38..ca7fd78312 100644
--- a/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h
+++ b/include/rel/d/a/tag/d_a_tag_gra/d_a_tag_gra.h
@@ -1,6 +1,7 @@
 #ifndef D_A_TAG_GRA_H
 #define D_A_TAG_GRA_H
 
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h b/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h
index 9cca8d66cd..e77161af76 100644
--- a/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h
+++ b/include/rel/d/a/tag/d_a_tag_howl/d_a_tag_howl.h
@@ -1,9 +1,8 @@
 #ifndef D_A_TAG_HOWL_H
 #define D_A_TAG_HOWL_H
 
-#include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
 
 class daTag_Howl_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h
index eea9d27198..feadc9bc72 100644
--- a/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h
+++ b/include/rel/d/a/tag/d_a_tag_lantern/d_a_tag_lantern.h
@@ -3,6 +3,8 @@
 
 #include "f_op/f_op_actor_mng.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/msg/d_msg_flow.h"
+
 class daTag_Lantern_c : public fopAc_ac_c {
 public:
     /* 8048ED28 */ int create();
diff --git a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
index 9f0dda433d..620595d744 100644
--- a/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
+++ b/include/rel/d/a/tag/d_a_tag_lv6CstaSw/d_a_tag_lv6CstaSw.h
@@ -2,6 +2,7 @@
 #define D_A_TAG_LV6CSTASW_H
 
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_hostIO.h"
 
 class daLv6CstaSw_c : public fopAc_ac_c {
diff --git a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h
index 675ce7214c..4f87877470 100644
--- a/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h
+++ b/include/rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h
@@ -1,9 +1,8 @@
 #ifndef D_A_TAG_MMSG_H
 #define D_A_TAG_MMSG_H
 
-#include "d/a/d_a_player.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
 
 class daTagMmsg_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h b/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h
index 71ef44e72c..4fc704f429 100644
--- a/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h
+++ b/include/rel/d/a/tag/d_a_tag_schedule/d_a_tag_schedule.h
@@ -1,6 +1,7 @@
 #ifndef D_A_TAG_SCHEDULE_H
 #define D_A_TAG_SCHEDULE_H
 
+#include "JSystem/JKernel/JKRHeap.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
diff --git a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h
index 90604ff928..8b2973bf39 100644
--- a/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h
+++ b/include/rel/d/a/tag/d_a_tag_spring/d_a_tag_spring.h
@@ -2,6 +2,7 @@
 #define D_A_TAG_SPRING_H
 
 #include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
 
 class daTagSpring_c : public fopAc_ac_c {
 public:
diff --git a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h
index 5e03effb42..e426670678 100644
--- a/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h
+++ b/include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h
@@ -2,7 +2,10 @@
 #define D_A_TAG_THEB_HINT_H
 
 // #include "rel/d/a/npc/d_a_npc_theB/d_a_npc_theB.h"
+#include "JSystem/JKernel/JKRHeap.h"
 #include "d/com/d_com_inf_game.h"
+#include "d/d_procname.h"
+#include "f_op/f_op_actor_mng.h"
 
 // needs to be pulled from d_a_npc_theB.h eventually
 struct daNpcTheB_c {