move placement new to MSL_C

94 files changed, 18 insertions, 99 deletions

diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h
index 5f5dacb1..53638ec8 100644
--- a/include/JSystem/JKernel/JKRHeap.h
+++ b/include/JSystem/JKernel/JKRHeap.h
@@ -187,10 +187,6 @@ void* operator new[](size_t size, JKRHeap* heap, int alignment);
 void operator delete(void* ptr);
 void operator delete[](void* ptr);
 
-inline void* operator new(size_t size, void* ptr) {
-    return ptr;
-}
-
 void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment);
 
 inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) {
diff --git a/include/MSL_C/new.h b/include/MSL_C/new.h
new file mode 100644
index 00000000..17053c7f
--- /dev/null
+++ b/include/MSL_C/new.h
@@ -0,0 +1,10 @@
+#ifndef MSL_NEW_H_
+#define MSL_NEW_H_
+
+#include "MSL_C/MSL_Common/Src/stddef.h"
+
+inline void* operator new(size_t size, void* ptr) {
+    return ptr;
+}
+
+#endif
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index dafa934f..56c0b338 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -1,6 +1,7 @@
 #ifndef F_OP_ACTOR_MNG_H_
 #define F_OP_ACTOR_MNG_H_
 
+#include "MSL_C/new.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_iter.h"
 #include "f_pc/f_pc_manager.h"
diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp
index 4cd450b2..16056ae6 100644
--- a/src/JSystem/JKernel/JKRSolidHeap.cpp
+++ b/src/JSystem/JKernel/JKRSolidHeap.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
+#include "MSL_C/new.h"
 #include "global.h"
 
 /* 802B3290-802B333C       .text create__12JKRSolidHeapFUlP7JKRHeapb */
diff --git a/src/JSystem/JKernel/JKRStdHeap.cpp b/src/JSystem/JKernel/JKRStdHeap.cpp
index 147e417e..e7cac7c4 100644
--- a/src/JSystem/JKernel/JKRStdHeap.cpp
+++ b/src/JSystem/JKernel/JKRStdHeap.cpp
@@ -6,6 +6,7 @@
 #include "JSystem/JKernel/JKRStdHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTConsole.h"
+#include "MSL_C/new.h"
 #include "global.h"
 
 /* 802B0F34-802B0FE0       .text create__10JKRStdHeapFUlP7JKRHeapb */
diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index b66c51ce..a6117add 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -9,6 +9,7 @@
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/JUtility/JUTDirectPrint.h"
 #include "JSystem/JUtility/JUTVideo.h"
+#include "MSL_C/new.h"
 #include "MSL_C/stdio.h"
 #include "dolphin/types.h"
 
diff --git a/src/d/actor/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp
index f288e0b2..9d46b787 100644
--- a/src/d/actor/d_a_agbsw0.cpp
+++ b/src/d/actor/d_a_agbsw0.cpp
@@ -12,7 +12,6 @@ static u8 dummy3[4] = {0x02, 0x00, 0x02, 0x01};
 static f64 dummy4[2] = {3.0, 0.5};
 
 #include "d/actor/d_a_agbsw0.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp
index 3678768e..3a341e67 100644
--- a/src/d/actor/d_a_alldie.cpp
+++ b/src/d/actor/d_a_alldie.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_alldie.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/actor/d_a_am.cpp b/src/d/actor/d_a_am.cpp
index 6087140f..eb3afc44 100644
--- a/src/d/actor/d_a_am.cpp
+++ b/src/d/actor/d_a_am.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_am.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DNode.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp
index 663e948f..390d52a6 100644
--- a/src/d/actor/d_a_am2.cpp
+++ b/src/d/actor/d_a_am2.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_am2.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_bg_s_lin_chk.h"
 #include "d/d_s_play.h"
diff --git a/src/d/actor/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp
index 09d291d7..136a5127 100644
--- a/src/d/actor/d_a_andsw0.cpp
+++ b/src/d/actor/d_a_andsw0.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_andsw0.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp
index f4c8f09c..6f880e86 100644
--- a/src/d/actor/d_a_andsw2.cpp
+++ b/src/d/actor/d_a_andsw2.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_andsw2.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dolphin/types.h"
diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp
index 1f6c15db..e0d12e0d 100644
--- a/src/d/actor/d_a_arrow.cpp
+++ b/src/d/actor/d_a_arrow.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_arrow.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp
index 146e276f..074af3b6 100644
--- a/src/d/actor/d_a_arrow_iceeff.cpp
+++ b/src/d/actor/d_a_arrow_iceeff.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_arrow_iceeff.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp
index 4584c4aa..38a92244 100644
--- a/src/d/actor/d_a_arrow_lighteff.cpp
+++ b/src/d/actor/d_a_arrow_lighteff.cpp
@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_graphic.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 /* 00000078-00000108       .text setTopPos__18daArrow_Lighteff_cFv */
 void daArrow_Lighteff_c::setTopPos() {
@@ -424,4 +423,3 @@ actor_process_profile_definition g_profile_ARROW_LIGHTEFF = {
     fopAc_ACTOR_e,
     fopAc_CULLBOX_CUSTOM_e,
 };
-
diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp
index 18d4d5bc..0aec7eaa 100644
--- a/src/d/actor/d_a_bg.cpp
+++ b/src/d/actor/d_a_bg.cpp
@@ -18,7 +18,6 @@
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
 #include "JSystem/JKernel/JKRExpHeap.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
diff --git a/src/d/actor/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp
index e9b6e53a..f44f3231 100644
--- a/src/d/actor/d_a_bk.cpp
+++ b/src/d/actor/d_a_bk.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_bk.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_obj_search.h"
diff --git a/src/d/actor/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp
index 67bcf34a..13586d3d 100644
--- a/src/d/actor/d_a_bomb.cpp
+++ b/src/d/actor/d_a_bomb.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_bomb.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_counter.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp
index b7a679c6..48f42231 100644
--- a/src/d/actor/d_a_bomb2.cpp
+++ b/src/d/actor/d_a_bomb2.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_bomb2.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_kankyo_wether.h"
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_kankyo_mng.h"
diff --git a/src/d/actor/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp
index 774e2d36..ef27ae76 100644
--- a/src/d/actor/d_a_boss_item.cpp
+++ b/src/d/actor/d_a_boss_item.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_boss_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp
index 00e8870c..d28eb2f3 100644
--- a/src/d/actor/d_a_branch.cpp
+++ b/src/d/actor/d_a_branch.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_branch.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp
index 0992d9d3..a4d24f49 100644
--- a/src/d/actor/d_a_demo_item.cpp
+++ b/src/d/actor/d_a_demo_item.cpp
@@ -8,7 +8,6 @@
 #include "d/d_drawlist.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #include "d/d_item.h"
diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp
index 5d82b6ad..bf0e607e 100644
--- a/src/d/actor/d_a_disappear.cpp
+++ b/src/d/actor/d_a_disappear.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_disappear.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp
index 6adfe895..f8e535d7 100644
--- a/src/d/actor/d_a_dr.cpp
+++ b/src/d/actor/d_a_dr.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_dr.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp
index 3a698ae2..dafd9807 100644
--- a/src/d/actor/d_a_fan.cpp
+++ b/src/d/actor/d_a_fan.cpp
@@ -9,7 +9,6 @@
 #include "d/d_level_se.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 const char* daFan_c::m_arcname[3] = { "Hsen1", "Hsen1", "Hsen3", };
diff --git a/src/d/actor/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp
index 1e5bab71..cb621d7b 100644
--- a/src/d/actor/d_a_ghostship.cpp
+++ b/src/d/actor/d_a_ghostship.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_ghostship.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_math.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp
index f3896e25..e2e6cdd8 100644
--- a/src/d/actor/d_a_grass.cpp
+++ b/src/d/actor/d_a_grass.cpp
@@ -12,7 +12,6 @@
 #include "d/d_item_data.h"
 #include "d/d_procname.h"
 #include "d/d_tree.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "SSystem/SComponent/c_sxyz.h"
 
 namespace daGrass_prm {
diff --git a/src/d/actor/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp
index 6fa9993e..141a795a 100644
--- a/src/d/actor/d_a_hookshot.cpp
+++ b/src/d/actor/d_a_hookshot.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_hookshot.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_counter.h"
diff --git a/src/d/actor/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp
index 786596c1..52d84e32 100644
--- a/src/d/actor/d_a_hot_floor.cpp
+++ b/src/d/actor/d_a_hot_floor.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_hot_floor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JParticle/JPAParticle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp
index 4457a83e..9dd65cd3 100644
--- a/src/d/actor/d_a_ib.cpp
+++ b/src/d/actor/d_a_ib.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_ib.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
diff --git a/src/d/actor/d_a_item.cpp b/src/d/actor/d_a_item.cpp
index 2f74fb6a..27692e75 100644
--- a/src/d/actor/d_a_item.cpp
+++ b/src/d/actor/d_a_item.cpp
@@ -9,7 +9,6 @@
 #include "d/actor/d_a_player_main.h"
 #include "d/actor/d_a_sea.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
 #include "f_op/f_op_camera_mng.h"
diff --git a/src/d/actor/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp
index 9f67b2af..9b9894aa 100644
--- a/src/d/actor/d_a_kaji.cpp
+++ b/src/d/actor/d_a_kaji.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_kaji.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp
index 7766e877..ac7c83ac 100644
--- a/src/d/actor/d_a_kytag00.cpp
+++ b/src/d/actor/d_a_kytag00.cpp
@@ -13,7 +13,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 /* 00000078-0000024C       .text get_check_pos__FP13kytag00_class */
diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp
index 9808b573..f870d7e2 100644
--- a/src/d/actor/d_a_kytag01.cpp
+++ b/src/d/actor/d_a_kytag01.cpp
@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 /* 00000078-0000007C       .text wether_tag_move__FP13kytag01_class */
 void wether_tag_move(kytag01_class* i_this) {
diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp
index 68f84920..4835e13e 100644
--- a/src/d/actor/d_a_kytag04.cpp
+++ b/src/d/actor/d_a_kytag04.cpp
@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_kytag04.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -83,4 +82,3 @@ actor_process_profile_definition g_profile_KYTAG04 = {
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
 };
-
diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp
index 5b056ac8..d9da620a 100644
--- a/src/d/actor/d_a_kytag05.cpp
+++ b/src/d/actor/d_a_kytag05.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_kytag05.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JAZelAudio/JAIZelBasic.h"
 #include "d/actor/d_a_player.h"
 #include "d/actor/d_a_player_main.h"
@@ -163,4 +162,4 @@ actor_process_profile_definition g_profile_KYTAG05 = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
-};
\ No newline at end of file
+};
diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp
index 4344e7ee..0d948aeb 100644
--- a/src/d/actor/d_a_kytag06.cpp
+++ b/src/d/actor/d_a_kytag06.cpp
@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_kytag06.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
@@ -92,4 +91,4 @@ actor_process_profile_definition g_profile_KYTAG06 = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_0_e,
-};
\ No newline at end of file
+};
diff --git a/src/d/actor/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp
index e042ab03..d12933da 100644
--- a/src/d/actor/d_a_lamp.cpp
+++ b/src/d/actor/d_a_lamp.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_lamp.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp
index 5ccd503c..156220dc 100644
--- a/src/d/actor/d_a_magma.cpp
+++ b/src/d/actor/d_a_magma.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_magma.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp
index 7453fe2c..6e03dcde 100644
--- a/src/d/actor/d_a_mbdoor.cpp
+++ b/src/d/actor/d_a_mbdoor.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_mbdoor.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_ext.h"
diff --git a/src/d/actor/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp
index 6e70985f..b6c0e0cf 100644
--- a/src/d/actor/d_a_mmusic.cpp
+++ b/src/d/actor/d_a_mmusic.cpp
@@ -8,7 +8,6 @@
 #include "d/d_item_data.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 namespace daMmusic {
     namespace {
diff --git a/src/d/actor/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp
index 85b1f715..cc10d371 100644
--- a/src/d/actor/d_a_mozo.cpp
+++ b/src/d/actor/d_a_mozo.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_mozo.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo.h"
diff --git a/src/d/actor/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp
index c480a9bf..924114a5 100644
--- a/src/d/actor/d_a_nh.cpp
+++ b/src/d/actor/d_a_nh.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_nh.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp
index 2c1f010c..b46a8fc2 100644
--- a/src/d/actor/d_a_npc_kamome.cpp
+++ b/src/d/actor/d_a_npc_kamome.cpp
@@ -10,7 +10,6 @@
 #include "d/d_item_data.h"
 #include "d/actor/d_a_player_main.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "d/d_npc.h"
 #include "d/d_snap.h"
diff --git a/src/d/actor/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp
index 17b3b076..4cf2ae5c 100644
--- a/src/d/actor/d_a_npc_md.cpp
+++ b/src/d/actor/d_a_npc_md.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_npc_md.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_item_data.h"
 #include "m_Do/m_Do_controller_pad.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp
index 73153a0c..8343f015 100644
--- a/src/d/actor/d_a_obj_AjavW.cpp
+++ b/src/d/actor/d_a_obj_AjavW.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_AjavW.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp
index 2a0bbd11..625799e7 100644
--- a/src/d/actor/d_a_obj_Vteng.cpp
+++ b/src/d/actor/d_a_obj_Vteng.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_Vteng.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp
index 6684b686..e1a325a5 100644
--- a/src/d/actor/d_a_obj_Yboil.cpp
+++ b/src/d/actor/d_a_obj_Yboil.cpp
@@ -8,7 +8,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_kankyo.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_procname.h"
 
diff --git a/src/d/actor/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp
index fc0a1846..32e7ca63 100644
--- a/src/d/actor/d_a_obj_Ygush00.cpp
+++ b/src/d/actor/d_a_obj_Ygush00.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_Ygush00.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp
index de6bd99f..1a460fe7 100644
--- a/src/d/actor/d_a_obj_adnno.cpp
+++ b/src/d/actor/d_a_obj_adnno.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_adnno.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp
index c6df2887..9ef730bb 100644
--- a/src/d/actor/d_a_obj_akabe.cpp
+++ b/src/d/actor/d_a_obj_akabe.cpp
@@ -10,7 +10,6 @@
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 namespace daObjAkabe {
     const char* const Act_c::M_arcname[4] = {
diff --git a/src/d/actor/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp
index 80240e6b..1405ee5c 100644
--- a/src/d/actor/d_a_obj_barrier.cpp
+++ b/src/d/actor/d_a_obj_barrier.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_obj_barrier.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp
index 35624488..8b028c13 100644
--- a/src/d/actor/d_a_obj_bscurtain.cpp
+++ b/src/d/actor/d_a_obj_bscurtain.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_obj_bscurtain.h"
 #include "f_op/f_op_actor_mng.h"
 #include "JSystem/JParticle/JPAParticle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp
index beecc204..a9089748 100644
--- a/src/d/actor/d_a_obj_cafelmp.cpp
+++ b/src/d/actor/d_a_obj_cafelmp.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_cafelmp.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp
index ce9a535c..3c8b4f55 100644
--- a/src/d/actor/d_a_obj_dmgroom.cpp
+++ b/src/d/actor/d_a_obj_dmgroom.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_dmgroom.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp
index 171f39f8..c670c59b 100644
--- a/src/d/actor/d_a_obj_dragonhead.cpp
+++ b/src/d/actor/d_a_obj_dragonhead.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_dragonhead.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp
index 6bd253cf..2b9447f0 100644
--- a/src/d/actor/d_a_obj_eayogn.cpp
+++ b/src/d/actor/d_a_obj_eayogn.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_eayogn.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp
index 0b52e535..95d4dcd7 100644
--- a/src/d/actor/d_a_obj_ganonbed.cpp
+++ b/src/d/actor/d_a_obj_ganonbed.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_ganonbed.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_w.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp
index 4d988ef1..bce62d3d 100644
--- a/src/d/actor/d_a_obj_gong.cpp
+++ b/src/d/actor/d_a_obj_gong.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_gong.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_bg_w.h"
diff --git a/src/d/actor/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp
index a71274bc..a11c49b4 100644
--- a/src/d/actor/d_a_obj_hfuck1.cpp
+++ b/src/d/actor/d_a_obj_hfuck1.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_hfuck1.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp
index 6217bdb5..10b91c29 100644
--- a/src/d/actor/d_a_obj_hole.cpp
+++ b/src/d/actor/d_a_obj_hole.cpp
@@ -11,7 +11,6 @@
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_camera_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp
index 09456403..47280444 100644
--- a/src/d/actor/d_a_obj_homensmoke.cpp
+++ b/src/d/actor/d_a_obj_homensmoke.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_obj_homensmoke.h"
 #include "d/d_procname.h"
 #include "d/d_particle.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
 
diff --git a/src/d/actor/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp
index 4a5ddb57..9d3ca4b9 100644
--- a/src/d/actor/d_a_obj_kanat.cpp
+++ b/src/d/actor/d_a_obj_kanat.cpp
@@ -7,7 +7,6 @@
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_com_inf_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 Mtx daObjKanat::Act_c::M_tmp_mtx;
 const char daObjKanat::Act_c::M_arcname[] = "Kanat";
diff --git a/src/d/actor/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp
index 1c09c20e..39c14e49 100644
--- a/src/d/actor/d_a_obj_mknjd.cpp
+++ b/src/d/actor/d_a_obj_mknjd.cpp
@@ -8,7 +8,6 @@
 #include "f_pc/f_pc_manager.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_draw_tag.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "JSystem/J3DGraphBase/J3DSys.h"
 #include "JAZelAudio/JAIZelBasic.h"
diff --git a/src/d/actor/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp
index 47e89078..1a2ebef7 100644
--- a/src/d/actor/d_a_obj_monument.cpp
+++ b/src/d/actor/d_a_obj_monument.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_monument.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_a_obj.h"
 #include "d/d_bg_w.h"
diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp
index 251914bb..4825f9cb 100644
--- a/src/d/actor/d_a_obj_movebox.cpp
+++ b/src/d/actor/d_a_obj_movebox.cpp
@@ -15,7 +15,6 @@ u8 dummy5[0x4C];
 #include "d/actor/d_a_obj_movebox.h"
 #include "d/d_cc_d.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp
index 7072e5b5..3155ef63 100644
--- a/src/d/actor/d_a_obj_mtest.cpp
+++ b/src/d/actor/d_a_obj_mtest.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_mtest.h"
 #include "d/d_procname.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp
index e6d437ab..4981b1e4 100644
--- a/src/d/actor/d_a_obj_paper.cpp
+++ b/src/d/actor/d_a_obj_paper.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_obj_paper.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
diff --git a/src/d/actor/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp
index 07bcca25..65410874 100644
--- a/src/d/actor/d_a_obj_pbka.cpp
+++ b/src/d/actor/d_a_obj_pbka.cpp
@@ -3,7 +3,6 @@
  */
 
 #include "d/actor/d_a_obj_pbka.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
@@ -117,4 +116,4 @@ actor_process_profile_definition g_profile_Obj_Pbka = {
     fopAcStts_UNK40000_e | fopAcStts_CULL_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_CUSTOM_e,
-};
\ No newline at end of file
+};
diff --git a/src/d/actor/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp
index ebf374c8..df11438c 100644
--- a/src/d/actor/d_a_obj_toripost.cpp
+++ b/src/d/actor/d_a_obj_toripost.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_obj_toripost.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/actor/d_a_player.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp
index f443639f..2e256e8c 100644
--- a/src/d/actor/d_a_obj_wood.cpp
+++ b/src/d/actor/d_a_obj_wood.cpp
@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 s32 daObjWood::Act_c::_create() {
     fopAcM_SetupActor(this, Act_c);
diff --git a/src/d/actor/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp
index d4745062..b2ef0394 100644
--- a/src/d/actor/d_a_obj_zouK.cpp
+++ b/src/d/actor/d_a_obj_zouK.cpp
@@ -11,7 +11,6 @@
 #include "d/d_kankyo_rain.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 namespace daObjZouk {
diff --git a/src/d/actor/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp
index 283ea1c1..56267f1b 100644
--- a/src/d/actor/d_a_player_main.cpp
+++ b/src/d/actor/d_a_player_main.cpp
@@ -12,7 +12,6 @@
 #include "d/actor/d_a_player_HIO.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_com_lib_game.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_kankyo.h"
 #include "JSystem/JKernel/JKRSolidHeap.h"
diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp
index 571adb25..6d14cd59 100644
--- a/src/d/actor/d_a_race_item.cpp
+++ b/src/d/actor/d_a_race_item.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_race_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_sea.h"
 #include "d/d_item_data.h"
diff --git a/src/d/actor/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp
index 84a07b6e..91c03175 100644
--- a/src/d/actor/d_a_rd.cpp
+++ b/src/d/actor/d_a_rd.cpp
@@ -6,7 +6,6 @@
 #include "d/actor/d_a_rd.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
 #include "d/d_lib.h"
diff --git a/src/d/actor/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp
index 87657bb5..4ab1835c 100644
--- a/src/d/actor/d_a_scene_change.cpp
+++ b/src/d/actor/d_a_scene_change.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_scene_change.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor.h"
 #include "f_op/f_op_actor_mng.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp
index 822437ec..7032498f 100644
--- a/src/d/actor/d_a_sea.cpp
+++ b/src/d/actor/d_a_sea.cpp
@@ -8,7 +8,6 @@
 #include "d/d_procname.h"
 #include "d/d_stage.h"
 #include "m_Do/m_Do_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/actor/d_a_daiocta.h"
 
 daSea_packet_c l_cloth;
diff --git a/src/d/actor/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp
index ef8b85d3..561040eb 100644
--- a/src/d/actor/d_a_seatag.cpp
+++ b/src/d/actor/d_a_seatag.cpp
@@ -2,7 +2,6 @@
  * d_a_seatag.cpp
  */
 #include "d/actor/d_a_seatag.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index 66ea9b67..b62c3c1d 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_shop_item.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
diff --git a/src/d/actor/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp
index 54b6f6b3..6bc56366 100644
--- a/src/d/actor/d_a_spotbox.cpp
+++ b/src/d/actor/d_a_spotbox.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_spotbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_com_inf_game.h"
 #include "m_Do/m_Do_mtx.h"
diff --git a/src/d/actor/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp
index 1852623d..06f98697 100644
--- a/src/d/actor/d_a_swattack.cpp
+++ b/src/d/actor/d_a_swattack.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_swattack.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_cc_d.h"
 #include "d/d_com_inf_game.h"
diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp
index 608eea78..9cfc2ebd 100644
--- a/src/d/actor/d_a_swc00.cpp
+++ b/src/d/actor/d_a_swc00.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_swc00.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 
diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp
index 7a93dee1..d5ec1861 100644
--- a/src/d/actor/d_a_swhit0.cpp
+++ b/src/d/actor/d_a_swhit0.cpp
@@ -7,7 +7,6 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "m_Do/m_Do_mtx.h"
 
diff --git a/src/d/actor/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp
index c99789b7..eeb559e5 100644
--- a/src/d/actor/d_a_switem.cpp
+++ b/src/d/actor/d_a_switem.cpp
@@ -5,7 +5,6 @@
 
 #include "d/actor/d_a_switem.h"
 #include "f_op/f_op_actor_mng.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_procname.h"
 #include "d/d_cc_d.h"
 #include "f_op/f_op_draw_tag.h"
diff --git a/src/d/actor/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp
index cd41c09d..5d16f20d 100644
--- a/src/d/actor/d_a_swtact.cpp
+++ b/src/d/actor/d_a_swtact.cpp
@@ -10,7 +10,6 @@
 #include "d/actor/d_a_player.h"
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 const char * daSwTact_c::m_arcname = "Itact";
diff --git a/src/d/actor/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp
index 21ac65be..03562cc1 100644
--- a/src/d/actor/d_a_swtdoor.cpp
+++ b/src/d/actor/d_a_swtdoor.cpp
@@ -11,7 +11,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_mtx.h"
 #include "SSystem/SComponent/c_lib.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 
 /* 00000078-000000C4       .text daSwtdoor_Draw__FP13swtdoor_class */
diff --git a/src/d/actor/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp
index 44aa63de..7e0fa95b 100644
--- a/src/d/actor/d_a_tag_ghostship.cpp
+++ b/src/d/actor/d_a_tag_ghostship.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_tag_ghostship.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 
diff --git a/src/d/actor/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp
index 8813bbc9..eac802f2 100644
--- a/src/d/actor/d_a_tag_kb_item.cpp
+++ b/src/d/actor/d_a_tag_kb_item.cpp
@@ -4,7 +4,6 @@
  */
 
 #include "d/actor/d_a_tag_kb_item.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
 #include "dolphin/types.h"
diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp
index b690adea..b5f1c397 100644
--- a/src/d/actor/d_a_tag_msg.cpp
+++ b/src/d/actor/d_a_tag_msg.cpp
@@ -3,7 +3,6 @@
 // Translation Unit: d_a_tag_msg.cpp
 //
 #include "d/actor/d_a_tag_msg.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "d/actor/d_a_player_main.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
@@ -306,4 +305,4 @@ actor_process_profile_definition g_profile_TAG_MSG = {
     fopAcStts_UNK4000_e | fopAcStts_UNK40000_e,
     fopAc_ACTOR_e,
     fopAc_CULLBOX_6_e,
-};
\ No newline at end of file
+};
diff --git a/src/d/actor/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp
index 499ebd57..25b4b216 100644
--- a/src/d/actor/d_a_tag_ret.cpp
+++ b/src/d/actor/d_a_tag_ret.cpp
@@ -11,8 +11,6 @@
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_player_main.h"
-#include "JSystem/JKernel/JKRHeap.h"
-#include "dolphin/types.h"
 
 static dCcD_SrcCyl cyl_check_src = {
     // dCcD_SrcGObjInf
diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp
index b0bde096..32327570 100644
--- a/src/d/actor/d_a_tbox.cpp
+++ b/src/d/actor/d_a_tbox.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_tbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/JUtility/JUTAssert.h"
 #include "d/d_bg_s_acch.h"
 #include "d/d_bg_w.h"
diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp
index 433603e7..64ec5282 100644
--- a/src/d/actor/d_a_vrbox.cpp
+++ b/src/d/actor/d_a_vrbox.cpp
@@ -4,7 +4,6 @@
 //
 
 #include "d/actor/d_a_vrbox.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp
index 3f2ad985..2a02e586 100644
--- a/src/d/actor/d_a_vrbox2.cpp
+++ b/src/d/actor/d_a_vrbox2.cpp
@@ -11,7 +11,6 @@
 #include "d/d_kankyo_rain.h"
 #include "d/d_kankyo_wether.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 
diff --git a/src/d/d_throwstone.cpp b/src/d/d_throwstone.cpp
index 13fd1a69..3b91f196 100644
--- a/src/d/d_throwstone.cpp
+++ b/src/d/d_throwstone.cpp
@@ -10,7 +10,6 @@
 #include "d/d_demo.h"
 #include "d/d_procname.h"
 #include "m_Do/m_Do_mtx.h"
-#include "JSystem/JKernel/JKRHeap.h"
 
 const char daThrowstone_c::M_arcname[] = "Aisi";