fix include paths to not pollute d_com_inf_game.h

include/d/d_com_inf_game.h

@@ -1,10 +1,6 @@
 #ifndef D_COM_D_COM_INF_GAME_H
 #define D_COM_D_COM_INF_GAME_H
 
-#if TARGET_PC
-#include "dusk/randomizer/game/randomizer_context.hpp"
-#endif
-
 #include "d/d_attention.h"
 #include "d/d_cc_s.h"
 #include "d/d_event.h"
@@ -21,7 +17,9 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstring>
 
+#if TARGET_PC
 #include "dusk/profiling.hpp"
+#endif
 
 enum dComIfG_ButtonStatus {
     /* 0x00 */ BUTTON_STATUS_NONE,

src/Z2AudioLib/Z2SceneMgr.cpp

@@ -14,6 +14,10 @@
 #include <cstring>
 #include "Z2AudioLib/SpotName.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 Z2SceneMgr::Z2SceneMgr() : JASGlobalInstance<Z2SceneMgr>(true) {
     sceneNum = -1;
     BGM_ID = -1;

src/d/actor/d_a_b_bq.cpp

@@ -19,6 +19,7 @@
 #include <cmath>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #endif
 

src/d/actor/d_a_b_ds.cpp

@@ -19,6 +19,10 @@
 #include "f_op/f_op_actor_enemy.h"
 #include "Z2AudioLib/Z2Instances.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 enum daB_DS_Joint {
     DS_JNT_BACKBONE1,
     DS_JNT_BACKBONE2,

src/d/actor/d_a_demo_item.cpp

@@ -15,6 +15,10 @@
 #include "Z2AudioLib/Z2Instances.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 static cXyz l_player_offset = cXyz(0.0f, 115.0f, 54.0f);
 
 static cXyz l_wolf_offset = cXyz(13.0f, 135.0f, 57.0f);

src/d/actor/d_a_door_shutter.cpp

@@ -23,6 +23,7 @@
 #if TARGET_PC
 #include <f_ap/f_ap_game.h>
 #include <dusk/autosave.h>
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #endif
 
 char DUSK_CONST* daDoor20_c::getStopBmdName() {
@@ -320,8 +321,7 @@ int daDoor20_c::checkOpenMsgDoor(int* param_1) {
     int rv = 1;
 
     // If we are in SPR, we don't want Yeta's msg flow to prevent us from opening the door if we haven't talked to her.
-    if (randomizer_IsActive() && !daAlink_c::checkStageName("D_MN11"))
-    {
+    if (randomizer_IsActive() && !daAlink_c::checkStageName("D_MN11")) {
         rv = field_0x624.checkOpenDoor(this, param_1);
     }
 #else

src/d/actor/d_a_e_md.cpp

@@ -10,6 +10,10 @@
 #include "d/d_s_play.h"
 #include "c/c_damagereaction.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 enum daE_MD_TYPE {
     TYPE_DUMMY,
     TYPE_REAL,

src/d/actor/d_a_e_mk.cpp

@@ -22,6 +22,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #endif
 

src/d/actor/d_a_e_rdb.cpp

@@ -17,6 +17,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_e_s1.cpp

@@ -11,6 +11,7 @@
 #include "d/actor/d_a_player.h"
 #if TARGET_PC
 #include "d/actor/d_a_alink.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #endif
 #include "d/d_com_inf_game.h"
 #include "d/d_path.h"

src/d/actor/d_a_e_th_ball.cpp

@@ -11,6 +11,7 @@
 #include "d/actor/d_a_player.h"
 #include "d/d_s_play.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 enum daE_TH_ACTION {

src/d/actor/d_a_kytag08.cpp

@@ -10,6 +10,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/actor/d_a_spinner.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 static int daKytag08_Draw(kytag08_class* i_this) {
     return 1;
 }

src/d/actor/d_a_npc.cpp

@@ -15,6 +15,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/stages.h"
 #include "dusk/randomizer/game/tools.h"
 #endif

src/d/actor/d_a_npc_aru.cpp

@@ -14,6 +14,11 @@
 #include "d/d_meter2_info.h"
 #include "d/actor/d_a_horse.h"
 #include "Z2AudioLib/Z2Instances.h"
+
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 #if DEBUG
 #include "JSystem/JHostIO/JORFile.h"
 #include "d/d_debug_viewer.h"

src/d/actor/d_a_npc_ashB.cpp

@@ -11,6 +11,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_bans.cpp

@@ -13,6 +13,10 @@
 #include "d/actor/d_a_npc_len.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 enum Bans_RES_File_ID {
     /* BCK */
     /* 0x06 */ BCK_BANS_F_TALK_A = 0x6,

src/d/actor/d_a_npc_bouS.cpp

@@ -14,6 +14,10 @@
 #include "d/d_camera.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 enum Bou_RES_File_ID {
     /* BCK */
     /* 0x06 */ BCK_BOU_F_TALK_A = 0x6,

src/d/actor/d_a_npc_chin.cpp

@@ -11,6 +11,10 @@
 #include "d/d_meter2_info.h"
 #include "d/d_timer.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 enum Event {
     EVT_NONE,
     EVT_GAME_START,

src/d/actor/d_a_npc_fairy.cpp

@@ -12,6 +12,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_gra.cpp

@@ -15,6 +15,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_gro.cpp

@@ -14,6 +14,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_grr.cpp

@@ -11,6 +11,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_grs.cpp

@@ -12,6 +12,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 enum Event_Cut_Nums {

src/d/actor/d_a_npc_impal.cpp

@@ -10,6 +10,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_kkri.cpp

@@ -10,6 +10,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_len.cpp

@@ -10,6 +10,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_maro.cpp

@@ -18,6 +18,7 @@
 #include "d/d_item.h"
 #include "d/d_timer.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 #if DEBUG

src/d/actor/d_a_npc_myna2.cpp

@@ -12,6 +12,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_prayer.cpp

@@ -8,6 +8,7 @@
 #include "d/actor/d_a_npc_prayer.h"
 #include "d/d_com_inf_game.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_rafrel.cpp

@@ -11,6 +11,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/randomizer/game/flags.h"
 #endif

src/d/actor/d_a_npc_shad.cpp

@@ -12,6 +12,10 @@
 #include "d/d_msg_object.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 const daNpcShad_HIOParam daNpcShad_Param_c::m = {
     35.0f,      // attention_offset
     -3.0f,      // gravity

src/d/actor/d_a_npc_the.cpp

@@ -13,6 +13,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_uri.cpp

@@ -10,6 +10,10 @@
 #include "m_Do/m_Do_graphic.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 const daNpc_Uri_HIOParam daNpc_Uri_Param_c::m = {
     200.0f,   // attention_offset
     -3.0f,    // gravity

src/d/actor/d_a_npc_yelia.cpp

@@ -11,6 +11,7 @@
 
 #if TARGET_PC
 #include "dusk/string.hpp"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #endif
 

src/d/actor/d_a_npc_ykm.cpp

@@ -20,6 +20,9 @@
 #include "d/d_tresure.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
 
 enum ykM_RES_File_ID {
     /* BCK */

src/d/actor/d_a_npc_ykw.cpp

@@ -22,6 +22,7 @@
 
 #if TARGET_PC
 #include "dusk/string.hpp"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_zra.inc

@@ -1,3 +1,7 @@
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 BOOL daNpc_zrA_c::wait(void* param_0) {
     switch (mMode) {
     case 0:

src/d/actor/d_a_npc_zrc.cpp

@@ -11,6 +11,7 @@
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "Z2AudioLib/Z2Instances.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_npc_zrz.cpp

@@ -16,6 +16,7 @@
 
 #if TARGET_PC
 #include "dusk/randomizer/game/flags.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_obj_Lv5Key.cpp

@@ -9,6 +9,7 @@
 #include "d/d_com_inf_game.h"
 #if TARGET_PC
 #include "d/d_map.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #endif
 
 static int useHeapInit(fopAc_ac_c*);

src/d/actor/d_a_obj_bosswarp.cpp

@@ -14,6 +14,10 @@
 #include "d/actor/d_a_obj_ystone.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 static DUSK_CONST char* l_arcName = "ef_Portal";
 
 static char const* l_clearEvName[9] = {

src/d/actor/d_a_obj_gb.cpp

@@ -13,6 +13,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/stages.h"
 #include "dusk/randomizer/game/tools.h"
 #endif

src/d/actor/d_a_obj_item.cpp

@@ -19,6 +19,7 @@
 #if TARGET_PC
 #include "d/actor/d_a_alink.h"
 
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/frame_interpolation.h"

src/d/actor/d_a_obj_life_container.cpp

@@ -15,6 +15,7 @@
 #if TARGET_PC
 #include "d/actor/d_a_alink.h"
 #include "dusk/randomizer/game/flags.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/randomizer/game/stages.h"

src/d/actor/d_a_obj_master_sword.cpp

@@ -10,6 +10,10 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_meter2_info.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 daObjMasterSword_Attr_c const daObjMasterSword_c::mAttr = {1.0f};
 
 void daObjMasterSword_c::initBaseMtx() {

src/d/actor/d_a_obj_shield.cpp

@@ -13,6 +13,10 @@
 #include "d/d_item_data.h"
 #include <cmath>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 const static dCcD_SrcCyl l_cyl_src = {
     {
         {0x0, {{0x0, 0x0, 0x0}, {0xffffffff, 0x11}, 0x59}}, // mObj

src/d/actor/d_a_obj_smallkey.cpp

@@ -13,8 +13,10 @@
 #include "f_op/f_op_camera_mng.h"
 #include <cstring>
 
-#include "d/actor/d_a_tboxSw.h"
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
+#endif
 
 const static dCcD_SrcCyl l_cyl_src = {
     {

src/d/actor/d_a_obj_swBallC.cpp

@@ -16,6 +16,7 @@
 #include "f_op/f_op_msg.h"
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #endif
 

src/d/actor/d_a_obj_sword.cpp

@@ -10,6 +10,7 @@
 #include "d/d_com_inf_game.h"
 #include "d/d_item_data.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_obj_wood_statue.cpp

@@ -13,6 +13,7 @@
 #include "d/d_s_play.h"
 #if TARGET_PC
 #include "dusk/randomizer/game/flags.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_obj_zcloth.cpp

@@ -12,6 +12,7 @@
 #include "f_pc/f_pc_name.h"
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/actor/d_a_obj_zra_rock.cpp

@@ -11,6 +11,7 @@
 #include "f_pc/f_pc_name.h"
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/flags.h"
 #endif
 

src/d/actor/d_a_shop_item.cpp

@@ -13,6 +13,7 @@
 
 #if TARGET_PC
 #include "d/d_item_data.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif

src/d/actor/d_a_tag_statue_evt.cpp

@@ -9,8 +9,12 @@
 #include "d/actor/d_a_tag_statue_evt.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_debug_viewer.h"
+
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"
+#endif
 
 class daTagStatue_HIO_c : public mDoHIO_entry_c {
 public:

src/d/actor/d_a_tbox.cpp

@@ -13,6 +13,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif

src/d/actor/d_a_tbox2.cpp

@@ -12,6 +12,7 @@
 
 #if TARGET_PC
 #include "dusk/randomizer/game/tools.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/d_a_itembase_static.cpp

@@ -10,6 +10,10 @@
 #include "d/actor/d_a_itembase.h"
 #include "d/d_item_data.h"
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
+
 u8 daItemBase_c::getItemNo() {
     return M_ITEMNO_MODEL_ITEM_ID;
 }

src/d/d_event.cpp

@@ -13,7 +13,10 @@
 #include "SSystem/SComponent/c_counter.h"
 #include <cstring>
 
+#if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/string.hpp"
+#endif
 
 namespace {
 static u8 event_debug_evnt() {

src/d/d_event_manager.cpp

@@ -16,9 +16,10 @@
 #include <cstring>
 #if TARGET_PC
 #include "dusk/randomizer/game/verify_item_functions.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#include "dusk/string.hpp"
 #endif
 
-#include "dusk/string.hpp"
 
 #if DEBUG
 static dEvM_HIO_c l_HIO;

src/d/d_file_select.cpp

@@ -26,6 +26,7 @@
 #if TARGET_PC
 #include "dusk/config.hpp"
 #include "dusk/menu_pointer.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/string.hpp"
 #include "dusk/ui/modal.hpp"
 #include "dusk/ui/rando_config.hpp"

src/d/d_gameover.cpp

@@ -14,7 +14,10 @@
 #include "JSystem/J2DGraph/J2DGrafContext.h"
 #include <cstring>
 
+#if TARGET_PC
 #include "dusk/gx_helper.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
+#endif
 
 class dGov_HIO_c : public mDoHIO_entry_c {
 public:

src/d/d_item.cpp

@@ -12,6 +12,7 @@
 #include "dusk/randomizer/game/flags.h"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/stages.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 #include <cstring>

src/d/d_item_data.cpp

@@ -1,8 +1,9 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_item_data.h"
+
 #if TARGET_PC
-#include "d/d_com_inf_game.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #endif
 
 dItem_itemResource dItem_data::item_resource[] = {

src/d/d_menu_ring.cpp

@@ -33,6 +33,7 @@
 #include "dusk/menu_pointer.h"
 #include "dusk/settings.h"
 #include "dusk/ui/touch_controls.hpp"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/randomizer/game/tools.h"
 #endif

src/d/d_menu_save.cpp

@@ -25,6 +25,7 @@
 #include "dusk/config.hpp"
 #include "dusk/frame_interpolation.h"
 #include "dusk/menu_pointer.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/settings.h"
 #endif
 

src/d/d_meter2_info.cpp

@@ -16,6 +16,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/string.hpp"
 #include "battery/embed.hpp"
 #endif

src/d/d_msg_flow.cpp

@@ -19,6 +19,7 @@
 #include "dusk/randomizer/game/flags.h"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/stages.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #endif
 

src/d/d_msg_object.cpp

@@ -32,6 +32,7 @@
 #if TARGET_PC
 #include "d/d_item.h"
 #include "dusk/randomizer/game/messages.hpp"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/stages.h"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/verify_item_functions.h"

src/d/d_s_play.cpp

@@ -42,6 +42,7 @@
 #if TARGET_PC
 #include "dusk/autosave.h"
 #include "dusk/memory.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include <dusk/autosave.h>
 #include "dusk/ui/ui.hpp"

src/d/d_save.cpp

@@ -21,6 +21,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/flags.h"
 #include "dusk/randomizer/game/stages.h"
 #include "dusk/randomizer/game/tools.h"

src/d/d_shop_system.cpp

@@ -20,6 +20,7 @@
 #include <cstring>
 
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/game/stages.h"

src/dusk/autosave.cpp

@@ -3,6 +3,7 @@
 #include "dusk/config.hpp"
 #include "dusk/ui/ui.hpp"
 #include "imgui/ImGuiConsole.hpp"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 
 bool shouldAutoSave = false;
 u8 mSaveBuffer[QUEST_LOG_SIZE * 3];

src/dusk/imgui/ImGuiMenuRandomizer.hpp

@@ -1,5 +1,6 @@
 #ifndef DUSK_IMGUI_MENU_RANDOMIZER_HPP
 #define DUSK_IMGUI_MENU_RANDOMIZER_HPP
+#include "dusk/randomizer/generator/logic/requirement.hpp"
 #include "dusk/randomizer/generator/logic/search.hpp"
 
 namespace randomizer {

src/dusk/randomizer/game/tools.cpp

@@ -1,10 +1,13 @@
 #include "tools.h"
+
 #include "d/actor/d_a_alink.h"
 #include "d/d_com_inf_game.h"
 #include "d/d_item.h"
 #include "d/d_item_data.h"
 #include "dusk/logging.h"
+#include "dusk/randomizer/generator/logic/world.hpp"
 #include "f_op/f_op_actor_mng.h"
+#include "randomizer_context.hpp"
 #include "stages.h"
 #include "verify_item_functions.h"
 

src/dusk/randomizer/game/tools.h

@@ -1,6 +1,14 @@
 #pragma once
 
 #include "dolphin/types.h"
+#include "dusk/randomizer/generator/logic/item_pool.hpp"
+
+namespace randomizer::logic::location {
+class Location;
+}
+namespace randomizer::logic::world {
+class World;
+}
 
 bool playerIsInRoomStage(s32 room, const char* stage);
 void checkTransformFromWolf();

src/dusk/randomizer/generator/logic/entrance_shuffle.cpp

@@ -2,6 +2,7 @@
 
 #include "item_pool.hpp"
 #include "search.hpp"
+#include "../randomizer.hpp"
 #include "../utility/random.hpp"
 #include "../utility/yaml.hpp"
 

src/dusk/randomizer/generator/logic/hints.hpp

@@ -1,5 +1,12 @@
 #pragma once
 
+#include <memory>
+
+namespace randomizer::logic::world {
+class World;
+using WorldPool = std::vector<std::unique_ptr<World>>;
+}
+
 namespace randomizer::logic::hints {
 
     void GenerateAllHints(world::WorldPool& worldPool);

src/dusk/ui/editor.cpp

@@ -9,6 +9,7 @@
 #include "d/d_kankyo.h"
 #include "d/d_meter2_info.h"
 #include "dusk/map_loader_definitions.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "number_button.hpp"
 #include "pane.hpp"

src/dusk/ui/rando_config.cpp

@@ -4,9 +4,12 @@
 #include "dusk/config.hpp"
 #include "dusk/data.hpp"
 #include "dusk/logging.h"
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/tools.h"
 #include "dusk/randomizer/generator/seedgen/seed.hpp"
 #include "dusk/randomizer/generator/utility/string.hpp"
+#include "dusk/randomizer/generator/utility/text.hpp"
+#include "dusk/randomizer/generator/utility/yaml.hpp"
 #include "modal.hpp"
 #include "number_button.hpp"
 #include "pane.hpp"
@@ -17,6 +20,7 @@
 
 #include <mutex>
 #include <thread>
+#include <unordered_set>
 
 namespace dusk::ui {
 

src/f_op/f_op_actor_mng.cpp

@@ -31,6 +31,7 @@
 #include "f_op/f_op_scene_mng.h"
 #include "m_Do/m_Do_lib.h"
 #if TARGET_PC
+#include "dusk/randomizer/game/randomizer_context.hpp"
 #include "dusk/randomizer/game/verify_item_functions.h"
 #include "dusk/randomizer/game/tools.h"
 #endif