diff --git a/soh/soh/OTRGlobals.h b/soh/soh/OTRGlobals.h
index 400503a0a..f8435f49e 100644
--- a/soh/soh/OTRGlobals.h
+++ b/soh/soh/OTRGlobals.h
@@ -8,6 +8,7 @@
 #ifdef __cplusplus
 #include "Enhancements/savestates.h"
 #include "Enhancements/randomizer.h"
+#include "spoiler_log.hpp"
 
 class OTRGlobals
 {
@@ -75,6 +76,8 @@ int AudioPlayer_GetDesiredBuffered(void);
 void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
 void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
 int Controller_ShouldRumble(size_t i);
+void LoadItemLocations(const char* spoilerFileName);
+void ParseItemLocations(const char* spoilerfilename);
 void ParseItemLocations(SpoilerData spoilerData);
 ItemID GetItemIdFromGetItem(GetItemID getItemId);
 s16 GetItemModelFromId(s16 itemId);
diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
index 2a594ebbf..24eddfa67 100644
--- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
+++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
@@ -899,7 +899,7 @@ void func_80986BF8(DemoIm* this, GlobalContext* globalCtx) {
 }
 
 u8 successImpa;
-void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, Key check) {
+void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, RandomizerCheck check) {
     if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
         if (successImpa == 0 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) &&
             (globalCtx->actorCtx.titleCtx.alpha == 0)) {
@@ -922,7 +922,7 @@ void GivePlayerRandoRewardImpa(Actor* impa, GlobalContext* globalCtx, Key check)
 void func_80986C30(DemoIm* this, GlobalContext* globalCtx) {
     if (func_80986A5C(this, globalCtx)) {
         if (gSaveContext.n64ddFlag) {
-            GivePlayerRandoRewardImpa(this, globalCtx, SONG_FROM_IMPA);
+            GivePlayerRandoRewardImpa(this, globalCtx, RC_SONG_FROM_IMPA);
         } else {
             globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardLullabyCs);
             gSaveContext.cutsceneTrigger = 1;
diff --git a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
index c7cb99539..113b1d820 100644
--- a/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
+++ b/soh/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c
@@ -350,7 +350,7 @@ void func_80AA0EFC(EnMa1* this, GlobalContext* globalCtx) {
     }
 }
 
-void GivePlayerRandoRewardMalon(EnMa1* malon, GlobalContext* globalCtx, Key check) {
+void GivePlayerRandoRewardMalon(EnMa1* malon, GlobalContext* globalCtx, RandomizerCheck check) {
     Player* player = GET_PLAYER(globalCtx);
 
     if (!Flags_GetTreasure(globalCtx, 0x1F) &&
@@ -381,7 +381,7 @@ void func_80AA0F44(EnMa1* this, GlobalContext* globalCtx) {
     }
 
     if (gSaveContext.n64ddFlag) {
-        GivePlayerRandoRewardMalon(this, globalCtx, SONG_FROM_MALON);
+        GivePlayerRandoRewardMalon(this, globalCtx, RC_SONG_FROM_MALON);
         return;
     }
 
diff --git a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
index f54daced3..5a3f750cf 100644
--- a/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
+++ b/soh/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
@@ -227,7 +227,7 @@ u16 EnZl4_GetText(GlobalContext* globalCtx, Actor* thisx) {
     return ret;
 }
 
-void GivePlayerRandoRewardZeldaChild(EnZl4* zelda, GlobalContext* globalCtx, Key check) {
+void GivePlayerRandoRewardZeldaChild(EnZl4* zelda, GlobalContext* globalCtx, RandomizerCheck check) {
     if (!Player_InBlockingCsMode(globalCtx, GET_PLAYER(globalCtx))) {
         if (!Flags_GetTreasure(globalCtx, 0x1F) && Actor_TextboxIsClosing(&zelda->actor, globalCtx) &&
             gSaveContext.eventChkInf[4] != 1 && (globalCtx->actorCtx.titleCtx.delayTimer == 0) &&