d_a_e_fz work, doxygen revamp (#2127)

* initial freezard actor struct + setActionMode OK

* daE_FZ_Draw

* setReflectAngle

* mBoundSoundset

* daE_FZ_Execute & execute

* demoDelete

* daE_FZ_Delete & _delete

* CreateHeap

* useHeapInit

* cc_set

* mtx_set

* action WIP

* way_gake_check

* executeRollMove

* executeMove

* draw WIP

* executeDamage

* checkpoint

* create

* checkpoint

* daE_FZ_c::executeWait

* checkpoint

* daE_FZ_c::damage_check almost done

* rm asm

* rm headers

* setup_profile WIP + doxygen update

* fix merge issues

* docs fix?

* fix2

* doxygen updates

* setup g_profile_E_FZ, profile setup script WIP

* update github actions

* update progress.md

130 files changed, 131 insertions, 419 deletions

diff --git a/src/DynamicLink.cpp b/src/DynamicLink.cpp
index 967838b763..8b9124909f 100644
--- a/src/DynamicLink.cpp
+++ b/src/DynamicLink.cpp
@@ -9,8 +9,6 @@
 #include "JSystem/JKernel/JKRFileCache.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "stdio.h"
-#include "dol2asm.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
 
diff --git a/src/c/c_damagereaction.cpp b/src/c/c_damagereaction.cpp
index 7f31d09858..d8a917cf5a 100644
--- a/src/c/c_damagereaction.cpp
+++ b/src/c/c_damagereaction.cpp
@@ -7,7 +7,6 @@
 #include "dol2asm.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 
 //
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 63de249b0c..44a9db74bb 100644
--- a/src/c/c_dylink.cpp
+++ b/src/c/c_dylink.cpp
@@ -8,8 +8,6 @@
 #include "JSystem/JKernel/JKRFileCache.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
-#include "global.h"
 #include "m_Do/m_Do_ext.h"
 
 /* 80374640-80375DE8 -00001 17A8+00 1/1 0/0 0/0 .rodata          DynamicNameTable */
diff --git a/src/d/a/d_a_alink.cpp b/src/d/a/d_a_alink.cpp
index d5c5120ced..64651e9c8d 100644
--- a/src/d/a/d_a_alink.cpp
+++ b/src/d/a/d_a_alink.cpp
@@ -7,25 +7,16 @@
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
-#include "JSystem/JAudio2/JAISeq.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JMath/JMath.h"
 #include "SSystem/SComponent/c_math.h"
-#include "d/a/d_a_npc.h"
-#include "d/a/d_a_obj.h"
 #include "d/d_item.h"
-#include "d/d_procname.h"
 #include "d/meter/d_meter2_draw.h"
-#include "d/msg/d_msg_object.h"
 #include "d/pane/d_pane_class.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "rel/d/a/d_a_crod/d_a_crod.h"
-#include "rel/d/a/d_a_horse/d_a_horse.h"
 #include "rel/d/a/d_a_mg_rod/d_a_mg_rod.h"
 #include "rel/d/a/d_a_midna/d_a_midna.h"
 #include "rel/d/a/d_a_mirror/d_a_mirror.h"
-#include "rel/d/a/d_a_scene_exit/d_a_scene_exit.h"
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
 #include "rel/d/a/d_a_tbox/d_a_tbox.h"
 #include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
diff --git a/src/d/a/d_a_item_static.cpp b/src/d/a/d_a_item_static.cpp
index 164dcba362..40d2e8c864 100644
--- a/src/d/a/d_a_item_static.cpp
+++ b/src/d/a/d_a_item_static.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/a/d_a_item_static.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:
diff --git a/src/d/a/d_a_itembase.cpp b/src/d/a/d_a_itembase.cpp
index 5dda2b8d49..076fe8dace 100644
--- a/src/d/a/d_a_itembase.cpp
+++ b/src/d/a/d_a_itembase.cpp
@@ -6,7 +6,6 @@
 #include "d/a/d_a_itembase.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_item_data.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
 
 //
diff --git a/src/d/a/d_a_no_chg_room.cpp b/src/d/a/d_a_no_chg_room.cpp
index b4052088f0..b02055dc42 100644
--- a/src/d/a/d_a_no_chg_room.cpp
+++ b/src/d/a/d_a_no_chg_room.cpp
@@ -4,10 +4,6 @@
  */
 
 #include "d/a/d_a_no_chg_room.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "d/a/d_a_player.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_room.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 #include "rel/d/a/d_a_spinner/d_a_spinner.h"
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp
index 3cde9f420c..c839175d2e 100644
--- a/src/d/a/d_a_npc.cpp
+++ b/src/d/a/d_a_npc.cpp
@@ -4,12 +4,8 @@
 //
 
 #include "d/a/d_a_npc.h"
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "SSystem/SComponent/c_math.h"
-#include "d/d_procname.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 #include "rel/d/a/npc/d_a_npc_tk/d_a_npc_tk.h"
 #include "rel/d/a/tag/d_a_tag_evtarea/d_a_tag_evtarea.h"
diff --git a/src/d/a/d_a_npc_cd.cpp b/src/d/a/d_a_npc_cd.cpp
index 113063b2d8..694e3e34ea 100644
--- a/src/d/a/d_a_npc_cd.cpp
+++ b/src/d/a/d_a_npc_cd.cpp
@@ -5,7 +5,6 @@
 
 #include "d/a/d_a_npc_cd.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 
 //
 // Types:
diff --git a/src/d/a/d_a_npc_cd2.cpp b/src/d/a/d_a_npc_cd2.cpp
index 6d950843b7..6d460da358 100644
--- a/src/d/a/d_a_npc_cd2.cpp
+++ b/src/d/a/d_a_npc_cd2.cpp
@@ -5,7 +5,6 @@
 
 #include "d/a/d_a_npc_cd2.h"
 #include "d/a/d_a_player.h"
-#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
 
diff --git a/src/d/a/d_a_obj.cpp b/src/d/a/d_a_obj.cpp
index d5e0fd7ea5..3a45d70ce9 100644
--- a/src/d/a/d_a_obj.cpp
+++ b/src/d/a/d_a_obj.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/a/d_a_obj.h"
-#include "JSystem/JMath/JMath.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
diff --git a/src/d/a/d_a_obj_item.cpp b/src/d/a/d_a_obj_item.cpp
index 169e703d54..6ce96e2919 100644
--- a/src/d/a/d_a_obj_item.cpp
+++ b/src/d/a/d_a_obj_item.cpp
@@ -9,7 +9,6 @@
 #include "d/d_item.h"
 #include "d/d_item_data.h"
 #include "dol2asm.h"
-#include "global.h"
 #include "m_Do/m_Do_mtx.h"
 
 //
diff --git a/src/d/a/d_a_player.cpp b/src/d/a/d_a_player.cpp
index 6e34eb5fb8..27e358729d 100644
--- a/src/d/a/d_a_player.cpp
+++ b/src/d/a/d_a_player.cpp
@@ -8,7 +8,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_alink.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 #include "rel/d/a/d_a_boomerang/d_a_boomerang.h"
 #include "rel/d/a/d_a_midna/d_a_midna.h"
diff --git a/src/d/bg/d_bg_plc.cpp b/src/d/bg/d_bg_plc.cpp
index 7a5e475a84..02bf36e04f 100644
--- a/src/d/bg/d_bg_plc.cpp
+++ b/src/d/bg/d_bg_plc.cpp
@@ -3,7 +3,6 @@
 //
 
 #include "d/bg/d_bg_plc.h"
-#include "dolphin/types.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 /* 80074074-80074080 06E9B4 000C+00 0/0 1/1 0/0 .text            __ct__6dBgPlcFv */
diff --git a/src/d/bg/d_bg_s.cpp b/src/d/bg/d_bg_s.cpp
index 34654a2e48..38899da3d9 100644
--- a/src/d/bg/d_bg_s.cpp
+++ b/src/d/bg/d_bg_s.cpp
@@ -7,7 +7,6 @@
 #include "d/bg/d_bg_s_sph_chk.h"
 #include "d/bg/d_bg_w.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/mtx.h"
 #include "f_op/f_op_actor_mng.h"
 
 /* 800740F4-80074110 06EA34 001C+00 2/2 1/1 0/0 .text            Init__11cBgS_ChkElmFv */
diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/bg/d_bg_s_acch.cpp
index ff14f4e045..ce48e206b2 100644
--- a/src/d/bg/d_bg_s_acch.cpp
+++ b/src/d/bg/d_bg_s_acch.cpp
@@ -7,7 +7,6 @@
 #include "d/a/d_a_player.h"
 #include "d/bg/d_bg_s.h"
 #include "d/com/d_com_inf_game.h"
-#include "f_op/f_op_actor_mng.h"
 #include "global.h"
 
 /* 80075EAC-80075F14 0707EC 0068+00 0/0 4/4 336/336 .text            __ct__12dBgS_AcchCirFv */
diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/bg/d_bg_s_movebg_actor.cpp
index 26ed5f5234..0f3330748f 100644
--- a/src/d/bg/d_bg_s_movebg_actor.cpp
+++ b/src/d/bg/d_bg_s_movebg_actor.cpp
@@ -6,7 +6,6 @@
 #include "d/bg/d_bg_s_movebg_actor.h"
 #include "d/bg/d_bg_w.h"
 #include "d/com/d_com_inf_game.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
 
 /* 80078624-80078668 072F64 0044+00 0/0 0/0 173/173 .text            __ct__16dBgS_MoveBgActorFv */
diff --git a/src/d/bg/d_bg_w.cpp b/src/d/bg/d_bg_w.cpp
index bbbf564206..67397be608 100644
--- a/src/d/bg/d_bg_w.cpp
+++ b/src/d/bg/d_bg_w.cpp
@@ -10,7 +10,6 @@
 #include "d/bg/d_bg_s_sph_chk.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "global.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
 
 //
diff --git a/src/d/bg/d_bg_w_kcol.cpp b/src/d/bg/d_bg_w_kcol.cpp
index 1069f9be73..dbc81c2612 100644
--- a/src/d/bg/d_bg_w_kcol.cpp
+++ b/src/d/bg/d_bg_w_kcol.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/bg/d_bg_w_kcol.h"
-#include "d/bg/d_bg_pc.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "rel/d/a/d_a_horse/d_a_horse.h"
diff --git a/src/d/cc/d_cc_d_nonmatching.cpp b/src/d/cc/d_cc_d_nonmatching.cpp
index 6237305fae..21001af1e9 100644
--- a/src/d/cc/d_cc_d_nonmatching.cpp
+++ b/src/d/cc/d_cc_d_nonmatching.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/cc/d_cc_d.h"
-#include "f_op/f_op_actor_mng.h"
 #include "f_pc/f_pc_searcher.h"
 
 //
diff --git a/src/d/cc/d_cc_s.cpp b/src/d/cc/d_cc_s.cpp
index 038378bcc3..6cfa2ee58e 100644
--- a/src/d/cc/d_cc_s.cpp
+++ b/src/d/cc/d_cc_s.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/cc/d_cc_s.h"
-#include "JSystem/JMath/JMath.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_jnt_col.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/cc/d_cc_uty.cpp
index 1b909460a9..226f5284af 100644
--- a/src/d/cc/d_cc_uty.cpp
+++ b/src/d/cc/d_cc_uty.cpp
@@ -7,7 +7,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "d/a/d_a_player.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_play.h"
 #include "f_op/f_op_actor_mng.h"
 
diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/com/d_com_inf_game.cpp
index c973b8743d..72ff497a29 100644
--- a/src/d/com/d_com_inf_game.cpp
+++ b/src/d/com/d_com_inf_game.cpp
@@ -8,16 +8,12 @@
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "d/a/d_a_alink.h"
 #include "d/d_item.h"
-#include "d/d_procname.h"
 #include "d/d_simple_model.h"
 #include "d/d_timer.h"
 #include "d/map/d_map_path_dmap.h"
 #include "d/menu/d_menu_fmap.h"
-#include "dol2asm.h"
-#include "dolphin/os.h"
 #include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 #include "stdio.h"
diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp
index 7c34ef645b..ac4b83e3ed 100644
--- a/src/d/d_att_dist.cpp
+++ b/src/d/d_att_dist.cpp
@@ -1,6 +1,5 @@
 #include "d/d_att_dist.h"
 #include "d/d_attention.h"
-#include "dolphin/types.h"
 
 /* ############################################################################################## */
 /* 803A9C70-803AB608 006D90 1998+00 0/0 5/5 13/13 .data            dist_table__12dAttention_c */
diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp
index c5b20338e4..17c5854511 100644
--- a/src/d/d_attention.cpp
+++ b/src/d/d_attention.cpp
@@ -4,13 +4,10 @@
 //
 
 #include "d/d_attention.h"
-#include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "dol2asm.h"
-#include "dolphin/os/OSCache.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 
diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp
index 34c4457194..1e21946d35 100644
--- a/src/d/d_bomb.cpp
+++ b/src/d/d_bomb.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/d_bomb.h"
-#include "d/d_procname.h"
 
 bool dBomb_c::checkStateCarry() {
     return (fopAcM_checkCarryNow(this) || fopAcM_checkHookCarryNow(this) ||
diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp
index 06ef8483c1..9cd0449608 100644
--- a/src/d/d_bright_check.cpp
+++ b/src/d/d_bright_check.cpp
@@ -6,10 +6,8 @@
 #define NO_INLINE_DLSTBASE_DRAW
 
 #include "d/d_bright_check.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "d/msg/d_msg_string.h"
 #include "m_Do/m_Do_controller_pad.h"
 
diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp
index 91924d8cf0..e36213a427 100644
--- a/src/d/d_camera.cpp
+++ b/src/d/d_camera.cpp
@@ -5,8 +5,6 @@
 
 #include "d/d_camera.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
-#include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_game.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp
index 26930fba20..fc8c3d228d 100644
--- a/src/d/d_demo.cpp
+++ b/src/d/d_demo.cpp
@@ -6,9 +6,6 @@
 #include "d/d_demo.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
-#include "f_op/f_op_actor_mng.h"
-#include "global.h"
 #include "m_Do/m_Do_graphic.h"
 #include "rel/d/a/d_a_movie_player/d_a_movie_player.h"
 
diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp
index 4d430fe228..686d5766c6 100644
--- a/src/d/d_drawlist.cpp
+++ b/src/d/d_drawlist.cpp
@@ -8,14 +8,10 @@
 #include "d/d_drawlist.h"
 #include "d/s/d_s_play.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "SSystem/SComponent/c_bg_s_shdw_draw.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/gx.h"
-#include "dolphin/mtx/mtx44.h"
-#include "dolphin/mtx.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp
index c75b9822d6..becd3cfbe4 100644
--- a/src/d/d_envse.cpp
+++ b/src/d/d_envse.cpp
@@ -6,7 +6,6 @@
 #include "d/d_envse.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_path.h"
-#include "d/d_procname.h"
 #include "dol2asm.h"
 #include "string.h"
 
diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp
index 19b64b53c9..a007e80de6 100644
--- a/src/d/d_error_msg.cpp
+++ b/src/d/d_error_msg.cpp
@@ -5,7 +5,6 @@
 
 #include "d/d_error_msg.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "dolphin/types.h"
 
 //
diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp
index d78b75f998..d2fc2ef5c2 100644
--- a/src/d/d_ev_camera.cpp
+++ b/src/d/d_ev_camera.cpp
@@ -4,10 +4,6 @@
 //
 
 #include "d/d_ev_camera.h"
-#include "d/a/d_a_alink.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/d_camera.h"
-#include "d/d_demo.h"
 #include "dol2asm.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "rel/d/a/d_a_midna/d_a_midna.h"
diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp
index bd958130b1..88d3fd9f20 100644
--- a/src/d/d_eye_hl.cpp
+++ b/src/d/d_eye_hl.cpp
@@ -6,8 +6,6 @@
 #include "d/d_eye_hl.h"
 #include "JSystem/J3DGraphBase/J3DTexture.h"
 #include "d/com/d_com_inf_game.h"
-#include "dol2asm.h"
-#include "dolphin/os.h"
 #include "d/s/d_s_play.h"
 
 /* 8009C964-8009CA28 0972A4 00C4+00 0/0 2/2 0/0 .text            entry__8dEyeHL_cFP12J3DModelDataPCc
diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp
index f708983b8d..7a257f03bf 100644
--- a/src/d/d_gameover.cpp
+++ b/src/d/d_gameover.cpp
@@ -10,9 +10,7 @@
 
 #include "d/d_gameover.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "dol2asm.h"
diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp
index 41df33357d..096ac4efd6 100644
--- a/src/d/d_insect.cpp
+++ b/src/d/d_insect.cpp
@@ -4,9 +4,7 @@
  */
 
 #include "d/d_insect.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/menu/d_menu_insect.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
 /* 8015E010-8015E078 158950 0068+00 0/0 0/0 13/13 .text            __ct__9dInsect_cFv */
diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp
index dc14333f4d..3889246534 100644
--- a/src/d/d_jnt_col.cpp
+++ b/src/d/d_jnt_col.cpp
@@ -6,7 +6,6 @@
 #include "d/d_jnt_col.h"
 #include "dol2asm.h"
 #include "f_op/f_op_actor_mng.h"
-#include "m_Do/m_Do_mtx.h"
 
 //
 // Types:
diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp
index be3ab90203..b4d2c6e0a5 100644
--- a/src/d/d_k_wmark.cpp
+++ b/src/d/d_k_wmark.cpp
@@ -5,11 +5,9 @@
 
 #include "d/d_k_wmark.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 
diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp
index 2d59f822fa..cdf496d147 100644
--- a/src/d/d_k_wpillar.cpp
+++ b/src/d/d_k_wpillar.cpp
@@ -4,10 +4,6 @@
 //
 
 #include "d/d_k_wpillar.h"
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "SSystem/SComponent/c_math.h"
-#include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp
index 027bac711c..aab32657fc 100644
--- a/src/d/d_kantera_icon_meter.cpp
+++ b/src/d/d_kantera_icon_meter.cpp
@@ -9,7 +9,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/pane/d_pane_class.h"
-#include "dolphin/types.h"
 
 /* 801AE938-801AE974 1A9278 003C+00 0/0 3/3 0/0 .text            __ct__15dKantera_icon_cFv */
 dKantera_icon_c::dKantera_icon_c() {
diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp
index 3c5f402980..58ca5a9544 100644
--- a/src/d/d_ky_thunder.cpp
+++ b/src/d/d_ky_thunder.cpp
@@ -5,12 +5,9 @@
 
 #include "d/d_ky_thunder.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "JSystem/JMath/JMath.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "SSystem/SComponent/c_math.h"
-#include "dolphin/os/OSCache.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/kankyo/d_kankyo_rain.h"
 #include "f_op/f_op_kankyo_mng.h"
 
diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp
index b040a15762..cbfdf261fd 100644
--- a/src/d/d_kyeff.cpp
+++ b/src/d/d_kyeff.cpp
@@ -5,7 +5,6 @@
 
 #include "d/d_kyeff.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/kankyo/d_kankyo_wether.h"
 
 static int dKyeff_Draw(dKyeff_c* i_this) {
diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp
index 9dbc5fc8f7..e25669846a 100644
--- a/src/d/d_kyeff2.cpp
+++ b/src/d/d_kyeff2.cpp
@@ -5,7 +5,6 @@
 
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_kyeff2.h"
-#include "d/d_procname.h"
 #include "d/kankyo/d_kankyo_wether.h"
 
 static int dKyeff2_Draw(dKyeff2_c* i_this) {
diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp
index 30ea35ac45..fa5e6a9384 100644
--- a/src/d/d_lib.cpp
+++ b/src/d/d_lib.cpp
@@ -6,11 +6,9 @@
 #include "d/d_lib.h"
 #include "d/event/d_event.h"
 #include "d/d_stage.h"
-#include "SSystem/SComponent/c_m3d.h"
 #include "JSystem/JKernel/JKRAramArchive.h"
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JKernel/JKRDecomp.h"
-#include "JSystem/JKernel/JKRDvdRipper.h"
 #include "dol2asm.h"
 #include "f_op/f_op_actor.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp
index ede13e819f..75a0a9d424 100644
--- a/src/d/d_model.cpp
+++ b/src/d/d_model.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 4c3717c882..e5d418a0d8 100644
--- a/src/d/d_name.cpp
+++ b/src/d/d_name.cpp
@@ -6,13 +6,10 @@
 #define NO_INLINE_DLSTBASE_DRAW
 
 #include "d/d_name.h"
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_lib.h"
 #include "dol2asm.h"
-#include "f_op/f_op_msg_mng.h"
-#include "global.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "stdio.h"
diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp
index 3699ae51d0..4b51fa6852 100644
--- a/src/d/d_npc_lib.cpp
+++ b/src/d/d_npc_lib.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/d_npc_lib.h"
-#include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"
 
 //
diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp
index 3e7f9500cc..a1b43e613e 100644
--- a/src/d/d_resorce.cpp
+++ b/src/d/d_resorce.cpp
@@ -5,16 +5,10 @@
 
 #include "d/d_resorce.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
-#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
-#include "JSystem/J3DGraphLoader/J3DClusterLoader.h"
-#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
-#include "d/bg/d_bg_w_kcol.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/mtx.h"
 #include "dolphin/os.h"
 #include "dolphin/types.h"
 #include "global.h"
diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp
index cc8b9a58aa..544e49f88b 100644
--- a/src/d/d_scope.cpp
+++ b/src/d/d_scope.cpp
@@ -11,7 +11,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
-#include "global.h"
 
 //
 // Forward References:
diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp
index 69732c0a06..25fbb9527b 100644
--- a/src/d/d_select_cursor.cpp
+++ b/src/d/d_select_cursor.cpp
@@ -7,7 +7,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "JSystem/J2DGraph/J2DAnimation.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "global.h"
 
 //
diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp
index a868f467a6..8e3f7e0449 100644
--- a/src/d/d_simple_model.cpp
+++ b/src/d/d_simple_model.cpp
@@ -5,7 +5,6 @@
 
 #include "d/d_simple_model.h"
 #include "d/com/d_com_inf_game.h"
-#include "m_Do/m_Do_mtx.h"
 
 //
 // External References:
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index aac0e2d7fc..b73269c4e2 100644
--- a/src/d/d_stage.cpp
+++ b/src/d/d_stage.cpp
@@ -11,12 +11,10 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
 #include "d/d_lib.h"
-#include "d/d_procname.h"
 #include "d/map/d_map_path_dmap.h"
 #include "d/map/d_map_path_fmap.h"
 #include "d/save/d_save_HIO.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "f_op/f_op_kankyo_mng.h"
 #include "f_op/f_op_msg_mng.h"
 #include "f_op/f_op_scene_mng.h"
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index e3aa040a55..e197c84368 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -12,13 +12,11 @@
 #include "JSystem/JUtility/JUTFont.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/d_lib.h"
-#include "d/d_procname.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter2_draw.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/pane/d_pane_class.h"
-#include "dol2asm.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_lib.h"
 
diff --git a/src/d/event/d_event.cpp b/src/d/event/d_event.cpp
index f6925b1e72..0e2d0cbac0 100644
--- a/src/d/event/d_event.cpp
+++ b/src/d/event/d_event.cpp
@@ -6,13 +6,10 @@
 #include "d/event/d_event.h"
 #include "d/a/d_a_alink.h"
 #include "d/d_demo.h"
-#include "d/d_procname.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
-#include "rel/d/a/d_a_midna/d_a_midna.h"
 #include "rel/d/a/tag/d_a_tag_mhint/d_a_tag_mhint.h"
 #include "rel/d/a/tag/d_a_tag_mstop/d_a_tag_mstop.h"
 
diff --git a/src/d/event/d_event_data.cpp b/src/d/event/d_event_data.cpp
index 126677193e..d23e1b4419 100644
--- a/src/d/event/d_event_data.cpp
+++ b/src/d/event/d_event_data.cpp
@@ -8,8 +8,6 @@
 #include "d/d_demo.h"
 #include "d/d_gameover.h"
 #include "d/msg/d_msg_object.h"
-#include "f_op/f_op_actor_mng.h"
-#include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_graphic.h"
 
 inline BOOL dEvDtFlagCheck(int flag) {
diff --git a/src/d/event/d_event_lib.cpp b/src/d/event/d_event_lib.cpp
index 1dec5bb349..2bfcb69488 100644
--- a/src/d/event/d_event_lib.cpp
+++ b/src/d/event/d_event_lib.cpp
@@ -5,7 +5,6 @@
 
 #include "d/event/d_event_lib.h"
 #include "d/com/d_com_inf_game.h"
-#include "f_op/f_op_actor_mng.h"
 
 /* 803A82B8-803A82C4 0053D8 000C+00 1/1 0/0 0/0 .data            cNullVec__6Z2Calc */
 static u8 cNullVec__6Z2Calc[12] = {
diff --git a/src/d/event/d_event_manager.cpp b/src/d/event/d_event_manager.cpp
index 817fb273e4..c30c193d08 100644
--- a/src/d/event/d_event_manager.cpp
+++ b/src/d/event/d_event_manager.cpp
@@ -7,8 +7,6 @@
 #include "SSystem/SComponent/c_math.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 "m_Do/m_Do_audio.h"
 #include "stdio.h"
 
 BOOL daPy_py_c::checkNowWolf() {
diff --git a/src/d/file/d_file_sel_warning.cpp b/src/d/file/d_file_sel_warning.cpp
index e4ba765344..047564a089 100644
--- a/src/d/file/d_file_sel_warning.cpp
+++ b/src/d/file/d_file_sel_warning.cpp
@@ -6,7 +6,6 @@
 #define DFILE_WARNING_C_DUMMY_VIRTUAL
 
 // #include "d/file/d_file_sel_warning.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
diff --git a/src/d/file/d_file_sel_warning_NONMATCHING.cpp b/src/d/file/d_file_sel_warning_NONMATCHING.cpp
index 1a3c006206..36b4b73902 100644
--- a/src/d/file/d_file_sel_warning_NONMATCHING.cpp
+++ b/src/d/file/d_file_sel_warning_NONMATCHING.cpp
@@ -7,10 +7,6 @@
 // Translation Unit: d/file/d_file_sel_warning
 //
 
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/file/d_file_sel_warning.h"
 #include "d/msg/d_msg_string.h"
 #include "d/pane/d_pane_class.h"
diff --git a/src/d/file/d_file_select.cpp b/src/d/file/d_file_select.cpp
index fa25cbb2d8..9b07814dc5 100644
--- a/src/d/file/d_file_select.cpp
+++ b/src/d/file/d_file_select.cpp
@@ -8,17 +8,10 @@
 
 #include "d/file/d_file_select.h"
 #include "d/file/d_file_sel_info.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/meter/d_meter2_info.h"
-#include "d/s/d_s_play.h"
-#include "d/d_lib.h"
 #include "f_op/f_op_msg_mng.h"
 #include "dol2asm.h"
-#include "dolphin/dvd.h"
 #include "dolphin/types.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/kankyo/d_kankyo.cpp
index 3813033424..34d40ba8a1 100644
--- a/src/d/kankyo/d_kankyo.cpp
+++ b/src/d/kankyo/d_kankyo.cpp
@@ -6,13 +6,8 @@
 #include "d/kankyo/d_kankyo.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_counter.h"
-#include "SSystem/SComponent/c_math.h"
-#include "d/a/d_a_player.h"
-#include "d/kankyo/d_kankyo_rain.h"
 #include "d/meter/d_meter2_info.h"
-#include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 #include "rel/d/a/kytag/d_a_kytag08/d_a_kytag08.h"
 #include "d/kankyo/d_kankyo_static.h"
diff --git a/src/d/kankyo/d_kankyo_data.cpp b/src/d/kankyo/d_kankyo_data.cpp
index 56eaab54e9..02be7a068a 100644
--- a/src/d/kankyo/d_kankyo_data.cpp
+++ b/src/d/kankyo/d_kankyo_data.cpp
@@ -5,7 +5,6 @@
 
 #include "d/kankyo/d_kankyo_data.h"
 #include "d/d_stage.h"
-#include "dolphin/types.h"
 
 //
 // Types:
diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/kankyo/d_kankyo_rain.cpp
index 245324c325..21a6a5a95d 100644
--- a/src/d/kankyo/d_kankyo_rain.cpp
+++ b/src/d/kankyo/d_kankyo_rain.cpp
@@ -4,13 +4,10 @@
 //
 
 #include "d/kankyo/d_kankyo_rain.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_counter.h"
-#include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_lib.h"
 #include "string.h"
 
diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/kankyo/d_kankyo_wether.cpp
index 39fea23638..42b64701f6 100644
--- a/src/d/kankyo/d_kankyo_wether.cpp
+++ b/src/d/kankyo/d_kankyo_wether.cpp
@@ -5,13 +5,11 @@
 
 #include "d/kankyo/d_kankyo_wether.h"
 #include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/kankyo/d_kankyo.h"
 #include "d/kankyo/d_kankyo_rain.h"
 #include "dol2asm.h"
-#include "global.h"
 #include "string.h"
 #include "m_Do/m_Do_audio.h"
 
diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp
index 21ff75dbfd..6ead3b85d8 100644
--- a/src/d/map/d_map_path_dmap.cpp
+++ b/src/d/map/d_map_path_dmap.cpp
@@ -9,7 +9,6 @@
 #include "d/map/d_map_path.h"
 #include "d/meter/d_meter_HIO.h"
 #include "dol2asm.h"
-#include "m_Do/m_Do_mtx.h"
 
 //
 // Forward References:
diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/menu/d_menu_collect.cpp
index 82d9c231a6..11d7f7fff1 100644
--- a/src/d/menu/d_menu_collect.cpp
+++ b/src/d/menu/d_menu_collect.cpp
@@ -4,17 +4,10 @@
  */
 
 #include "d/menu/d_menu_collect.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/J3DGraphBase/J3DMaterial.h"
-#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
-#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/a/d_a_alink.h"
-#include "d/com/d_com_inf_game.h"
-#include "d/d_item.h"
 #include "d/d_select_cursor.h"
 #include "d/menu/d_menu_fishing.h"
 #include "d/menu/d_menu_insect.h"
@@ -22,8 +15,6 @@
 #include "d/menu/d_menu_option.h"
 #include "d/menu/d_menu_save.h"
 #include "d/menu/d_menu_skill.h"
-#include "d/menu/d_menu_window.h"
-#include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/msg/d_msg_class.h"
 #include "d/msg/d_msg_object.h"
diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/menu/d_menu_dmap.cpp
index 2aaa4c92ea..5b635caf87 100644
--- a/src/d/menu/d_menu_dmap.cpp
+++ b/src/d/menu/d_menu_dmap.cpp
@@ -5,23 +5,10 @@
 
 #include "d/menu/d_menu_dmap.h"
 #include "d/menu/d_menu_item_explain.h"
-#include "d/msg/d_msg_string.h"
 #include "d/msg/d_msg_object.h"
-#include "d/msg/d_msg_class.h"
-#include "d/map/d_map_path_dmap.h"
-#include "d/meter/d_meter_haihai.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/meter/d_meter2_info.h"
-#include "d/a/d_a_player.h"
 #include "d/d_lib.h"
-#include "d/d_item.h"
-#include "d/d_tresure.h"
-#include "d/pane/d_pane_class.h"
-#include "d/save/d_save.h"
-#include "f_op/f_op_msg_mng.h"
-#include "m_Do/m_Do_controller_pad.h"
-#include "m_Do/m_Do_dvd_thread.h"
-#include "m_Do/m_Do_graphic.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
diff --git a/src/d/menu/d_menu_fishing.cpp b/src/d/menu/d_menu_fishing.cpp
index ff1a295fa0..9cb650b6f6 100644
--- a/src/d/menu/d_menu_fishing.cpp
+++ b/src/d/menu/d_menu_fishing.cpp
@@ -6,7 +6,6 @@
 #include "d/menu/d_menu_fishing.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/menu/d_menu_dmap.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/menu/d_menu_fmap.cpp
index 616423aea0..4f8758a573 100644
--- a/src/d/menu/d_menu_fmap.cpp
+++ b/src/d/menu/d_menu_fmap.cpp
@@ -9,7 +9,6 @@
 #include "string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSCache.h"
-#include "dolphin/types.h"
 
 struct ResTIMG;
 
diff --git a/src/d/menu/d_menu_item_explain.cpp b/src/d/menu/d_menu_item_explain.cpp
index cd64009059..0bc71f0b67 100644
--- a/src/d/menu/d_menu_item_explain.cpp
+++ b/src/d/menu/d_menu_item_explain.cpp
@@ -5,10 +5,7 @@
 
 #include "d/menu/d_menu_item_explain.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JGeometry.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRMemArchive.h"
-#include "JSystem/JUtility/JUTPalette.h"
 #include "JSystem/JUtility/JUTTexture.h"
 #include "stdio.h"
 #include "d/a/d_a_player.h"
@@ -19,9 +16,7 @@
 #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_class.h"
 #include "d/msg/d_msg_string.h"
-#include "dol2asm.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
 #include "d/msg/d_msg_scrn_3select.h"
diff --git a/src/d/menu/d_menu_letter.cpp b/src/d/menu/d_menu_letter.cpp
index 94daabbdad..eafd70ee9f 100644
--- a/src/d/menu/d_menu_letter.cpp
+++ b/src/d/menu/d_menu_letter.cpp
@@ -5,17 +5,12 @@
 
 #include "d/menu/d_menu_letter.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "math.h"
 #include "stdio.h"
-#include "string.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_lib.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_class.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
 #include "dolphin/types.h"
diff --git a/src/d/menu/d_menu_map_common.cpp b/src/d/menu/d_menu_map_common.cpp
index ed6eafaf2c..8b57a1dee7 100644
--- a/src/d/menu/d_menu_map_common.cpp
+++ b/src/d/menu/d_menu_map_common.cpp
@@ -7,7 +7,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/d_select_cursor.h"
 #include "d/meter/d_meter_HIO.h"
-#include "dol2asm.h"
 #include "global.h"
 
 /* ############################################################################################## */
diff --git a/src/d/menu/d_menu_option.cpp b/src/d/menu/d_menu_option.cpp
index d97e751e7e..e98cc93ac1 100644
--- a/src/d/menu/d_menu_option.cpp
+++ b/src/d/menu/d_menu_option.cpp
@@ -4,22 +4,16 @@
 //
 
 #include "d/menu/d_menu_option.h"
-#include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
-#include "JSystem/JUtility/JUTGamePad.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_warning.h"
 #include "d/menu/d_menu_calibration.h"
 #include "d/menu/d_menu_window.h"
-#include "d/meter/d_meter2.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/meter/d_meter_HIO.h"
 #include "d/meter/d_meter_haihai.h"
-#include "d/msg/d_msg_class.h"
 #include "d/msg/d_msg_string.h"
 #include "dol2asm.h"
 #include "dolphin/os/OSRtc.h"
diff --git a/src/d/menu/d_menu_ring.cpp b/src/d/menu/d_menu_ring.cpp
index 596b70c4c7..90b2cb60a8 100644
--- a/src/d/menu/d_menu_ring.cpp
+++ b/src/d/menu/d_menu_ring.cpp
@@ -5,7 +5,6 @@
 
 #include "d/menu/d_menu_ring.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "SSystem/SComponent/c_math.h"
@@ -18,10 +17,8 @@
 #include "d/menu/d_menu_window.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter2_draw.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"
 #include "m_Do/m_Do_graphic.h"
 #include "string.h"
diff --git a/src/d/menu/d_menu_window.cpp b/src/d/menu/d_menu_window.cpp
index e32ce29cd4..4422eb080c 100644
--- a/src/d/menu/d_menu_window.cpp
+++ b/src/d/menu/d_menu_window.cpp
@@ -23,9 +23,7 @@
 #include "d/meter/d_meter_map.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "f_op/f_op_msg_mng.h"
-#include "global.h"
 #include "m_Do/m_Do_controller_pad.h"
 
 //
diff --git a/src/d/meter/d_meter2.cpp b/src/d/meter/d_meter2.cpp
index 54a4adba8a..f22fce198d 100644
--- a/src/d/meter/d_meter2.cpp
+++ b/src/d/meter/d_meter2.cpp
@@ -6,7 +6,6 @@
 #include "d/meter/d_meter2.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "d/d_demo.h"
-#include "d/d_procname.h"
 #include "d/d_scope.h"
 #include "d/d_timer.h"
 #include "d/menu/d_menu_window_HIO.h"
diff --git a/src/d/meter/d_meter2_info.cpp b/src/d/meter/d_meter2_info.cpp
index 005e52cad4..2642c8e8e3 100644
--- a/src/d/meter/d_meter2_info.cpp
+++ b/src/d/meter/d_meter2_info.cpp
@@ -6,11 +6,9 @@
 #include "d/meter/d_meter2_info.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/a/d_a_npc.h"
-#include "d/d_item_data.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter_map.h"
 #include "dol2asm.h"
-#include "dolphin/os/OSCache.h"
 #include "dolphin/types.h"
 #include "global.h"
 
diff --git a/src/d/meter/d_meter_HIO.cpp b/src/d/meter/d_meter_HIO.cpp
index eefee54015..31a0a4190e 100644
--- a/src/d/meter/d_meter_HIO.cpp
+++ b/src/d/meter/d_meter_HIO.cpp
@@ -8,7 +8,6 @@
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "m_Do/m_Do_ext.h"
-#include "global.h"
 
 /* 801FE330-801FE348 1F8C70 0018+00 1/1 0/0 0/0 .text            __ct__16dMeter_menuHIO_cFv */
 dMeter_menuHIO_c::dMeter_menuHIO_c() {
diff --git a/src/d/meter/d_meter_button.cpp b/src/d/meter/d_meter_button.cpp
index c49e270507..cd568bf9ea 100644
--- a/src/d/meter/d_meter_button.cpp
+++ b/src/d/meter/d_meter_button.cpp
@@ -5,9 +5,7 @@
 
 #include "d/meter/d_meter_button.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/a/d_a_player.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter2_draw.h"
 #include "d/meter/d_meter2_info.h"
diff --git a/src/d/meter/d_meter_haihai.cpp b/src/d/meter/d_meter_haihai.cpp
index 8a1fdbf320..1910c75164 100644
--- a/src/d/meter/d_meter_haihai.cpp
+++ b/src/d/meter/d_meter_haihai.cpp
@@ -5,8 +5,6 @@
 
 #include "d/meter/d_meter_haihai.h"
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
-#include "JSystem/J2DGraph/J2DGrafContext.h"
-#include "JSystem/J2DGraph/J2DPane.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter_HIO.h"
diff --git a/src/d/meter/d_meter_string.cpp b/src/d/meter/d_meter_string.cpp
index 157f2ea81d..ec49a92788 100644
--- a/src/d/meter/d_meter_string.cpp
+++ b/src/d/meter/d_meter_string.cpp
@@ -9,7 +9,6 @@
 #include "JSystem/J2DGraph/J2DScreen.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JUtility/JUTFont.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/d_timer.h"
 #include "d/meter/d_meter2_draw.h"
 #include "d/meter/d_meter2_info.h"
diff --git a/src/d/msg/d_msg_class.cpp b/src/d/msg/d_msg_class.cpp
index 88bc23a9ec..0c1d9b2556 100644
--- a/src/d/msg/d_msg_class.cpp
+++ b/src/d/msg/d_msg_class.cpp
@@ -9,9 +9,7 @@
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_unit.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JUtility/JUTFont.h"
 #include "d/msg/d_msg_out_font.h"
 #include "m_Do/m_Do_graphic.h"
 
diff --git a/src/d/msg/d_msg_flow.cpp b/src/d/msg/d_msg_flow.cpp
index b54f56870a..d8e063c345 100644
--- a/src/d/msg/d_msg_flow.cpp
+++ b/src/d/msg/d_msg_flow.cpp
@@ -10,9 +10,7 @@
 #include "d/msg/d_msg_object.h"
 #include "d/shop/d_shop_system.h"
 #include "dol2asm.h"
-#include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_msg_mng.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 #include "rel/d/a/d_a_midna/d_a_midna.h"
 
diff --git a/src/d/msg/d_msg_object.cpp b/src/d/msg/d_msg_object.cpp
index 18a973ba3f..90a5ae291a 100644
--- a/src/d/msg/d_msg_object.cpp
+++ b/src/d/msg/d_msg_object.cpp
@@ -8,7 +8,6 @@
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_class.h"
 #include "dol2asm.h"
-#include "dolphin/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 18f7b472dc..f396e26446 100644
--- a/src/d/msg/d_msg_out_font.cpp
+++ b/src/d/msg/d_msg_out_font.cpp
@@ -1,7 +1,6 @@
 #include "d/msg/d_msg_out_font.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "JSystem/JUtility/JUTTexture.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "f_op/f_op_msg_mng.h"
diff --git a/src/d/msg/d_msg_scrn_howl.cpp b/src/d/msg/d_msg_scrn_howl.cpp
index 6d33065805..48ea72b0d9 100644
--- a/src/d/msg/d_msg_scrn_howl.cpp
+++ b/src/d/msg/d_msg_scrn_howl.cpp
@@ -5,16 +5,9 @@
 
 #include "d/msg/d_msg_scrn_howl.h"
 #include "m_Do/m_Do_controller_pad.h"
-#include "m_Do/m_Do_graphic.h"
-#include "d/msg/d_msg_class.h"
 #include "d/msg/d_msg_object.h"
-#include "d/meter/d_meter2_info.h"
-#include "d/meter/d_meter2_draw.h"
-#include "d/pane/d_pane_class_alpha.h"
 #include "d/pane/d_pane_class.h"
 #include "d/a/d_a_alink.h"
-#include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JUtility/JUTTexture.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
diff --git a/src/d/msg/d_msg_scrn_kanban.cpp b/src/d/msg/d_msg_scrn_kanban.cpp
index 123479d29b..1e216c7f6e 100644
--- a/src/d/msg/d_msg_scrn_kanban.cpp
+++ b/src/d/msg/d_msg_scrn_kanban.cpp
@@ -6,11 +6,7 @@
 #include "JSystem/J2DGraph/J2DAnmLoader.h"
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include "JSystem/J2DGraph/J2DScreen.h"
-#include "JSystem/J2DGraph/J2DTextBox.h"
-#include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRFileLoader.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/msg/d_msg_object.h"
 #include "d/msg/d_msg_out_font.h"
 #include "d/pane/d_pane_class.h"
diff --git a/src/d/msg/d_msg_string.cpp b/src/d/msg/d_msg_string.cpp
index 6e0980e45e..217f692e81 100644
--- a/src/d/msg/d_msg_string.cpp
+++ b/src/d/msg/d_msg_string.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/J2DGraph/J2DTextBox.h"
 #include "d/msg/d_msg_out_font.h"
 #include "dol2asm.h"
-#include "JSystem/JGeometry.h"
 
 //
 // Forward References:
diff --git a/src/d/msg/d_msg_string_base.cpp b/src/d/msg/d_msg_string_base.cpp
index 64e960db8e..7c43b8d2a1 100644
--- a/src/d/msg/d_msg_string_base.cpp
+++ b/src/d/msg/d_msg_string_base.cpp
@@ -8,8 +8,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
-#include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JKernel/JKRArchive.h"
 #include "JSystem/J2DGraph/J2DTextBox.h"
 
diff --git a/src/d/msg/d_msg_unit.cpp b/src/d/msg/d_msg_unit.cpp
index 1832949b2b..e1da2ad3a3 100644
--- a/src/d/msg/d_msg_unit.cpp
+++ b/src/d/msg/d_msg_unit.cpp
@@ -5,7 +5,6 @@
 
 #include "d/msg/d_msg_unit.h"
 #include "stdio.h"
-#include "string.h"
 #include "dol2asm.h"
 #include "d/kankyo/d_kankyo.h"
 #include "d/meter/d_meter2_info.h"
diff --git a/src/d/ovlp/d_ovlp_fade.cpp b/src/d/ovlp/d_ovlp_fade.cpp
index c9f49dbe9e..87261c89c1 100644
--- a/src/d/ovlp/d_ovlp_fade.cpp
+++ b/src/d/ovlp/d_ovlp_fade.cpp
@@ -4,9 +4,7 @@
  */
 
 #include "d/ovlp/d_ovlp_fade.h"
-#include "JSystem/JFramework/JFWDisplay.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "f_op/f_op_overlap_mng.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/ovlp/d_ovlp_fade2.cpp
index 8fb6bb31fc..016d28a684 100644
--- a/src/d/ovlp/d_ovlp_fade2.cpp
+++ b/src/d/ovlp/d_ovlp_fade2.cpp
@@ -5,8 +5,6 @@
 
 #include "d/ovlp/d_ovlp_fade2.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_play.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/ovlp/d_ovlp_fade3.cpp
index 126710600d..f6cb4dcd1b 100644
--- a/src/d/ovlp/d_ovlp_fade3.cpp
+++ b/src/d/ovlp/d_ovlp_fade3.cpp
@@ -5,8 +5,6 @@
 
 #include "d/ovlp/d_ovlp_fade3.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_play.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/pane/d_pane_class_ex.cpp b/src/d/pane/d_pane_class_ex.cpp
index 5de784ea6a..7a072d86f7 100644
--- a/src/d/pane/d_pane_class_ex.cpp
+++ b/src/d/pane/d_pane_class_ex.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/pane/d_pane_class_ex.h"
-#include "dolphin/types.h"
 
 //
 // Types:
diff --git a/src/d/particle/d_particle.cpp b/src/d/particle/d_particle.cpp
index cf7b27660a..a26ca1d9e3 100644
--- a/src/d/particle/d_particle.cpp
+++ b/src/d/particle/d_particle.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/particle/d_particle.h"
-#include "d/particle/d_particle_name.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -14,7 +13,6 @@
 #include "stdio.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_lib.h"
 #include "m_Do/m_Do_graphic.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/particle/d_particle_copoly.cpp b/src/d/particle/d_particle_copoly.cpp
index eddfc0bc74..f1120aa1eb 100644
--- a/src/d/particle/d_particle_copoly.cpp
+++ b/src/d/particle/d_particle_copoly.cpp
@@ -4,8 +4,6 @@
  */
 
 #include "d/particle/d_particle_copoly.h"
-#include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_kankyo_mng.h"
 
 /* 80050C9C-80050CC4 04B5DC 0028+00 0/0 2/2 27/27 .text            init__7dPaPo_cFP9dBgS_Acchff */
diff --git a/src/d/s/d_s_logo.cpp b/src/d/s/d_s_logo.cpp
index f28377dc7e..656924ad98 100644
--- a/src/d/s/d_s_logo.cpp
+++ b/src/d/s/d_s_logo.cpp
@@ -9,9 +9,7 @@
 #include "c/c_dylink.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_item.h"
-#include "d/d_procname.h"
 #include "d/map/d_map_path_dmap.h"
-#include "dolphin/vi.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_graphic.h"
diff --git a/src/d/s/d_s_menu.cpp b/src/d/s/d_s_menu.cpp
index 2c6814c12b..09df496b84 100644
--- a/src/d/s/d_s_menu.cpp
+++ b/src/d/s/d_s_menu.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/s/d_s_menu.h"
-#include "d/d_procname.h"
 #include "f_pc/f_pc_leaf.h"
 #include "f_op/f_op_scene.h"
 
diff --git a/src/d/s/d_s_name.cpp b/src/d/s/d_s_name.cpp
index 593df2df6b..3314fd1431 100644
--- a/src/d/s/d_s_name.cpp
+++ b/src/d/s/d_s_name.cpp
@@ -6,11 +6,9 @@
 #include "d/s/d_s_name.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/meter/d_meter2_info.h"
 #include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 #include "m_Do/m_Do_machine.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/s/d_s_play.cpp b/src/d/s/d_s_play.cpp
index 6df4938eb7..31946773bb 100644
--- a/src/d/s/d_s_play.cpp
+++ b/src/d/s/d_s_play.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/s/d_s_play.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "SSystem/SComponent/c_counter.h"
@@ -14,7 +13,6 @@
 #include "d/d_eye_hl.h"
 #include "d/d_item.h"
 #include "d/d_model.h"
-#include "d/d_procname.h"
 #include "d/map/d_map_path_dmap.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
@@ -22,9 +20,7 @@
 #include "f_op/f_op_draw_iter.h"
 #include "f_op/f_op_msg_mng.h"
 #include "f_op/f_op_overlap_mng.h"
-#include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_Reset.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_graphic.h"
 #include "rel/d/a/d_a_suspend/d_a_suspend.h"
 #include "rel/d/a/d_a_ykgr/d_a_ykgr.h"
diff --git a/src/d/s/d_s_room.cpp b/src/d/s/d_s_room.cpp
index 26690e907c..908c9fcf73 100644
--- a/src/d/s/d_s_room.cpp
+++ b/src/d/s/d_s_room.cpp
@@ -6,9 +6,7 @@
 #include "d/s/d_s_room.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_play.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_Reset.h"
 #include "stdio.h"
 
diff --git a/src/d/s/d_s_title.cpp b/src/d/s/d_s_title.cpp
index 995a2a7e67..1ab8fec3b5 100644
--- a/src/d/s/d_s_title.cpp
+++ b/src/d/s/d_s_title.cpp
@@ -6,7 +6,6 @@
 #include "d/s/d_s_title.h"
 #include "f_op/f_op_scene.h"
 #include "f_pc/f_pc_leaf.h"
-#include "d/d_procname.h"
 
 /* 803C32B0-803C32D8 -00001 0028+00 0/0 0/0 1/0 .data            g_profile_WARNING_SCENE */
 extern scene_process_profile_definition g_profile_WARNING_SCENE = {
diff --git a/src/d/save/d_save.cpp b/src/d/save/d_save.cpp
index a9dda1889b..82f084c8ca 100644
--- a/src/d/save/d_save.cpp
+++ b/src/d/save/d_save.cpp
@@ -7,10 +7,8 @@
 #include "d/save/d_save_init.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "stdio.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/meter/d_meter2_info.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "rel/d/a/obj/d_a_obj_carry/d_a_obj_carry.h"
 
 //
diff --git a/src/d/shop/d_shop_camera.cpp b/src/d/shop/d_shop_camera.cpp
index f8da5eb561..5c4f5d0c2a 100644
--- a/src/d/shop/d_shop_camera.cpp
+++ b/src/d/shop/d_shop_camera.cpp
@@ -7,7 +7,6 @@
 #include "SSystem/SComponent/c_math.h"
 #include "d/a/d_a_player.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_camera.h"
 
 struct SeiraCam {
     /* 0x00 */ Vec field_0x0;
diff --git a/src/d/shop/d_shop_item_ctrl.cpp b/src/d/shop/d_shop_item_ctrl.cpp
index 04d3e72a54..e1f902982c 100644
--- a/src/d/shop/d_shop_item_ctrl.cpp
+++ b/src/d/shop/d_shop_item_ctrl.cpp
@@ -5,7 +5,6 @@
 #include "d/shop/d_shop_item_ctrl.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "d/a/d_a_shop_item_static.h"
-#include "f_op/f_op_actor_mng.h"
 
 /* 80196914-80196958 191254 0044+00 0/0 0/0 10/10 .text            __ct__15dShopItemCtrl_cFv */
 dShopItemCtrl_c::dShopItemCtrl_c() {
diff --git a/src/d/shop/d_shop_system.cpp b/src/d/shop/d_shop_system.cpp
index 01b4c5b8c4..843a5aa643 100644
--- a/src/d/shop/d_shop_system.cpp
+++ b/src/d/shop/d_shop_system.cpp
@@ -8,12 +8,10 @@
 #include "d/a/d_a_shop_item_static.h"
 #include "d/d_item.h"
 #include "d/d_lib.h"
-#include "d/d_procname.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_object.h"
-#include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_lib.h"
 #include "rel/d/a/tag/d_a_tag_shop_item/d_a_tag_shop_item.h"
diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp
index 61a8765f57..a17640c7f2 100644
--- a/src/f_op/f_op_actor.cpp
+++ b/src/f_op/f_op_actor.cpp
@@ -6,7 +6,6 @@
 #include "f_op/f_op_actor.h"
 #include "d/a/d_a_alink.h"
 #include "d/com/d_com_inf_actor.h"
-#include "d/com/d_com_inf_game.h"
 #include "d/com/d_com_static.h"
 #include "d/d_demo.h"
 #include "d/s/d_s_play.h"
diff --git a/src/f_op/f_op_camera.cpp b/src/f_op/f_op_camera.cpp
index 15533b145f..fbfbac7052 100644
--- a/src/f_op/f_op_camera.cpp
+++ b/src/f_op/f_op_camera.cpp
@@ -7,7 +7,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "d/s/d_s_play.h"
 #include "f_op/f_op_draw_tag.h"
-#include "f_pc/f_pc_manager.h"
 
 // TODO: this is a hack to get f_op_actor_mng.cpp weak function order correct
 // at the moment, if these are made into inlined virtuals, they incorrectly generate before thunks
diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp
index 82257f118d..7c80ae7532 100644
--- a/src/f_op/f_op_kankyo.cpp
+++ b/src/f_op/f_op_kankyo.cpp
@@ -5,7 +5,6 @@
 
 #include "f_op/f_op_kankyo.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 #include "d/s/d_s_play.h"
 #include "f_op/f_op_draw_tag.h"
 #include "f_op/f_op_kankyo_mng.h"
diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp
index 5b0f6632f0..91b556e3c0 100644
--- a/src/f_op/f_op_kankyo_mng.cpp
+++ b/src/f_op/f_op_kankyo_mng.cpp
@@ -6,7 +6,6 @@
 #include "f_op/f_op_kankyo_mng.h"
 #include "SSystem/SComponent/c_malloc.h"
 #include "d/com/d_com_inf_game.h"
-#include "d/d_procname.h"
 
 /* 8001F660-8001F6B8 019FA0 0058+00 2/2 0/0 0/0 .text            fopKyM_CreateAppend__Fv */
 static fopKyM_prm_class* fopKyM_CreateAppend() {
diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp
index 7f5f19b2a8..075decfe85 100644
--- a/src/f_op/f_op_msg_mng.cpp
+++ b/src/f_op/f_op_msg_mng.cpp
@@ -6,12 +6,10 @@
 #include "f_op/f_op_msg_mng.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "SSystem/SComponent/c_malloc.h"
-#include "SSystem/SComponent/c_math.h"
 #include "d/meter/d_meter2.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_object.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_scene_mng.h"
 #include "global.h"
 
diff --git a/src/f_op/f_op_overlap_req.cpp b/src/f_op/f_op_overlap_req.cpp
index ef02ca0ac5..01f8f11adc 100644
--- a/src/f_op/f_op_overlap_req.cpp
+++ b/src/f_op/f_op_overlap_req.cpp
@@ -6,7 +6,6 @@
 #include "SSystem/SComponent/c_request.h"
 #include "f_op/f_op_overlap_req.h"
 #include "f_pc/f_pc_manager.h"
-#include "f_pc/f_pc_stdcreate_req.h"
 
 void fopOvlpReq_SetPeektime(overlap_request_class*, u16);
 
diff --git a/src/f_op/f_op_scene_mng.cpp b/src/f_op/f_op_scene_mng.cpp
index 8a7e1cc2a5..feec035ae8 100644
--- a/src/f_op/f_op_scene_mng.cpp
+++ b/src/f_op/f_op_scene_mng.cpp
@@ -6,7 +6,6 @@
 #include "f_op/f_op_scene_mng.h"
 #include "f_op/f_op_scene_iter.h"
 #include "f_op/f_op_scene_req.h"
-#include "f_pc/f_pc_searcher.h"
 
 /* 8001ECB0-8001ECE0 0195F0 0030+00 0/0 7/7 1/1 .text            fopScnM_SearchByID__FUi */
 scene_class* fopScnM_SearchByID(unsigned int id) {
diff --git a/src/f_pc/f_pc_create_req.cpp b/src/f_pc/f_pc_create_req.cpp
index 307a3dfa36..6c279eac46 100644
--- a/src/f_pc/f_pc_create_req.cpp
+++ b/src/f_pc/f_pc_create_req.cpp
@@ -10,7 +10,6 @@
 #include "f_pc/f_pc_deletor.h"
 #include "f_pc/f_pc_executor.h"
 #include "f_pc/f_pc_layer.h"
-#include "f_pc/f_pc_layer_iter.h"
 
 /* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0  None .text      fpcCtRq_isCreatingByID__FP10create_tagPUi
  */
diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp
index 19d434729d..4fa2081405 100644
--- a/src/f_pc/f_pc_manager.cpp
+++ b/src/f_pc/f_pc_manager.cpp
@@ -12,9 +12,6 @@
 #include "f_pc/f_pc_draw.h"
 #include "f_pc/f_pc_fstcreate_req.h"
 #include "f_pc/f_pc_line.h"
-#include "f_pc/f_pc_line_tag.h"
-#include "f_pc/f_pc_method.h"
-#include "f_pc/f_pc_node_req.h"
 #include "f_pc/f_pc_pause.h"
 #include "f_pc/f_pc_priority.h"
 #include "f_pc/f_pc_profile.h"
diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp
index 6781915a11..1e260db654 100644
--- a/src/f_pc/f_pc_node_req.cpp
+++ b/src/f_pc/f_pc_node_req.cpp
@@ -8,7 +8,6 @@
 #include "SSystem/SStandard/s_basic.h"
 #include "f_pc/f_pc_deletor.h"
 #include "f_pc/f_pc_executor.h"
-#include "f_pc/f_pc_layer.h"
 #include "f_pc/f_pc_node.h"
 #include "f_pc/f_pc_stdcreate_req.h"
 
diff --git a/src/init.c b/src/init.c
index dd6927340c..39c912ee21 100644
--- a/src/init.c
+++ b/src/init.c
@@ -6,7 +6,6 @@
 #include "init.h"
 #include "string.h"
 #include "dol2asm.h"
-#include "dolphin/types.h"
 
 //
 // Forward References:
diff --git a/src/m_Do/m_Do_DVDError.cpp b/src/m_Do/m_Do_DVDError.cpp
index 7498e258c8..1223df3e54 100644
--- a/src/m_Do/m_Do_DVDError.cpp
+++ b/src/m_Do/m_Do_DVDError.cpp
@@ -5,10 +5,6 @@
 
 #include "m_Do/m_Do_DVDError.h"
 #include "JSystem/JKernel/JKRAssertHeap.h"
-#include "JSystem/JKernel/JKRThread.h"
-#include "dol2asm.h"
-#include "dolphin/dvd.h"
-#include "dolphin/os/OSAlarm.h"
 #include "dolphin/os/OSInterrupt.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index c3883e2485..8095f5aadd 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -5,9 +5,6 @@
 
 #include "m_Do/m_Do_MemCard.h"
 #include "JSystem/JKernel/JKRAssertHeap.h"
-#include "JSystem/JKernel/JKRThread.h"
-#include "string.h"
-#include "dol2asm.h"
 #include "dolphin/card.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_MemCardRWmng.h"
diff --git a/src/m_Do/m_Do_Reset.cpp b/src/m_Do/m_Do_Reset.cpp
index c49dc095a3..94dd707f62 100644
--- a/src/m_Do/m_Do_Reset.cpp
+++ b/src/m_Do/m_Do_Reset.cpp
@@ -5,12 +5,10 @@
 
 #include "m_Do/m_Do_Reset.h"
 #include "JSystem/JAudio2/JASDvdThread.h"
-#include "JSystem/JAudio2/JASTaskThread.h"
 #include "JSystem/JUtility/JUTGamePad.h"
 #include "JSystem/JUtility/JUTXfb.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
 #include "dolphin/gx.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_audio.h"
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
diff --git a/src/m_Do/m_Do_audio.cpp b/src/m_Do/m_Do_audio.cpp
index 66a062df49..56db6a49b6 100644
--- a/src/m_Do/m_Do_audio.cpp
+++ b/src/m_Do/m_Do_audio.cpp
@@ -7,7 +7,6 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_dvd_thread.h"
 
diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp
index 4a070c866e..7b02bf929b 100644
--- a/src/m_Do/m_Do_dvd_thread.cpp
+++ b/src/m_Do/m_Do_dvd_thread.cpp
@@ -5,14 +5,11 @@
 
 #include "m_Do/m_Do_dvd_thread.h"
 #include "JSystem/JAudio2/JASDvdThread.h"
-#include "JSystem/JAudio2/JASTaskThread.h"
 #include "JSystem/JKernel/JKRAssertHeap.h"
 #include "JSystem/JKernel/JKRDvdRipper.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
 #include "JSystem/JKernel/JKRMemArchive.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
-#include "dolphin/types.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_ext.h"
 
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 4f07159bbb..3576c4c76f 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -19,9 +19,6 @@
 #include "d/com/d_com_inf_game.h"
 #include "dol2asm.h"
 #include "dolphin/gx/GXDraw.h"
-#include "dolphin/mtx.h"
-#include "dolphin/os.h"
-#include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_mtx.h"
 
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 8c31ea2309..7cbf5eec8a 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -14,12 +14,9 @@
 #include "d/menu/d_menu_collect.h"
 #include "dol2asm.h"
 #include "f_ap/f_ap_game.h"
-#include "f_op/f_op_actor_mng.h"
-#include "global.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_machine.h"
 #include "m_Do/m_Do_main.h"
-#include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_math.h"
 #include "JSystem/J2DGraph/J2DOrthoGraph.h"
 #include "JSystem/JParticle/JPADrawInfo.h"
diff --git a/src/m_Do/m_Do_lib.cpp b/src/m_Do/m_Do_lib.cpp
index e6fa30cbf8..44b606fd4b 100644
--- a/src/m_Do/m_Do_lib.cpp
+++ b/src/m_Do/m_Do_lib.cpp
@@ -1,132 +1,131 @@
-/**

- * m_Do_lib.cpp

- * View and Projection Matrix Helper Functions

- */

-

-#include "m_Do/m_Do_lib.h"

-#include "JSystem/J3DGraphBase/J3DMatBlock.h"

-#include "JSystem/JUtility/JUTTexture.h"

-#include "SSystem/SComponent/c_math.h"

-#include "d/com/d_com_inf_game.h"

-#include "dolphin/types.h"

-

-/* 8001513C-8001528C 00FA7C 0150+00 0/0 3/3 2/2 .text

- * mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj  */

-u8 mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 tlut_name,

-                        _GXTlutObj* o_tlutObj) {

-    ResTIMG* _res = (ResTIMG*)res;

-

-    if (_res->indexTexture) {

-        GXInitTlutObj(o_tlutObj, (void*)((u8*)_res + _res->paletteOffset),

-                      (GXTlutFmt)_res->colorFormat, _res->numColors);

-        GXInitTexObjCI(o_texObj, (void*)((u8*)_res + _res->imageOffset), _res->width, _res->height,

-                       (GXCITexFmt)_res->format, (GXTexWrapMode)_res->wrapS,

-                       (GXTexWrapMode)_res->wrapT, _res->mipmapCount > 1, tlut_name);

-    } else {

-        GXInitTexObj(o_texObj, (void*)((u8*)_res + _res->imageOffset), _res->width, _res->height,

-                     (GXTexFmt)_res->format, (GXTexWrapMode)_res->wrapS, (GXTexWrapMode)_res->wrapT,

-                     _res->mipmapCount > 1);

-    }

-    GXInitTexObjLOD(o_texObj, (GXTexFilter)_res->minFilter, (GXTexFilter)_res->magFilter,

-                    (f32)_res->minLOD * 0.125f, (f32)_res->maxLOD * 0.125f,

-                    (f32)_res->LODBias * 0.01f, (s32)_res->biasClamp, (s32)_res->doEdgeLOD,

-                    (GXAnisotropy)_res->maxAnisotropy);

-

-    return _res->indexTexture;

-}

-

-/* 803DD8E4-803DD940 00A604 005C+00 2/2 5/5 5/5 .bss             mClipper__14mDoLib_clipper */

-J3DUClipper mDoLib_clipper::mClipper;

-

-/* 80450C70-80450C74 000170 0004+00 1/1 2/2 4/4 .sbss            mSystemFar__14mDoLib_clipper */

-f32 mDoLib_clipper::mSystemFar;

-

-/* 80450C74-80450C78 000174 0004+00 1/1 1/1 0/0 .sbss            mFovyRate__14mDoLib_clipper */

-f32 mDoLib_clipper::mFovyRate;

-

-/* 8001528C-80015310 00FBCC 0084+00 0/0 1/1 0/0 .text            setup__14mDoLib_clipperFffff */

-void mDoLib_clipper::setup(f32 fovy, f32 aspect, f32 near, f32 far) {

-    mClipper.setFovy(fovy);

-    mClipper.setAspect(aspect);

-    mClipper.setNear(near);

-    mClipper.setFar(far);

-    mSystemFar = far;

-    mClipper.calcViewFrustum();

-

-    s16 tmp = fovy * 182.04444885253906f;

-

-    mFovyRate = cM_scos(tmp) / cM_ssin(tmp);

-}

-

-/* 80015310-800154EC 00FC50 01DC+00 0/0 21/21 23/23 .text            mDoLib_project__FP3VecP3Vec */

-void mDoLib_project(Vec* src, Vec* dst) {

-    if (dComIfGd_getView() == NULL) {

-        dst->x = 0.0f;

-        dst->y = 0.0f;

-        dst->z = 0.0f;

-        return;

-    }

-    Mtx44* projMtx = dComIfGd_getProjViewMtx();

-    Vec multVec;

-    cMtx_multVec(*projMtx, src, &multVec);

-

-    float calcFloat = (src->x * (*dComIfGd_getProjViewMtx())[3][0]) +

-                      (src->y * (*dComIfGd_getProjViewMtx())[3][1]) +

-                      (src->z * (*dComIfGd_getProjViewMtx())[3][2]) +

-                      (*dComIfGd_getProjViewMtx())[3][3];

-    if (multVec.z >= 0.0f) {

-        multVec.z = 0.0f;

-    }

-    float f3;

-    if (calcFloat <= 0.0f) {

-        if (calcFloat == 0.0f) {

-            dst->z = multVec.z * 500000.0f;

-        } else {

-            dst->z = multVec.z * (0.5f / calcFloat);

-        }

-        f3 = 500000.0f;

-    } else {

-        f3 = 0.5f / calcFloat;

-        dst->z = multVec.z * f3;

-    }

-

-    view_port_class* viewPort = dComIfGd_getViewport();

-    float xOffset;

-    float yOffset;

-    float xSize;

-    float ySize;

-    if (viewPort->mXOrig != 0.0f) {

-        xOffset = (0.5f * ((2.0f * viewPort->mXOrig) + viewPort->mWidth)) - 304.0f;

-        xSize = 608.0f;

-    } else {

-        xOffset = viewPort->mXOrig;

-        xSize = viewPort->mWidth;

-    }

-

-    if (viewPort->mYOrig != 0.0f) {

-        yOffset = (0.5f * ((2.0f * viewPort->mYOrig) + viewPort->mHeight)) - 224.0f;

-        ySize = 448.0f;

-    } else {

-        yOffset = viewPort->mYOrig;

-        ySize = viewPort->mHeight;

-    }

-

-    dst->x = ((0.5f + (multVec.x * f3)) * xSize) + xOffset;

-    dst->y = ((0.5f + (multVec.y * (-f3))) * ySize) + yOffset;

-}

-

-/* 800154EC-80015544 00FE2C 0058+00 0/0 2/2 9/9 .text            mDoLib_pos2camera__FP3VecP3Vec */

-void mDoLib_pos2camera(Vec* src, Vec* dst) {

-    if (dComIfGd_getView() == NULL) {

-        dst->x = 0.0f;

-        dst->y = 0.0f;

-        dst->z = 0.0f;

-        return;

-    }

-    cMtx_multVec(dComIfGd_getView()->mViewMtx, src, dst);

-}

-

-// Fake function to make the weak function calcAlphaCmpID appear in this TU

-u32 mDoLib_calcAlphaCmpID(u8 param_0, u8 param_1, u8 param_2) {

-    return calcAlphaCmpID(param_0, param_1, param_2);

-}

+/**
+ * m_Do_lib.cpp
+ * View and Projection Matrix Helper Functions
+ */
+
+#include "m_Do/m_Do_lib.h"
+#include "JSystem/J3DGraphBase/J3DMatBlock.h"
+#include "SSystem/SComponent/c_math.h"
+#include "d/com/d_com_inf_game.h"
+#include "dolphin/types.h"
+
+/* 8001513C-8001528C 00FA7C 0150+00 0/0 3/3 2/2 .text
+ * mDoLib_setResTimgObj__FPC7ResTIMGP9_GXTexObjUlP10_GXTlutObj  */
+u8 mDoLib_setResTimgObj(ResTIMG const* res, _GXTexObj* o_texObj, u32 tlut_name,
+                        _GXTlutObj* o_tlutObj) {
+    ResTIMG* _res = (ResTIMG*)res;
+
+    if (_res->indexTexture) {
+        GXInitTlutObj(o_tlutObj, (void*)((u8*)_res + _res->paletteOffset),
+                      (GXTlutFmt)_res->colorFormat, _res->numColors);
+        GXInitTexObjCI(o_texObj, (void*)((u8*)_res + _res->imageOffset), _res->width, _res->height,
+                       (GXCITexFmt)_res->format, (GXTexWrapMode)_res->wrapS,
+                       (GXTexWrapMode)_res->wrapT, _res->mipmapCount > 1, tlut_name);
+    } else {
+        GXInitTexObj(o_texObj, (void*)((u8*)_res + _res->imageOffset), _res->width, _res->height,
+                     (GXTexFmt)_res->format, (GXTexWrapMode)_res->wrapS, (GXTexWrapMode)_res->wrapT,
+                     _res->mipmapCount > 1);
+    }
+    GXInitTexObjLOD(o_texObj, (GXTexFilter)_res->minFilter, (GXTexFilter)_res->magFilter,
+                    (f32)_res->minLOD * 0.125f, (f32)_res->maxLOD * 0.125f,
+                    (f32)_res->LODBias * 0.01f, (s32)_res->biasClamp, (s32)_res->doEdgeLOD,
+                    (GXAnisotropy)_res->maxAnisotropy);
+
+    return _res->indexTexture;
+}
+
+/* 803DD8E4-803DD940 00A604 005C+00 2/2 5/5 5/5 .bss             mClipper__14mDoLib_clipper */
+J3DUClipper mDoLib_clipper::mClipper;
+
+/* 80450C70-80450C74 000170 0004+00 1/1 2/2 4/4 .sbss            mSystemFar__14mDoLib_clipper */
+f32 mDoLib_clipper::mSystemFar;
+
+/* 80450C74-80450C78 000174 0004+00 1/1 1/1 0/0 .sbss            mFovyRate__14mDoLib_clipper */
+f32 mDoLib_clipper::mFovyRate;
+
+/* 8001528C-80015310 00FBCC 0084+00 0/0 1/1 0/0 .text            setup__14mDoLib_clipperFffff */
+void mDoLib_clipper::setup(f32 fovy, f32 aspect, f32 near, f32 far) {
+    mClipper.setFovy(fovy);
+    mClipper.setAspect(aspect);
+    mClipper.setNear(near);
+    mClipper.setFar(far);
+    mSystemFar = far;
+    mClipper.calcViewFrustum();
+
+    s16 tmp = fovy * 182.04444885253906f;
+
+    mFovyRate = cM_scos(tmp) / cM_ssin(tmp);
+}
+
+/* 80015310-800154EC 00FC50 01DC+00 0/0 21/21 23/23 .text            mDoLib_project__FP3VecP3Vec */
+void mDoLib_project(Vec* src, Vec* dst) {
+    if (dComIfGd_getView() == NULL) {
+        dst->x = 0.0f;
+        dst->y = 0.0f;
+        dst->z = 0.0f;
+        return;
+    }
+    Mtx44* projMtx = dComIfGd_getProjViewMtx();
+    Vec multVec;
+    cMtx_multVec(*projMtx, src, &multVec);
+
+    float calcFloat = (src->x * (*dComIfGd_getProjViewMtx())[3][0]) +
+                      (src->y * (*dComIfGd_getProjViewMtx())[3][1]) +
+                      (src->z * (*dComIfGd_getProjViewMtx())[3][2]) +
+                      (*dComIfGd_getProjViewMtx())[3][3];
+    if (multVec.z >= 0.0f) {
+        multVec.z = 0.0f;
+    }
+    float f3;
+    if (calcFloat <= 0.0f) {
+        if (calcFloat == 0.0f) {
+            dst->z = multVec.z * 500000.0f;
+        } else {
+            dst->z = multVec.z * (0.5f / calcFloat);
+        }
+        f3 = 500000.0f;
+    } else {
+        f3 = 0.5f / calcFloat;
+        dst->z = multVec.z * f3;
+    }
+
+    view_port_class* viewPort = dComIfGd_getViewport();
+    float xOffset;
+    float yOffset;
+    float xSize;
+    float ySize;
+    if (viewPort->mXOrig != 0.0f) {
+        xOffset = (0.5f * ((2.0f * viewPort->mXOrig) + viewPort->mWidth)) - 304.0f;
+        xSize = 608.0f;
+    } else {
+        xOffset = viewPort->mXOrig;
+        xSize = viewPort->mWidth;
+    }
+
+    if (viewPort->mYOrig != 0.0f) {
+        yOffset = (0.5f * ((2.0f * viewPort->mYOrig) + viewPort->mHeight)) - 224.0f;
+        ySize = 448.0f;
+    } else {
+        yOffset = viewPort->mYOrig;
+        ySize = viewPort->mHeight;
+    }
+
+    dst->x = ((0.5f + (multVec.x * f3)) * xSize) + xOffset;
+    dst->y = ((0.5f + (multVec.y * (-f3))) * ySize) + yOffset;
+}
+
+/* 800154EC-80015544 00FE2C 0058+00 0/0 2/2 9/9 .text            mDoLib_pos2camera__FP3VecP3Vec */
+void mDoLib_pos2camera(Vec* src, Vec* dst) {
+    if (dComIfGd_getView() == NULL) {
+        dst->x = 0.0f;
+        dst->y = 0.0f;
+        dst->z = 0.0f;
+        return;
+    }
+    cMtx_multVec(dComIfGd_getView()->mViewMtx, src, dst);
+}
+
+// Fake function to make the weak function calcAlphaCmpID appear in this TU
+u32 mDoLib_calcAlphaCmpID(u8 param_0, u8 param_1, u8 param_2) {
+    return calcAlphaCmpID(param_0, param_1, param_2);
+}
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index da28692299..3b8b56ff4b 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -9,15 +9,8 @@
 #include "JSystem/JUtility/JUTDbPrint.h"
 #include "JSystem/JUtility/JUTException.h"
 #include "JSystem/JUtility/JUTVideo.h"
-#include "JSystem/JKernel/JKRAramStream.h"
-#include "JSystem/JKernel/JKRDvdRipper.h"
-#include "JSystem/JKernel/JKRDvdAramRipper.h"
-#include "JSystem/JKernel/JKRAram.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
-#include "SSystem/SComponent/c_malloc.h"
-#include "SSystem/SComponent/c_math.h"
 #include "dol2asm.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_Reset.h"
diff --git a/src/m_Do/m_Do_machine_exception.cpp b/src/m_Do/m_Do_machine_exception.cpp
index 258349167f..b0274384a6 100644
--- a/src/m_Do/m_Do_machine_exception.cpp
+++ b/src/m_Do/m_Do_machine_exception.cpp
@@ -8,7 +8,6 @@
 #include "JSystem/JKernel/JKRAram.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "d/com/d_com_inf_game.h"
-#include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_main.h"
 #include "DynamicLink.h"
 
diff --git a/src/m_Do/m_Do_main.cpp b/src/m_Do/m_Do_main.cpp
index c1bf7706cf..84939f46d7 100644
--- a/src/m_Do/m_Do_main.cpp
+++ b/src/m_Do/m_Do_main.cpp
@@ -12,13 +12,10 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTConsole.h"
 #include "JSystem/JUtility/JUTReport.h"
-#include "Z2AudioLib/Z2SoundInfo.h"
 #include "Z2AudioLib/Z2WolfHowlMgr.h"
 #include "c/c_dylink.h"
 #include "d/com/d_com_inf_game.h"
-#include "dolphin/os.h"
 #include "f_ap/f_ap_game.h"
-#include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_Reset.h"
 #include "m_Do/m_Do_controller_pad.h"
diff --git a/src/m_Do/m_Do_mtx.cpp b/src/m_Do/m_Do_mtx.cpp
index b88cf3f23f..e54853b850 100644
--- a/src/m_Do/m_Do_mtx.cpp
+++ b/src/m_Do/m_Do_mtx.cpp
@@ -5,7 +5,6 @@
 
 #include "m_Do/m_Do_mtx.h"
 #include "JSystem/JGeometry.h"
-#include "JSystem/JMath/JMATrigonometric.h"
 #include "JSystem/JMath/JMath.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "SSystem/SComponent/c_m3d.h"
diff --git a/src/m_Do/m_Do_printf.cpp b/src/m_Do/m_Do_printf.cpp
index 9958d705d2..2e0f544f62 100644
--- a/src/m_Do/m_Do_printf.cpp
+++ b/src/m_Do/m_Do_printf.cpp
@@ -5,9 +5,7 @@
 
 #include "m_Do/m_Do_printf.h"
 #include "stdio.h"
-#include "dol2asm.h"
 #include "dolphin/base/PPCArch.h"
-#include "dolphin/os.h"
 #include "m_Do/m_Do_ext.h"
 
 /* 80450B98-80450B9C -00001 0004+00 0/0 6/6 0/0 .sbss            None */