12 files changed, 12 insertions, 12 deletions
diff --git a/include/d/a/d_a_item.h b/include/d/a/d_a_item.h
index 983b701f..b897bdf1 100644
--- a/include/d/a/d_a_item.h
+++ b/include/d/a/d_a_item.h
@@ -17,7 +17,7 @@
 #include "s/s_State.hpp"
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/dowsing_target.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcItem_0xB34 {
 public:
diff --git a/include/d/a/obj/d_a_obj_arrow.h b/include/d/a/obj/d_a_obj_arrow.h
index 8bedda03..6e2d1a17 100644
--- a/include/d/a/obj/d_a_obj_arrow.h
+++ b/include/d/a/obj/d_a_obj_arrow.h
@@ -9,7 +9,7 @@
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcArrow_c : public dAcObjBase_c {
 public:
diff --git a/include/d/a/obj/d_a_obj_bomb.h b/include/d/a/obj/d_a_obj_bomb.h
index e82b3743..c5cd71d2 100644
--- a/include/d/a/obj/d_a_obj_bomb.h
+++ b/include/d/a/obj/d_a_obj_bomb.h
@@ -13,7 +13,7 @@
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 // This may need its own file and could be independent of a bomb
 class UnkBombColInfo : public cBgS_PolyInfo {
diff --git a/include/d/a/obj/d_a_obj_dungeon_ship.h b/include/d/a/obj/d_a_obj_dungeon_ship.h
index 18fbdb31..d8106eb8 100644
--- a/include/d/a/obj/d_a_obj_dungeon_ship.h
+++ b/include/d/a/obj/d_a_obj_dungeon_ship.h
@@ -13,7 +13,7 @@
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/actor_on_rail.h"
 #include "toBeSorted/dowsing_target.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 #include "toBeSorted/time_proc.h"
 
 class dAcODungeonShip_c : public dAcObjBase_c {
diff --git a/include/d/a/obj/d_a_obj_seat_sword.h b/include/d/a/obj/d_a_obj_seat_sword.h
index ec74ab45..cedbf9db 100644
--- a/include/d/a/obj/d_a_obj_seat_sword.h
+++ b/include/d/a/obj/d_a_obj_seat_sword.h
@@ -17,7 +17,7 @@
 #include "s/s_StateMgr.hpp"
 #include "toBeSorted/actor_event.h"
 #include "toBeSorted/attention.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOSeatSword_c : public dAcObjBase_c {
 public:
diff --git a/include/d/a/obj/d_a_obj_tower_gearD101.h b/include/d/a/obj/d_a_obj_tower_gearD101.h
index d77b665a..bcc98e7d 100644
--- a/include/d/a/obj/d_a_obj_tower_gearD101.h
+++ b/include/d/a/obj/d_a_obj_tower_gearD101.h
@@ -9,7 +9,7 @@
 #include "m/m_vec.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 /**
  * A callback implementation that controls the button node in the switch model.
diff --git a/include/d/a/obj/d_a_obj_tower_hand_D101.h b/include/d/a/obj/d_a_obj_tower_hand_D101.h
index 3dcca5fc..ae945915 100644
--- a/include/d/a/obj/d_a_obj_tower_hand_D101.h
+++ b/include/d/a/obj/d_a_obj_tower_hand_D101.h
@@ -13,7 +13,7 @@
 #include "s/s_State.hpp"
 #include "s/s_StateMgr.hpp"
 #include "toBeSorted/actor_event.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 
 class dAcOTowerHandD101_c : public dAcObjBase_c {
diff --git a/include/d/a/obj/d_a_obj_triforce.h b/include/d/a/obj/d_a_obj_triforce.h
index ac134bef..eefc90fe 100644
--- a/include/d/a/obj/d_a_obj_triforce.h
+++ b/include/d/a/obj/d_a_obj_triforce.h
@@ -8,7 +8,7 @@
 #include "m/m3d/m_smdl.h"
 #include "m/m_angle.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOtriforce_c : public dAcObjBase_c {
 public:
diff --git a/include/d/a/obj/d_a_obj_tubo.h b/include/d/a/obj/d_a_obj_tubo.h
index 4e8e8c27..fe8fed49 100644
--- a/include/d/a/obj/d_a_obj_tubo.h
+++ b/include/d/a/obj/d_a_obj_tubo.h
@@ -15,7 +15,7 @@
 #include "m/m_vec.h"
 #include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dAcOtubo_c : public dAcObjBase_c {
 public:
diff --git a/include/d/d_cs_game.h b/include/d/d_cs_game.h
index a090bf97..4050fddf 100644
--- a/include/d/d_cs_game.h
+++ b/include/d/d_cs_game.h
@@ -9,7 +9,7 @@
 #include "s/s_FStateID.hpp"
 #include "s/s_State.hpp"
 #include "s/s_StateID.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 struct CsGameConfigMaybe {
     CsGameConfigMaybe();
diff --git a/include/d/lyt/meter/d_lyt_meter_item_select.h b/include/d/lyt/meter/d_lyt_meter_item_select.h
index ae097d41..d64e7eae 100644
--- a/include/d/lyt/meter/d_lyt_meter_item_select.h
+++ b/include/d/lyt/meter/d_lyt_meter_item_select.h
@@ -8,7 +8,7 @@
 #include "d/lyt/d_window.h"
 #include "nw4r/lyt/lyt_pane.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 class dLytMeterItemSelectIcon_c {
 public:
diff --git a/include/d/lyt/meter/d_lyt_meter_minus_btn.h b/include/d/lyt/meter/d_lyt_meter_minus_btn.h
index 7478aea3..30fb1830 100644
--- a/include/d/lyt/meter/d_lyt_meter_minus_btn.h
+++ b/include/d/lyt/meter/d_lyt_meter_minus_btn.h
@@ -7,7 +7,7 @@
 #include "d/lyt/d_window.h"
 #include "nw4r/lyt/lyt_pane.h"
 #include "s/s_State.hpp"
-#include "toBeSorted/effects_struct.h"
+#include "toBeSorted/d_emitter.h"
 
 // At 0x8, [8], size 0x48
 class dLytMeterMinusBtnMenuIcon_c {