diff --git a/include/d/actor/d_a_demo_item.h b/include/d/actor/d_a_demo_item.h
index 172e37973..13e23b819 100644
--- a/include/d/actor/d_a_demo_item.h
+++ b/include/d/actor/d_a_demo_item.h
@@ -1,7 +1,6 @@
 #ifndef D_A_DEMO_ITEM_H
 #define D_A_DEMO_ITEM_H
 
-#include "f_op/f_op_actor.h"
 #include "d/actor/d_a_itembase.h"
 #include "f_op/f_op_actor_mng.h"
 #include "SSystem/SComponent/c_lib.h"
diff --git a/include/d/actor/d_a_npc_os.h b/include/d/actor/d_a_npc_os.h
index e19a2b234..fca229b8f 100644
--- a/include/d/actor/d_a_npc_os.h
+++ b/include/d/actor/d_a_npc_os.h
@@ -6,11 +6,11 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/d_npc.h"
 #include "d/actor/d_a_player_npc.h"
-#include "d/actor/d_a_pedestal.h"
 #include "d/d_particle.h"
 #include "m_Do/m_Do_hostIO.h"
 
 class mDoExt_McaMorf;
+namespace daPedestal { class daPds_c; }
 
 class daNpc_Os_infiniteEcallBack_c : public dPa_levelEcallBack {
 public:
diff --git a/include/d/actor/d_a_ship.h b/include/d/actor/d_a_ship.h
index 38bb9a104..deac62d8d 100644
--- a/include/d/actor/d_a_ship.h
+++ b/include/d/actor/d_a_ship.h
@@ -7,7 +7,8 @@
 #include "d/d_particle.h"
 #include "SSystem/SComponent/c_phase.h"
 #include "f_op/f_op_msg.h"
-#include "d/actor/d_a_grid.h"
+
+class daGrid_c;
 
 class daShip_c : public fopAc_ac_c {
 public:
diff --git a/include/d/actor/d_a_shop_item.h b/include/d/actor/d_a_shop_item.h
index bc0d5911f..10dd0b03c 100644
--- a/include/d/actor/d_a_shop_item.h
+++ b/include/d/actor/d_a_shop_item.h
@@ -2,7 +2,8 @@
 #define D_A_SHOP_ITEM_H
 
 #include "d/actor/d_a_itembase.h"
-#include "d/d_cloth_packet.h"
+
+class dCloth_packet_c;
 
 struct daShopItem_c_m_data {
     /* 0x00 */ Vec mScale;
diff --git a/include/d/actor/d_a_spc_item01.h b/include/d/actor/d_a_spc_item01.h
index df4b873a0..4ab035729 100644
--- a/include/d/actor/d_a_spc_item01.h
+++ b/include/d/actor/d_a_spc_item01.h
@@ -2,8 +2,6 @@
 #define D_A_SPC_ITEM01_H
 
 #include "d/actor/d_a_itembase.h"
-#include "f_op/f_op_actor.h"
-#include "SSystem/SComponent/c_phase.h"
 
 class daSpcItem01_c : public daItemBase_c {
 public:
diff --git a/src/d/actor/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp
index 1971581bd..480f9f1e9 100644
--- a/src/d/actor/d_a_npc_os.cpp
+++ b/src/d/actor/d_a_npc_os.cpp
@@ -4,13 +4,14 @@
  */
 
 #include "d/actor/d_a_npc_os.h"
-#include "d/res/res_os.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_procname.h"
+#include "d/actor/d_a_player_main.h"
+#include "d/actor/d_a_pedestal.h"
+#include "d/res/res_os.h"
 #include "f_op/f_op_actor_mng.h"
 #include "f_op/f_op_camera.h"
 #include "m_Do/m_Do_controller_pad.h"
-#include "d/actor/d_a_player_main.h"
 
 #include "weak_bss_936_to_1036.h" // IWYU pragma: keep
 #include "weak_data_1811.h" // IWYU pragma: keep
diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp
index a27333114..30426d464 100644
--- a/src/d/actor/d_a_shop_item.cpp
+++ b/src/d/actor/d_a_shop_item.cpp
@@ -4,16 +4,17 @@
  */
 
 #include "d/actor/d_a_shop_item.h"
-#include "d/res/res_fdai.h"
 #include "f_op/f_op_actor_mng.h"
 #include "d/d_procname.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_s_play.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
+#include "d/d_cloth_packet.h"
+#include "d/res/res_fdai.h"
+#include "d/res/res_cloth.h"
 #include "m_Do/m_Do_mtx.h"
 #include "m_Do/m_Do_lib.h"
-#include "d/res/res_cloth.h"
 
 const char daShopItem_c::m_cloth_arcname[] = "Cloth";
 const f32 daShopItem_c::m_cullfar_max = 5000.0f;