clean up includes (#7114)

266 files changed, 583 insertions, 662 deletions

diff --git a/soh/soh/Enhancements/ActorSkeletonUnregister.c b/soh/soh/Enhancements/ActorSkeletonUnregister.c
index a0c66aa86..dd1571a06 100644
--- a/soh/soh/Enhancements/ActorSkeletonUnregister.c
+++ b/soh/soh/Enhancements/ActorSkeletonUnregister.c
@@ -3,7 +3,6 @@
 
 #include "soh/ResourceManagerHelpers.h"
 
-#include "z64.h"
 #include "include/z64player.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h"
@@ -114,7 +113,6 @@
 #include "src/overlays/actors/ovl_En_Test/z_en_test.h"
 #include "src/overlays/actors/ovl_En_Tite/z_en_tite.h"
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
-#include "src/overlays/actors/ovl_En_Torch2/z_en_torch2.h"
 #include "src/overlays/actors/ovl_En_Toryo/z_en_toryo.h"
 #include "src/overlays/actors/ovl_En_Tr/z_en_tr.h"
 #include "src/overlays/actors/ovl_En_Vali/z_en_vali.h"
diff --git a/soh/soh/Enhancements/BunnyHood.cpp b/soh/soh/Enhancements/BunnyHood.cpp
index 175c8424c..05def73f9 100644
--- a/soh/soh/Enhancements/BunnyHood.cpp
+++ b/soh/soh/Enhancements/BunnyHood.cpp
@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "z64.h"
-#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/Cheats/DekuStick.cpp b/soh/soh/Enhancements/Cheats/DekuStick.cpp
index 5f19be7a9..d4c727022 100644
--- a/soh/soh/Enhancements/Cheats/DekuStick.cpp
+++ b/soh/soh/Enhancements/Cheats/DekuStick.cpp
@@ -1,12 +1,12 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "z64.h"
 #include "macros.h"
+extern PlayState* gPlayState;
 }
 
 #define CVAR_DEKU_STICK_NAME CVAR_CHEAT("DekuStick")
diff --git a/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp b/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp
index 1c1506b50..f56b7fb85 100644
--- a/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp
+++ b/soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
 }
 
diff --git a/soh/soh/Enhancements/Cheats/EasyISG.cpp b/soh/soh/Enhancements/Cheats/EasyISG.cpp
index 07b4c7326..777e3279e 100644
--- a/soh/soh/Enhancements/Cheats/EasyISG.cpp
+++ b/soh/soh/Enhancements/Cheats/EasyISG.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/Cheats/EasyQPA.cpp b/soh/soh/Enhancements/Cheats/EasyQPA.cpp
index 4391a406d..8b8e3ca2a 100644
--- a/soh/soh/Enhancements/Cheats/EasyQPA.cpp
+++ b/soh/soh/Enhancements/Cheats/EasyQPA.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Cheats/FreezeTime.cpp b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
index 4c38e2870..201b81bfc 100644
--- a/soh/soh/Enhancements/Cheats/FreezeTime.cpp
+++ b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 
diff --git a/soh/soh/Enhancements/Cheats/GSTargetable.cpp b/soh/soh/Enhancements/Cheats/GSTargetable.cpp
index 47dc91804..980baaa56 100644
--- a/soh/soh/Enhancements/Cheats/GSTargetable.cpp
+++ b/soh/soh/Enhancements/Cheats/GSTargetable.cpp
@@ -1,12 +1,13 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/ShipInit.hpp"
-#include <spdlog/spdlog.h>
 #include <vector>
 
+#include <spdlog/spdlog.h>
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
 extern "C" {
 #include "functions.h"
 #include "src/overlays/actors/ovl_En_Sw/z_en_sw.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
index 9ef5a1f21..36d5dcb7d 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
@@ -1,13 +1,13 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
-#include "z64save.h"
 
 extern "C" {
-extern SaveContext gSaveContext;
+#include "z64save.h"
 #include "variables.h"
 #include "macros.h"
+extern SaveContext gSaveContext;
 }
 
 #define CVAR_INFINITE_AMMO_NAME CVAR_CHEAT("InfiniteAmmo")
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
index 35f413d4a..eb7b58912 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp b/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp
index aca55d714..61c9ec411 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Magic.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
index ac9a4b351..c590f783a 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
@@ -1,12 +1,12 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "z64save.h"
-#include "variables.h"
 
 extern "C" {
+#include "z64save.h"
+#include "variables.h"
+#include "macros.h"
 extern SaveContext gSaveContext;
 extern s32 Flags_GetRandomizerInf(RandomizerInf flag);
-#include "macros.h"
 }
 
 #define CVAR_INFINITE_MONEY_NAME CVAR_CHEAT("InfiniteMoney")
diff --git a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
index 732437d49..a9eeebcf2 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 
diff --git a/soh/soh/Enhancements/Cheats/MoonJump.cpp b/soh/soh/Enhancements/Cheats/MoonJump.cpp
index 71035168a..79686292b 100644
--- a/soh/soh/Enhancements/Cheats/MoonJump.cpp
+++ b/soh/soh/Enhancements/Cheats/MoonJump.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
index a15374880..82ffd0b0b 100644
--- a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
+++ b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Insect/z_en_insect.h"
-
 extern s16 sDroppedCount;
 }
 
diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
index 818543956..907c51149 100644
--- a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
+++ b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
index 45adbd01d..c02962fe5 100644
--- a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
+++ b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
index 5b1d29b46..cf8965645 100644
--- a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
+++ b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "z64.h"
+extern PlayState* gPlayState;
 }
 
 #define CVAR_UNRESTRICTED_ITEMS_NAME CVAR_CHEAT("NoRestrictItems")
diff --git a/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp b/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp
index 480a9de92..97c1477a1 100644
--- a/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp
+++ b/soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/Difficulty/BonkDamage.cpp b/soh/soh/Enhancements/Difficulty/BonkDamage.cpp
index 256c46be8..c8bedaa5f 100644
--- a/soh/soh/Enhancements/Difficulty/BonkDamage.cpp
+++ b/soh/soh/Enhancements/Difficulty/BonkDamage.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 
diff --git a/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp b/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp
index f1d5a2349..943c9f921 100644
--- a/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp
+++ b/soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp
@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h"
+extern PlayState* gPlayState;
 }
 
 static constexpr int32_t CVAR_CUCCOS_TO_RETURN_DEFAULT = 7;
diff --git a/soh/soh/Enhancements/Difficulty/DampeFire.cpp b/soh/soh/Enhancements/Difficulty/DampeFire.cpp
index 13afc88f0..29251771d 100644
--- a/soh/soh/Enhancements/Difficulty/DampeFire.cpp
+++ b/soh/soh/Enhancements/Difficulty/DampeFire.cpp
@@ -1,10 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h"
+extern PlayState* gPlayState;
 }
 
 static constexpr DampeDropRate CVAR_DAMPE_DROP_RATE_DEFAULT = DAMPE_NORMAL;
diff --git a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
index 2b21437b3..ae0603fdf 100644
--- a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
+++ b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
@@ -1,9 +1,12 @@
 #include "soh/ShipInit.hpp"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/boss-rush/BossRush.h"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+}
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
index 42f7c9cc1..6ce4faf20 100644
--- a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
+++ b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
@@ -1,7 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
+}
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
index de9e6c1f1..4c6684905 100644
--- a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
+++ b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
@@ -1,14 +1,13 @@
 #include <ship/Context.h>
 #include <ship/window/Window.h>
 
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "variables.h"
 #include "z64save.h"
 extern SaveContext gSaveContext;
diff --git a/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp b/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp
index 9c1f90271..872a7f4e1 100644
--- a/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp
+++ b/soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp
@@ -1,6 +1,7 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
+
 extern "C" {
 #include "z64.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp b/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp
index 9bf868977..a8505c21e 100644
--- a/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp
+++ b/soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp
@@ -1,7 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
+#include "functions.h"
 #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h"
 }
 
diff --git a/soh/soh/Enhancements/DropThrowOnlyActors.cpp b/soh/soh/Enhancements/DropThrowOnlyActors.cpp
index d00b1c887..a6dd26445 100644
--- a/soh/soh/Enhancements/DropThrowOnlyActors.cpp
+++ b/soh/soh/Enhancements/DropThrowOnlyActors.cpp
@@ -1,5 +1,4 @@
 #include <soh/Enhancements/game-interactor/GameInteractor.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
index 018ffb38f..8021e6270 100644
--- a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
+++ b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp b/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp
index 35888e842..6b016359e 100644
--- a/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp
+++ b/soh/soh/Enhancements/ExtraModes/HurtContainer.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp b/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp
index 00f5c49bc..98132cd26 100644
--- a/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp
+++ b/soh/soh/Enhancements/ExtraModes/IvanCoop.cpp
@@ -1,9 +1,9 @@
 #include "soh/ActorDB.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h"
 
 extern "C" {
+#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h"
 #include "macros.h"
 #include "functions.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp b/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp
index 68284a483..d94a1af99 100644
--- a/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp
+++ b/soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp
@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "functions.h"
-#include "src/overlays/actors/ovl_En_Fz/z_en_fz.h"
 #include "src/overlays/actors/ovl_En_Crow/z_en_crow.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
 extern void EnCrow_TurnAway(EnCrow*, PlayState*);
diff --git a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
index 17d457ef2..24c7681f8 100644
--- a/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
+++ b/soh/soh/Enhancements/ExtraModes/RupeeDash.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
index abe9144da..1bb5e2829 100644
--- a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
+++ b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "functions.h"
+}
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/FileSelectEnhancements.h b/soh/soh/Enhancements/FileSelectEnhancements.h
index 4aeea89cb..6ee38de50 100644
--- a/soh/soh/Enhancements/FileSelectEnhancements.h
+++ b/soh/soh/Enhancements/FileSelectEnhancements.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "z64.h"
+#include <libultraship/libultra/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp b/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp
index 1d4a55f5d..5ea9fb916 100644
--- a/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp
+++ b/soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp b/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp
index be5b25a58..85e227a03 100644
--- a/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp
+++ b/soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp b/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp
index 23e0a1fd6..d9e70fa90 100644
--- a/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp
+++ b/soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/DirtPathFix.cpp b/soh/soh/Enhancements/Fixes/DirtPathFix.cpp
index 023e8f2c8..e9acff6ee 100644
--- a/soh/soh/Enhancements/Fixes/DirtPathFix.cpp
+++ b/soh/soh/Enhancements/Fixes/DirtPathFix.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp b/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp
index 6efcbf565..eb088e234 100644
--- a/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp
+++ b/soh/soh/Enhancements/Fixes/FixFlexDrops.cpp
@@ -1,8 +1,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+#include "soh/cvar_prefixes.h"
 
 extern "C" {
-#include "z64.h"
 // Converts a drop id based on age, health and owned items. Returns -1 when the drop can't be given.
 s16 func_8001F404(s16 dropId);
 }
diff --git a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
index d0525ac6a..9c0627f48 100644
--- a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
+++ b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp b/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp
index a49c086d8..657c49990 100644
--- a/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp
+++ b/soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp
@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
index 86b13d513..d1a164a93 100644
--- a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
+++ b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Fixes/HammerHandFix.cpp b/soh/soh/Enhancements/Fixes/HammerHandFix.cpp
index 2d0da1795..1f6b65708 100644
--- a/soh/soh/Enhancements/Fixes/HammerHandFix.cpp
+++ b/soh/soh/Enhancements/Fixes/HammerHandFix.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp b/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp
index 06e95107b..7c57ed7dc 100644
--- a/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp
+++ b/soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
index 7a8dccce3..9ae715850 100644
--- a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
+++ b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -13,7 +13,6 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Poh/z_en_poh.h"
 #include "src/overlays/actors/ovl_En_Tp/z_en_tp.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
-
 extern SaveContext gSaveContext;
 }
 
diff --git a/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp b/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp
index b24bd54ba..b99fe2801 100644
--- a/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp
+++ b/soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ResourceManagerHelpers.h"
 
diff --git a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
index 9bf42d5c7..fb17fdcf3 100644
--- a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
+++ b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/resource/type/scenecommand/SetTimeSettings.h"
 
diff --git a/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp b/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp
index ad4a6e6d3..b2c50e9bc 100644
--- a/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp
+++ b/soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp
@@ -1,8 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/ShipInit.hpp"
 #include <set>
 #include <unordered_map>
 
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
 extern "C" {
 #include "functions.h"
 #include "variables.h"
diff --git a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp
index 654aef388..bd41f1348 100644
--- a/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp
+++ b/soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp b/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp
index 742549504..561150d4b 100644
--- a/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp
+++ b/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
index 78cca0200..2e1aea757 100644
--- a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
+++ b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Items/ArrowCycle.cpp b/soh/soh/Enhancements/Items/ArrowCycle.cpp
index beb6ac2f6..cf974041c 100644
--- a/soh/soh/Enhancements/Items/ArrowCycle.cpp
+++ b/soh/soh/Enhancements/Items/ArrowCycle.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -7,10 +7,8 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
-
 s32 func_808351D4(Player* thisx, PlayState* play); // Arrow nocked
 void EnArrow_Init(Actor* thisx, PlayState* play);
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp b/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp
index 50dc0621d..ec4576a9a 100644
--- a/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp
+++ b/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp
@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64.h"
 #include "macros.h"
 #include "variables.h"
-
 extern s32 Player_GetItemOnButton(PlayState*, s32);
 extern void Inventory_ChangeEquipment(s16, u16);
 extern void Player_SetEquipmentData(PlayState*, Player*);
diff --git a/soh/soh/Enhancements/Items/BlueFireArrows.cpp b/soh/soh/Enhancements/Items/BlueFireArrows.cpp
index 985767853..5f5fe8f2a 100644
--- a/soh/soh/Enhancements/Items/BlueFireArrows.cpp
+++ b/soh/soh/Enhancements/Items/BlueFireArrows.cpp
@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h"
 #include "overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/Items/ItemUnequip.cpp b/soh/soh/Enhancements/Items/ItemUnequip.cpp
index 46896189c..1f5057c78 100644
--- a/soh/soh/Enhancements/Items/ItemUnequip.cpp
+++ b/soh/soh/Enhancements/Items/ItemUnequip.cpp
@@ -6,7 +6,6 @@ extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
 extern SaveContext gSaveContext;
 }
 
diff --git a/soh/soh/Enhancements/Items/MaskSelect.cpp b/soh/soh/Enhancements/Items/MaskSelect.cpp
index 2d5d2bbe3..e0e5ecaa8 100644
--- a/soh/soh/Enhancements/Items/MaskSelect.cpp
+++ b/soh/soh/Enhancements/Items/MaskSelect.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Items/RemoteBombchu.cpp b/soh/soh/Enhancements/Items/RemoteBombchu.cpp
index c34dc976a..08561d970 100644
--- a/soh/soh/Enhancements/Items/RemoteBombchu.cpp
+++ b/soh/soh/Enhancements/Items/RemoteBombchu.cpp
@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
+#include "functions.h"
 #include "src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
-
 void EnBomChu_Move(EnBomChu*, PlayState*);
 void EnBomChu_Explode(EnBomChu*, PlayState*);
 s32 Camera_BGCheck(Camera* camera, Vec3f* from, Vec3f* to);
diff --git a/soh/soh/Enhancements/Items/SunlightArrows.cpp b/soh/soh/Enhancements/Items/SunlightArrows.cpp
index 73e894c24..524e40eb6 100644
--- a/soh/soh/Enhancements/Items/SunlightArrows.cpp
+++ b/soh/soh/Enhancements/Items/SunlightArrows.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ObjectExtension/ObjectExtension.h"
diff --git a/soh/soh/Enhancements/Lang/Lang.cpp b/soh/soh/Enhancements/Lang/Lang.cpp
index 981e372c3..4c44e0676 100644
--- a/soh/soh/Enhancements/Lang/Lang.cpp
+++ b/soh/soh/Enhancements/Lang/Lang.cpp
@@ -1,20 +1,17 @@
-#include "Lang.h"
-
-#include "soh/SohGui/MenuTypes.h"
-#include "soh/SohGui/SohGui.hpp"
-#include "soh/SohGui/SohMenu.h"
-#include "soh/util.h"
+#include <memory>
 
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "ship/Context.h"
 #include "ship/resource/File.h"
-#include "ship/resource/ResourceManager.h"
 #include "ship/resource/type/Json.h"
 #include "ship/utils/StringHelper.h"
 
+#include "Lang.h"
+#include "soh/SohGui/MenuTypes.h"
+#include "soh/SohGui/SohMenu.h"
+#include "soh/util.h"
 #include "spdlog/spdlog.h"
 
-#include <memory>
-
 namespace SohGui {
 extern std::shared_ptr<SohMenu> mSohMenu;
 }
diff --git a/soh/soh/Enhancements/Minigames/BombchuBowling.cpp b/soh/soh/Enhancements/Minigames/BombchuBowling.cpp
index 1d734d7f1..63807f842 100644
--- a/soh/soh/Enhancements/Minigames/BombchuBowling.cpp
+++ b/soh/soh/Enhancements/Minigames/BombchuBowling.cpp
@@ -1,5 +1,5 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp b/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp
index 35fb97f45..64e4d657b 100644
--- a/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp
+++ b/soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp b/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp
index ff5e717aa..bd8afe563 100644
--- a/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp
+++ b/soh/soh/Enhancements/Minigames/DivingGameTimer.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp b/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp
index ba4f20a90..8133268c7 100644
--- a/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp
+++ b/soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp
@@ -1,11 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
 extern PlayState* gPlayState;
-
 extern void EnFr_SetupReward(EnFr* enFr, PlayState* play, u8 unkCondition);
 }
 
diff --git a/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp b/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp
index 282662a76..f3332fce0 100644
--- a/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp
+++ b/soh/soh/Enhancements/Minigames/HorsebackArchery.cpp
@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
 extern SaveContext gSaveContext;
-
 extern void EnGe1_TalkAfterGame_Archery(EnGe1* enGe1, PlayState* play);
 }
 
diff --git a/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp b/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp
index afcea2d14..75ad1d2ec 100644
--- a/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp
+++ b/soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp
@@ -1,5 +1,5 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp b/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp
index 18f926c3d..3671c67d2 100644
--- a/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp
+++ b/soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -6,7 +6,6 @@ extern "C" {
 #include "variables.h"
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 extern PlayState* gPlayState;
-
 void EnSkj_WaitForPlayback(EnSkj* enSkj, PlayState* play);
 }
 
diff --git a/soh/soh/Enhancements/Minigames/ShootingGallery.cpp b/soh/soh/Enhancements/Minigames/ShootingGallery.cpp
index 8af35223f..fb44c1554 100644
--- a/soh/soh/Enhancements/Minigames/ShootingGallery.cpp
+++ b/soh/soh/Enhancements/Minigames/ShootingGallery.cpp
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/QoL/DaytimeGS.cpp b/soh/soh/Enhancements/QoL/DaytimeGS.cpp
index b6076ef40..f151b15f3 100644
--- a/soh/soh/Enhancements/QoL/DaytimeGS.cpp
+++ b/soh/soh/Enhancements/QoL/DaytimeGS.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp b/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp
index 0faea5ee2..d7a2aea36 100644
--- a/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp
+++ b/soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp
@@ -4,7 +4,6 @@
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Butte/z_en_butte.h"
-#include "variables.h"
 extern void EnButte_SetupTransformIntoFairy(EnButte* enButte);
 }
 
diff --git a/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp b/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp
index 772955ece..1c6907bc2 100644
--- a/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp
+++ b/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp
@@ -1,5 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
 #include "variables.h"
diff --git a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
index 9cbb3de05..d137233f3 100644
--- a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
+++ b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
@@ -1,10 +1,13 @@
 #include "soh/ShipInit.hpp"
+#include "soh/Enhancements/enhancementTypes.h"
+#include "soh/Enhancements/SwitchAge.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/SwitchAge.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+}
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/QoL/OpenAllHours.cpp b/soh/soh/Enhancements/QoL/OpenAllHours.cpp
index fd8d1a2ad..67d727406 100644
--- a/soh/soh/Enhancements/QoL/OpenAllHours.cpp
+++ b/soh/soh/Enhancements/QoL/OpenAllHours.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
diff --git a/soh/soh/Enhancements/QoL/PauseWarp.cpp b/soh/soh/Enhancements/QoL/PauseWarp.cpp
index 58f7ab5d4..21d93fc66 100644
--- a/soh/soh/Enhancements/QoL/PauseWarp.cpp
+++ b/soh/soh/Enhancements/QoL/PauseWarp.cpp
@@ -1,15 +1,12 @@
-#include <string>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-
 extern PlayState* gPlayState;
-
 u8 Randomizer_GetSettingValue(RandomizerSettingKey);
 }
 
diff --git a/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp b/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp
index 8ca11e4e6..ea68ef7b2 100644
--- a/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp
+++ b/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp b/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp
index b3048be53..137bcb8b7 100644
--- a/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp
+++ b/soh/soh/Enhancements/QoL/ResetNaviTimer.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
index 9ffc33f40..f4167b70f 100644
--- a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
+++ b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
@@ -1,11 +1,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "soh/OTRGlobals.h"
 
 extern "C" {
 #include "z64.h"
 #include "macros.h"
-#include "functions.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp b/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp
index 23c6198dc..778d50929 100644
--- a/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp
+++ b/soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp
@@ -1,12 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
-#include "macros.h"
 #include "variables.h"
 #include "z64save.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/ResetGameplayFrames.cpp b/soh/soh/Enhancements/ResetGameplayFrames.cpp
index 3b234dbe5..d3a5a022e 100644
--- a/soh/soh/Enhancements/ResetGameplayFrames.cpp
+++ b/soh/soh/Enhancements/ResetGameplayFrames.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Restorations/BottleAdventure.cpp b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp
index ef4a8d4e8..624bfa571 100644
--- a/soh/soh/Enhancements/Restorations/BottleAdventure.cpp
+++ b/soh/soh/Enhancements/Restorations/BottleAdventure.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp b/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp
index 9f0a92e69..78cb6b695 100644
--- a/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp
+++ b/soh/soh/Enhancements/Restorations/GetItemManipulation.cpp
@@ -1,13 +1,10 @@
+#include <libultraship/bridge/consolevariablebridge.h>
+
 #include "GetItemManipulation.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/item-tables/ItemTableManager.h"
-#include "soh/OTRGlobals.h"
-#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64.h"
-#include "macros.h"
-#include "variables.h"
 extern PlayState* gPlayState;
 GetItemID RetrieveGetItemIDFromItemID(ItemID itemID);
 }
diff --git a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
index f36c07a48..2de8edad3 100644
--- a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
+++ b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
@@ -1,11 +1,12 @@
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
-#include "functions.h"
+#include "soh/cvar_prefixes.h"
 #include "soh/resource/type/Scene.h"
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/type/scenecommand/SetCollisionHeader.h"
-#include <ship/Context.h>
-#include <ship/resource/ResourceManager.h>
 
 #define CVAR_GRAVE_HOLE_NAME CVAR_ENHANCEMENT("GraveHoles")
 #define GRAVE_HOLES_DEFAULT 0
diff --git a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
index a9a1b6105..d3e1af918 100644
--- a/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
+++ b/soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp
@@ -1,11 +1,7 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/gameconsole.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "variables.h"
-#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
-}
-
 #define CVAR_BUFFER_NAME CVAR_ENHANCEMENT("PauseBufferWindow")
 #define CVAR_BUFFER_DEFAULT 0
 #define CVAR_BUFFER_VALUE CVarGetInteger(CVAR_BUFFER_NAME, CVAR_BUFFER_DEFAULT)
diff --git a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
index ce9b7e7a1..17a392462 100644
--- a/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
+++ b/soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp
@@ -1,5 +1,6 @@
 #include <libultraship/bridge/consolevariablebridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/SpeedModifiers.cpp b/soh/soh/Enhancements/SpeedModifiers.cpp
index 9193485e9..b1a87a6ab 100644
--- a/soh/soh/Enhancements/SpeedModifiers.cpp
+++ b/soh/soh/Enhancements/SpeedModifiers.cpp
@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "z64.h"
-#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/SwitchAge.cpp b/soh/soh/Enhancements/SwitchAge.cpp
index a8ff5f19d..71848f7eb 100644
--- a/soh/soh/Enhancements/SwitchAge.cpp
+++ b/soh/soh/Enhancements/SwitchAge.cpp
@@ -5,8 +5,6 @@ extern "C" {
 #include <z64.h>
 #include "macros.h"
 #include "variables.h"
-#include "functions.h"
-
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
index 288b07abe..fa82a76f8 100644
--- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
+++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
@@ -1,19 +1,15 @@
-#include "TimeDisplay.h"
-#include "soh/Enhancements/gameplaystats.h"
-#include <global.h>
-
-#include "assets/textures/parameter_static/parameter_static.h"
-#include "assets/soh_assets.h"
-#include "soh/SohGui/ImGuiUtils.h"
-
 #include <fast/Fast3dGui.h>
 #include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>
-#include <spdlog/common.h>
+
+#include "TimeDisplay.h"
+#include "soh/Enhancements/gameplaystats.h"
+#include "soh/SohGui/ImGuiUtils.h"
 
 extern "C" {
+#include "assets/textures/parameter_static/parameter_static.h"
+#include "assets/soh_assets.h"
 #include "macros.h"
-#include "functions.h"
 #include "variables.h"
 extern PlayState* gPlayState;
 uint64_t GetUnixTimestamp();
diff --git a/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp b/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp
index 683e7fbca..73d608bd8 100644
--- a/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp
+++ b/soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp
@@ -1,5 +1,4 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
index b5bf4424d..caa43c61d 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp
@@ -5,7 +5,6 @@ extern "C" {
 #include "z64.h"
 #include "z64save.h"
 #include "macros.h"
-#include "variables.h"
 #include "functions.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
diff --git a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
index 730defe71..1bcbbfaa7 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp
@@ -6,7 +6,6 @@ extern "C" {
 #include "z64save.h"
 #include "macros.h"
 #include "variables.h"
-#include "functions.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
 }
diff --git a/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp b/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp
index 3c3edf54d..23fc3ed51 100644
--- a/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp
+++ b/soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp
@@ -1,8 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "global.h"
 
 extern "C" {
+#include "functions.h"
+#include "macros.h"
 void Player_SetupRoll(Player* player, PlayState* play);
 }
 
diff --git a/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp b/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp
index ed1bd2b97..bd74d0d59 100644
--- a/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp
+++ b/soh/soh/Enhancements/TimeSavers/MarketSneak.cpp
@@ -1,4 +1,3 @@
-#include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
@@ -10,10 +9,8 @@ extern "C" {
 #include <variables.h>
 #include "overlays/actors/ovl_En_Heishi4/z_en_heishi4.h"
 extern PlayState* gPlayState;
-
 // the guard's idle action func, restored once the sneak prompt is answered
 void func_80A56614(EnHeishi4* heishi, PlayState* play);
-
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 }
 
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
index e8d94d9e4..6a72312c6 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp
@@ -5,7 +5,6 @@
 extern "C" {
 #include "macros.h"
 #include "z64save.h"
-#include "functions.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
diff --git a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp
index 3e800fb68..cddc1472f 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp
@@ -1,12 +1,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "seqcmd.h"
 #include "src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h"
-#include "assets/objects/object_tw/object_tw.h"
 extern BossTw* sTwinrovaPtr;
 extern void BossTw_SetupFlyTo(BossTw*, PlayState*);
 extern void BossTw_SetupWait(BossTw*, PlayState*);
diff --git a/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp b/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp
index 22e7ed305..51d0f0b5d 100644
--- a/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp
+++ b/soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/Warping.cpp b/soh/soh/Enhancements/Warping.cpp
index 93e0cd899..50cb8fe0c 100644
--- a/soh/soh/Enhancements/Warping.cpp
+++ b/soh/soh/Enhancements/Warping.cpp
@@ -1,16 +1,19 @@
 #include <ship/Context.h>
 #include <ship/config/Config.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
-#include "functions.h"
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/util.h"
+#include "soh/Enhancements/gameconsole.h"
 
 extern "C" {
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
 #include "z64.h"
-#include "global.h"
 #include "soh/Enhancements/enhancementTypes.h"
 void Sram_InitDebugSave(void);
 void Select_LoadGame(SelectContext* selectContext, s32 entranceIndex);
diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp
index 95b22e464..891a3d06a 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.cpp
+++ b/soh/soh/Enhancements/audio/AudioEditor.cpp
@@ -1,14 +1,11 @@
-#include "AudioEditor.h"
-#include "sequence.h"
-
 #include <map>
 #include <set>
 #include <string>
-#include <functions.h>
+
+#include "AudioEditor.h"
 #include "soh/ShipUtils.h"
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
-#include <ship/utils/StringHelper.h>
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
 #include "AudioCollection.h"
@@ -18,6 +15,8 @@
 #include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
+#include "sequence.h"
+#include <functions.h>
 #include "z64save.h"
 extern SaveContext gSaveContext;
 }
diff --git a/soh/soh/Enhancements/audio/AudioHooks.cpp b/soh/soh/Enhancements/audio/AudioHooks.cpp
index 00d9b9b50..aad81b542 100644
--- a/soh/soh/Enhancements/audio/AudioHooks.cpp
+++ b/soh/soh/Enhancements/audio/AudioHooks.cpp
@@ -1,13 +1,12 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include <ship/window/gui/IconsFontAwesome4.h>
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "AudioCollection.h"
 #include <soh/Notification/Notification.h>
-#include <soh/SohGui/ImGuiUtils.h>
-#include <ship/window/gui/IconsFontAwesome4.h>
 
 extern "C" {
 #include "variables.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp b/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp
index 0047f7cff..8e7853ed0 100644
--- a/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp
+++ b/soh/soh/Enhancements/audio/EnemyBGMDisable.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp b/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp
index 423776e3c..80c908547 100644
--- a/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp
+++ b/soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp
@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp
index d71cbe895..ae5e0e7f9 100644
--- a/soh/soh/Enhancements/boss-rush/BossRush.cpp
+++ b/soh/soh/Enhancements/boss-rush/BossRush.cpp
@@ -1,16 +1,17 @@
+#include <array>
+#include <string>
+#include <vector>
+
+#include <spdlog/spdlog.h>
+
 #include "BossRush.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh_assets.h"
 #include "soh/frame_interpolation.h"
 
-#include <array>
-#include <string>
-#include <vector>
-#include <spdlog/spdlog.h>
-
 extern "C" {
+#include "soh_assets.h"
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
@@ -22,9 +23,7 @@ extern "C" {
 #include "textures/icon_item_nes_static/icon_item_nes_static.h"
 #include "textures/icon_item_ger_static/icon_item_ger_static.h"
 #include "textures/icon_item_fra_static/icon_item_fra_static.h"
-
 extern PlayState* gPlayState;
-
 Gfx* KaleidoScope_QuadTextureIA8(Gfx* gfx, void* texture, s16 width, s16 height, u16 point);
 void FileChoose_UpdateStickDirectionPromptAnim(GameState* thisx);
 void FileChoose_DrawTextRec(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a, f32 x, f32 y, f32 z, s32 s, s32 t,
diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp
index 161610e93..53bfb9ba1 100644
--- a/soh/soh/Enhancements/controls/InputViewer.cpp
+++ b/soh/soh/Enhancements/controls/InputViewer.cpp
@@ -1,19 +1,16 @@
-#include "InputViewer.h"
-
 #include <libultraship/bridge/consolevariablebridge.h>
 #include "libultraship/libultra/controller.h"
 #include <ship/Context.h>
 #include <libultraship/controller/controldeck/ControlDeck.h>
-#include "soh/OTRGlobals.h"
 #include <imgui.h>
 #include <spdlog/spdlog.h>
-#include <cmath>
+#include <fast/Fast3dGui.h>
 
+#include "InputViewer.h"
+#include "soh/OTRGlobals.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 
-#include <fast/Fast3dGui.h>
-
 using namespace UIWidgets;
 
 // Text colors
diff --git a/soh/soh/Enhancements/controls/Mouse.cpp b/soh/soh/Enhancements/controls/Mouse.cpp
index 043b7f899..c745c22de 100644
--- a/soh/soh/Enhancements/controls/Mouse.cpp
+++ b/soh/soh/Enhancements/controls/Mouse.cpp
@@ -1,12 +1,17 @@
-#include "Mouse.h"
-#include "soh/OTRGlobals.h"
-#include "z64player.h"
-#include "global.h"
 #include <ship/Context.h>
 #include <ship/window/Window.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
+#include "Mouse.h"
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
+extern "C" {
+#include "z64player.h"
+#include "functions.h"
+#include "macros.h"
+}
+
 static Ship::Coords mouseCoord = {};
 static Ship::Coords mouseCoordRel = {};
 
diff --git a/soh/soh/Enhancements/controls/Mouse.h b/soh/soh/Enhancements/controls/Mouse.h
index c22d9ac5c..ea10a6150 100644
--- a/soh/soh/Enhancements/controls/Mouse.h
+++ b/soh/soh/Enhancements/controls/Mouse.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libultraship/libultra.h>
+#include <libultraship/libultra/types.h>
 
 struct Player;
 
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
index f61139922..74fa7d989 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.cpp
@@ -1,13 +1,17 @@
-#include "SohInputEditorWindow.h"
 #include <ship/controller/controldeck/ControlDeck.h>
 #include <ship/utils/StringHelper.h>
-#include <libultraship/libultra.h>
 #include <fast/Fast3dWindow.h>
+
+#include "SohInputEditorWindow.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
-#include "z64.h"
 #include "soh/cvar_prefixes.h"
+
+extern "C" {
+#include "z64.h"
+}
+
 #ifndef __WIIU__
 #include <ship/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h>
 #endif
diff --git a/soh/soh/Enhancements/controls/SohInputEditorWindow.h b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
index c6fe82603..47037c50d 100644
--- a/soh/soh/Enhancements/controls/SohInputEditorWindow.h
+++ b/soh/soh/Enhancements/controls/SohInputEditorWindow.h
@@ -8,7 +8,8 @@
 #include <set>
 #include <list>
 
-#include <ship/controller/controldevice/controller/Controller.h>
+#include <ship/controller/controldevice/controller/mapping/ControllerAxisDirectionMapping.h>
+#include <ship/controller/controldevice/controller/mapping/ControllerRumbleMapping.h>
 #include <ship/window/gui/GuiWindow.h>
 
 typedef CONTROLLERBUTTONS_T N64ButtonMask;
diff --git a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
index 767f8bf9c..7df9c4a07 100644
--- a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
+++ b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
index 43f911f46..c606dbbab 100644
--- a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
+++ b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/resource/type/Skeleton.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
index 1b204be28..19687795d 100644
--- a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
+++ b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
@@ -1,20 +1,24 @@
+#include "ship/utils/color.h"
+
+#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/SaveManager.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+#include "soh/frame_interpolation.h"
+
+extern "C" {
 #include "z64.h"
 #include "textures/icon_item_static/icon_item_static.h"
 #include "textures/icon_item_24_static/icon_item_24_static.h"
 #include "textures/icon_item_dungeon_static/icon_item_dungeon_static.h"
 #include "textures/parameter_static/parameter_static.h"
 #include "soh_assets.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include "soh/SaveManager.h"
-#include "soh/frame_interpolation.h"
-#include "ship/utils/color.h"
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
 #include "src/overlays/gamestates/ovl_file_choose/file_choose.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/ShipInit.hpp"
 #include "assets/textures/title_static/title_static.h"
+}
 
 /*
  * TODO:
diff --git a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
index 1126021e4..e8fffdf78 100644
--- a/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
+++ b/soh/soh/Enhancements/cosmetics/NoMasterSword.cpp
@@ -1,15 +1,14 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/ShipInit.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
-#include "objects/object_link_boy/object_link_boy.h"
 
 extern "C" {
+#include "objects/object_link_boy/object_link_boy.h"
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-
 extern PlayState* gPlayState;
 extern void Player_StartMode_Idle(PlayState*, Player*);
 extern u8 Randomizer_GetSettingValue(RandomizerSettingKey);
diff --git a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
index 0cb528c0a..24c52cb48 100644
--- a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
+++ b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 
diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
index 3d0012b6c..92f38fefa 100644
--- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
+++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
@@ -1,11 +1,12 @@
 #include <string>
+
 #include <libultraship/bridge/consolevariablebridge.h>
 #include <libultraship/bridge/resourcebridge.h>
+
 #include "soh/cvar_prefixes.h"
 #include "soh/ResourceManagerHelpers.h"
 
 extern "C" {
-#include <libultraship/libultra.h>
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "objects/object_fz/object_fz.h"
 #include "objects/object_gi_soldout/object_gi_soldout.h"
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index 5c959992d..7ca9a65b7 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -1,10 +1,11 @@
-#include "debugconsole.h"
+#include <vector>
+#include <string>
+
 #include <ship/utils/Utils.h>
+
+#include "debugconsole.h"
 #include "savestates.h"
 #include "soh/ActorDB.h"
-
-#include <vector>
-#include <string>
 #include "soh/OTRGlobals.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
@@ -16,9 +17,7 @@
 
 #define Path _Path
 #define PATH_HACK
-#include <ship/utils/StringHelper.h>
 
-#include <ship/window/Window.h>
 #include <ship/Context.h>
 #undef PATH_HACK
 #undef Path
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp
index 8f5808024..27241ffd6 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@@ -1,18 +1,16 @@
 #include "MessageViewer.h"
-
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/SohMenu.h"
-#include "soh/OTRGlobals.h"
+#include "../custom-message/CustomMessageManager.h"
+#include "soh/util.h"
 
+extern "C" {
 #include <textures/message_static/message_static.h>
-
-#include "../custom-message/CustomMessageManager.h"
 #include "functions.h"
 #include "macros.h"
 #include "message_data_static.h"
-#include "variables.h"
-#include "soh/util.h"
+}
 
 extern "C" u8 sMessageHasSetSfx;
 
diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp
index dcc8345ef..ed3be3fe1 100644
--- a/soh/soh/Enhancements/debugger/actorViewer.cpp
+++ b/soh/soh/Enhancements/debugger/actorViewer.cpp
@@ -1,3 +1,8 @@
+#include <algorithm>
+#include <array>
+#include <unordered_map>
+#include <string>
+
 #include "actorViewer.h"
 #include "../../util.h"
 #include "soh/SohGui/UIWidgets.hpp"
@@ -6,13 +11,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/nametag.h"
 #include "soh/ShipInit.hpp"
-
-#include <algorithm>
-#include <array>
-#include <unordered_map>
-#include <string>
-#include <spdlog/common.h>
-#include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 #include "soh/ObjectExtension/ActorListIndex.h"
 
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index c44ad0cb4..4e874976d 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1,5 +1,12 @@
+#include <algorithm>
+#include <array>
+#include <bit>
+#include <map>
+#include <string>
+
+#include <fast/Fast3dGui.h>
+
 #include "debugSaveEditor.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/Enhancements/randomizer/item.h"
@@ -12,28 +19,17 @@
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SaveManager.h"
-#include "soh/ResourceManagerHelpers.h"
-
-#include <spdlog/common.h>
-#include <spdlog/fmt/fmt.h>
-#include <algorithm>
-#include <array>
-#include <bit>
-#include <map>
-#include <string>
-#include <soh_assets.h>
-
-#include <fast/Fast3dGui.h>
 
 extern "C" {
+#include <soh_assets.h>
 #include <z64.h>
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
+#include "message_data_static.h"
 extern PlayState* gPlayState;
 }
 
-#include "message_data_static.h"
 extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
 extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
 extern "C" MessageTableEntry* sJpnMessageEntryTablePtr;
diff --git a/soh/soh/Enhancements/debugger/dlViewer.cpp b/soh/soh/Enhancements/debugger/dlViewer.cpp
index 82107309a..9a1239abe 100644
--- a/soh/soh/Enhancements/debugger/dlViewer.cpp
+++ b/soh/soh/Enhancements/debugger/dlViewer.cpp
@@ -1,14 +1,13 @@
-#include "soh/util.h"
-#include "soh/SohGui/UIWidgets.hpp"
-#include "soh/SohGui/SohGui.hpp"
+#include <map>
+#include <string>
+
 #include <libultraship/bridge/resourcebridge.h>
-#include <ship/resource/ResourceManager.h>
 #include <fast/resource/ResourceType.h>
 #include <fast/resource/type/DisplayList.h>
-#include "soh/OTRGlobals.h"
 
-#include <map>
-#include <string>
+#include "soh/SohGui/UIWidgets.hpp"
+#include "soh/SohGui/SohGui.hpp"
+#include "soh/OTRGlobals.h"
 #include "dlViewer.h"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/gameconsole.c b/soh/soh/Enhancements/gameconsole.c
index 4cf300245..f28a35173 100644
--- a/soh/soh/Enhancements/gameconsole.c
+++ b/soh/soh/Enhancements/gameconsole.c
@@ -1,5 +1,4 @@
 #include "gameconsole.h"
-#include <functions.h>
 
 extern PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp
index 9602775b1..2409b53b2 100644
--- a/soh/soh/Enhancements/gameplaystats.cpp
+++ b/soh/soh/Enhancements/gameplaystats.cpp
@@ -1,19 +1,17 @@
-#include "gameplaystats.h"
+#include <string>
 
+#include "gameplaystats.h"
 #include "soh/SaveManager.h"
-#include "functions.h"
-#include "macros.h"
 #include "soh/cvar_prefixes.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/util.h"
-
-#include <string>
-#include <spdlog/common.h>
 #include "soh/Enhancements/BunnyHood.h"
 #include "soh/OTRGlobals.h"
 
 extern "C" {
+#include "functions.h"
+#include "macros.h"
 #include <z64.h>
 #include "variables.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp
index 9e78d5679..affeca7f5 100644
--- a/soh/soh/Enhancements/kaleido.cpp
+++ b/soh/soh/Enhancements/kaleido.cpp
@@ -1,30 +1,26 @@
-#include "kaleido.h"
+#include <sstream>
 
-#include "objects/gameplay_keep/gameplay_keep.h"
 #include "ship/utils/StringHelper.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include <libultraship/bridge/consolevariablebridge.h>
+
+#include "kaleido.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ShipUtils.h"
+#include "soh/OTRGlobals.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 
 extern "C" {
+#include "objects/gameplay_keep/gameplay_keep.h"
 #include "z64.h"
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
 #include <textures/parameter_static/parameter_static.h>
-extern PlayState* gPlayState;
-}
-#include "soh/OTRGlobals.h"
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh_assets.h"
 #include "textures/icon_item_static/icon_item_static.h"
-#include <libultraship/bridge/consolevariablebridge.h>
-#include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
-
-#include <sstream>
-
-extern "C" {
+extern PlayState* gPlayState;
 void KaleidoScope_MoveCursorToSpecialPos(PlayState* play, u16 specialPos);
 }
 
diff --git a/soh/soh/Enhancements/nametag.h b/soh/soh/Enhancements/nametag.h
index afc8b2176..4649c5ba9 100644
--- a/soh/soh/Enhancements/nametag.h
+++ b/soh/soh/Enhancements/nametag.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libultraship/color.h>
+#include <ship/utils/color.h>
 
 struct Actor;
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 41d58d842..f7c9b351c 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,4 +1,3 @@
-#include "../SeedContext.h"
 #include "../static_data.h"
 
 using namespace std::literals::string_literals;
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index bc5f393e8..68ae12bd5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -1,14 +1,12 @@
-#include "item_pool.hpp"
+#include <algorithm>
 
+#include "item_pool.hpp"
 #include "../dungeon.h"
-#include "fill.hpp"
+#include "soh/Enhancements/randomizer/location_access.h"
 #include "../static_data.h"
 #include "../SeedContext.h"
 #include "../rng.h"
 #include "soh/Enhancements/randomizer/Traps.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include <algorithm>
-#include <spdlog/spdlog.h>
 
 std::vector<RandomizerGet> itemPool = {};
 std::vector<RandomizerGet> lesserPool = {};
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
index b8bda99fd..20c6b75a4 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
@@ -2,7 +2,7 @@
 
 #include <cstddef>
 #include <vector>
-#include "../randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 
 class ItemLocation;
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.hpp b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
index 767472b1d..b95de49cc 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 #include <set>
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 
 #define OPTION_SUB_MENU 1
 #define SUB_MENU 2
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index 6bc957039..fbae1e072 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -1,13 +1,12 @@
-#include "item_pool.hpp"
-#include "../location_access.h"
-#include "../rng.h"
-#include "shops.hpp"
-#include "../location.h"
-
 #include <array>
 #include <math.h>
+
 #include <spdlog/spdlog.h>
 
+#include "../rng.h"
+#include "shops.hpp"
+#include "../location.h"
+
 PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice,
                                          RandomizerSettingKey _range1, RandomizerSettingKey _range2,
                                          RandomizerSettingKey _noWallet, RandomizerSettingKey _childWallet,
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
index f9cb2ab48..7e8b280cf 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
@@ -1,9 +1,6 @@
 #include "starting_inventory.hpp"
-
 #include "../dungeon.h"
 #include "../SeedContext.h"
-#include "../logic.h"
-#include "pool_functions.hpp"
 #include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/util.h"
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
index 6c63dda95..b09b67616 100644
--- a/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 
 #include <vector>
 #include <stdint.h>
diff --git a/soh/soh/Enhancements/randomizer/BigPoes.cpp b/soh/soh/Enhancements/randomizer/BigPoes.cpp
index a78fbe830..b117914dc 100644
--- a/soh/soh/Enhancements/randomizer/BigPoes.cpp
+++ b/soh/soh/Enhancements/randomizer/BigPoes.cpp
@@ -1,8 +1,10 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageManager.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
+#include "functions.h"
 #include "overlays/actors/ovl_En_Po_Field/z_en_po_field.h"
 #include "overlays/actors/ovl_En_Gb/z_en_gb.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp b/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp
index 69ffbf134..6cd88aabe 100644
--- a/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp
+++ b/soh/soh/Enhancements/randomizer/LakeHyliaWaterControl.cpp
@@ -1,17 +1,15 @@
-#include "soh/OTRGlobals.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include <libultraship/bridge/resourcebridge.h>
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
-#include <libultraship/bridge/resourcebridge.h>
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "macros.h"
 #include "functions.h"
-#include "variables.h"
 #include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h"
 #include "textures/map_grand_static/map_grand_static.h"
-
+extern PlayState* gPlayState;
 extern void BgSpot06Objects_LockFloat(BgSpot06Objects*, PlayState*);
 extern void BgSpot06Objects_WaterControl_Lower(BgSpot06Objects*, PlayState*);
 extern void BgSpot06Objects_WaterControl_Raise(BgSpot06Objects*, PlayState*);
diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
index fdc3e1659..3c238d105 100644
--- a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
+++ b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
@@ -1,11 +1,10 @@
-#include "soh/OTRGlobals.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
+extern PlayState* gPlayState;
 }
 
 using SceneDoorParamsPair = std::pair<int, int>;
diff --git a/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp b/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp
index f67a020b6..b2854426e 100644
--- a/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/EntranceHints.cpp
@@ -1,7 +1,7 @@
 #include "soh/Enhancements/randomizer/entrance.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance_tracker.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/soh/soh/Enhancements/randomizer/Messages/Goron.cpp b/soh/soh/Enhancements/randomizer/Messages/Goron.cpp
index 3e0b2c79e..d3e8cb366 100644
--- a/soh/soh/Enhancements/randomizer/Messages/Goron.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/Goron.cpp
@@ -2,8 +2,12 @@
  * Handles the randomized silly messages that the Fire Temple
  * trapped Gorons have when you free them.
  */
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageManager.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/ShipInit.hpp"
+#include "soh/ShipUtils.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp b/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp
index 951637cd9..4b4069119 100644
--- a/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/GossipStoneHints.cpp
@@ -2,15 +2,17 @@
  * This file handles the custom messages for Gossip Stone
  * hints.
  */
+
 #include <soh/OTRGlobals.h>
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include <macros.h>
 #include <functions.h>
 #include <variables.h>
+extern PlayState* gPlayState;
 }
 
 // Resolves a hint's message for textbox display, firing OnRandoHintRevealed so
diff --git a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
index 0f48d7740..b06164292 100644
--- a/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/ItemMessages.cpp
@@ -4,9 +4,12 @@
  * Vanilla/MQ hints when collecting Maps, Ice Trap messages,
  * etc.
  */
+
+#include <cstdarg>
+#include <algorithm>
+
 #include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
 #include "soh/Enhancements/randomizer/Traps.h"
 #include "soh/Enhancements/randomizer/item.h"
@@ -14,9 +17,6 @@
 #include "soh/ShipInit.hpp"
 #include <soh/ResourceManagerHelpers.h>
 
-#include <cstdarg>
-#include <algorithm>
-
 extern "C" {
 #include "variables.h"
 #include "macros.h"
diff --git a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
index 017c24571..abefcd602 100644
--- a/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/MerchantMessages.cpp
@@ -6,17 +6,17 @@
  * including both shops and one-off merchants (i.e. Medigoron, Bean Guy,
  * and Carpet Salesman)
  */
+
 #include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include <macros.h>
 #include <functions.h>
-#include <variables.h>
 #include <overlays/actors/ovl_En_Dns/z_en_dns.h>
+extern PlayState* gPlayState;
 }
 
 #define RAND_GET_ITEM(rc) OTRGlobals::Instance->gRandoContext->GetItemLocation(rc)
diff --git a/soh/soh/Enhancements/randomizer/Messages/Navi.cpp b/soh/soh/Enhancements/randomizer/Messages/Navi.cpp
index 0d82ce5ad..71ed6e2e5 100644
--- a/soh/soh/Enhancements/randomizer/Messages/Navi.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/Navi.cpp
@@ -2,8 +2,12 @@
  * This file is responsible for the messages
  * for the Rando-Relevant Navi Hints enhancement.
  */
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageManager.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/ShipInit.hpp"
+#include "soh/ShipUtils.h"
 
 extern "C" {
 #include <variables.h>
diff --git a/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp b/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp
index c2d7c465f..5bf0817e0 100644
--- a/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/Rupees.cpp
@@ -1,8 +1,12 @@
 /**
  * This file is for handling the Randomize Rupee Names enhancement
  */
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageManager.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/ShipInit.hpp"
+#include "soh/ShipUtils.h"
 
 extern "C" {
 #include "variables.h"
diff --git a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
index 169c16882..362b94852 100644
--- a/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
+++ b/soh/soh/Enhancements/randomizer/Messages/StaticHints.cpp
@@ -5,17 +5,18 @@
  * File for registering hooks for "Static" hints, i.e. hints that
  * are always given by a specific NPC and/or for a specific item.
  */
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include "z64scene.h"
+
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 #include <soh/OTRGlobals.h>
-#include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 extern "C" {
-extern PlayState* gPlayState;
+#include "z64scene.h"
 #include <macros.h>
 #include <functions.h>
 #include <variables.h>
+extern PlayState* gPlayState;
 }
 
 #define RAND_GET_HINT(rh) OTRGlobals::Instance->gRandoContext->GetHint(rh)
diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.cpp b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
index 75b7b134b..d2ff59445 100644
--- a/soh/soh/Enhancements/randomizer/Plandomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
@@ -1,25 +1,22 @@
+#include <vector>
+#include <fstream>
+#include <filesystem>
+
+#include <fast/Fast3dGui.h>
+
 #include "Plandomizer.h"
 #include <soh/SohGui/SohGui.hpp>
 #include "soh/SohGui/UIWidgets.hpp"
-#include "soh/util.h"
-#include <vector>
 #include "soh/Notification/Notification.h"
-#include <soh_assets.h>
 #include "soh/Enhancements/randomizer/3drando/hints.hpp"
-
-#include <fstream>
-#include <filesystem>
-
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Enhancements/randomizer/logic.h"
 #include "soh/Enhancements/randomizer/rando_hash.h"
 #include "soh/Enhancements/randomizer/Traps.h"
-#include "soh/Enhancements/randomizer/3drando/shops.hpp"
-
-#include <fast/Fast3dGui.h>
 
 extern "C" {
+#include <soh_assets.h>
 #include "include/z64item.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
 #include "textures/icon_item_static/icon_item_static.h"
diff --git a/soh/soh/Enhancements/randomizer/RCToRandInf.h b/soh/soh/Enhancements/randomizer/RCToRandInf.h
index bba37b179..c43d9839a 100644
--- a/soh/soh/Enhancements/randomizer/RCToRandInf.h
+++ b/soh/soh/Enhancements/randomizer/RCToRandInf.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include "randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 
 // There has been some talk about potentially just using the RC identifier to store flags rather than randomizer inf, so
 // for now we're not going to store randomzierInf in the randomizer check objects, we're just going to map them 1:1 here
diff --git a/soh/soh/Enhancements/randomizer/RocsFeather.cpp b/soh/soh/Enhancements/randomizer/RocsFeather.cpp
index 3e8f531b2..176960caa 100644
--- a/soh/soh/Enhancements/randomizer/RocsFeather.cpp
+++ b/soh/soh/Enhancements/randomizer/RocsFeather.cpp
@@ -1,10 +1,8 @@
-#include <soh/OTRGlobals.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/Enhancements/randomizer/SeedContext.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include <soh_assets.h>
 
 extern "C" {
+#include <soh_assets.h>
 #include <z64.h>
 #include "functions.h"
 #include "variables.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
index bdad9eb69..e3738e212 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleCrates.cpp
@@ -1,16 +1,13 @@
 #include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh_assets.h"
 #include "static_data.h"
-#include <libultraship/libultra.h>
-#include "global.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "item_category_adj.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
 
 extern "C" {
-#include "variables.h"
+#include "soh_assets.h"
 #include "overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h"
 #include "overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
index 353d63a9e..f972d3b1b 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
@@ -2,7 +2,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "item_category_adj.h"
 #include "particle_cmc.h"
-#include "soh/frame_interpolation.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
index 7cad16519..a22791932 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
@@ -10,7 +10,6 @@
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
 
 extern "C" {
-#include "variables.h"
 #include "macros.h"
 #include "functions.h"
 #include "overlays/actors/ovl_En_Ishi/z_en_ishi.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleSilver.h b/soh/soh/Enhancements/randomizer/ShuffleSilver.h
index 278728570..807fa4d46 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleSilver.h
+++ b/soh/soh/Enhancements/randomizer/ShuffleSilver.h
@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include "randomizerEnums.h"
 #include <stdint.h>
-#include <libultraship/libultra.h>
+#include <libultraship/libultra/types.h>
 
 bool IsSilverInPool(RandomizerGet rg);
 RandomizerGet SilverFromSwitchFlag(s16 switchFlag);
diff --git a/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp b/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp
index cb9fd22d7..7e89ef88b 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleTreasureChestGame.cpp
@@ -1,5 +1,5 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
 #include "src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
index 2a8565edf..c26e79d1e 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
@@ -1,6 +1,5 @@
 #include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh_assets.h"
 #include "static_data.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "item_category_adj.h"
@@ -8,7 +7,7 @@
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
 
 extern "C" {
-#include "variables.h"
+#include "soh_assets.h"
 #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h"
 #include "objects/object_wood02/object_wood02.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/randomizer/bean_patches.h b/soh/soh/Enhancements/randomizer/bean_patches.h
index ee15b2523..d6092ea73 100644
--- a/soh/soh/Enhancements/randomizer/bean_patches.h
+++ b/soh/soh/Enhancements/randomizer/bean_patches.h
@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include "randomizerTypes.h"
+#include "soh/Enhancements/randomizer/randomizerEnums.h"
 #include "z64scene.h"
 
 // One row per bean patch, shared by logic, savefile setup and the actor hooks.
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index 6bf87e737..b65aab0c5 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -1,20 +1,17 @@
 #include "draw.h"
 #include "soh/OTRGlobals.h"
-#include "soh_assets.h"
-#include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "dungeon.h"
 #include "logic.h"
 
 extern "C" {
+#include "soh_assets.h"
 #include "z64.h"
 #include "macros.h"
 #include "functions.h"
 #include "variables.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-#include "objects/object_gi_key/object_gi_key.h"
-#include "objects/object_gi_bosskey/object_gi_bosskey.h"
 #include "objects/object_gi_compass/object_gi_compass.h"
 #include "objects/object_gi_map/object_gi_map.h"
 #include "objects/object_gi_hearts/object_gi_hearts.h"
@@ -22,7 +19,6 @@ extern "C" {
 #include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
 #include "objects/object_toki_objects/object_toki_objects.h"
-#include "objects/object_gi_bomb_2/object_gi_bomb_2.h"
 #include "objects/object_goma/object_goma.h"
 #include "objects/object_kingdodongo/object_kingdodongo.h"
 #include "objects/object_bv/object_bv.h"
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.cpp b/soh/soh/Enhancements/randomizer/fishsanity.cpp
index d122a9bbc..204a8062f 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.cpp
+++ b/soh/soh/Enhancements/randomizer/fishsanity.cpp
@@ -1,20 +1,20 @@
+#include <libultraship/bridge/consolevariablebridge.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "../../OTRGlobals.h"
 #include "fishsanity.h"
 #include "draw.h"
-#include "soh/frame_interpolation.h"
-#include "variables.h"
-#include "functions.h"
-#include "macros.h"
-#include <libultraship/bridge/consolevariablebridge.h>
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
+#include "soh/frame_interpolation.h"
 
 extern "C" {
+#include "variables.h"
+#include "functions.h"
+#include "macros.h"
 #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
 #include "src/overlays/actors/ovl_En_Fish/z_en_fish.h"
-
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/randomizer/fishsanity.h b/soh/soh/Enhancements/randomizer/fishsanity.h
index 2a7945352..8a9dd70e4 100644
--- a/soh/soh/Enhancements/randomizer/fishsanity.h
+++ b/soh/soh/Enhancements/randomizer/fishsanity.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/location.h"
 
 typedef enum {
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 4b8383b76..9c9e4b141 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -1,7 +1,6 @@
 #include "hint.h"
 #include "string"
 #include "SeedContext.h"
-#include <spdlog/spdlog.h>
 #include "static_data.h"
 #include "rng.h"
 
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index 15a799932..3afae3e08 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -8,7 +8,6 @@
 #include "soh/Enhancements/randomizer/fishsanity.h"
 #include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Notification/Notification.h"
 #include "soh/SaveManager.h"
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index a7d867573..0ac4ead5f 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -1,15 +1,13 @@
 #include "item.h"
-#include "item_location.h"
-
 #include "SeedContext.h"
 #include "logic.h"
-#include "3drando/item_pool.hpp"
-#include "z64item.h"
-#include "variables.h"
-#include "functions.h"
 #include "../../OTRGlobals.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 
+extern "C" {
+#include "z64item.h"
+}
+
 namespace Rando {
 Item::Item()
     : randomizerGet(RG_NONE), type(ITEMTYPE_ITEM), getItemId(GI_NONE), advancement(false), hintKey(RHT_NONE), price(0) {
diff --git a/soh/soh/Enhancements/randomizer/item.h b/soh/soh/Enhancements/randomizer/item.h
index 8b61c9383..3b036de80 100644
--- a/soh/soh/Enhancements/randomizer/item.h
+++ b/soh/soh/Enhancements/randomizer/item.h
@@ -4,7 +4,6 @@
 #include <memory>
 
 #include "soh/Enhancements/custom-message/text.h"
-#include "randomizerTypes.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "3drando/hints.hpp"
 
diff --git a/soh/soh/Enhancements/randomizer/item_location.cpp b/soh/soh/Enhancements/randomizer/item_location.cpp
index a5efdd743..1bfe380d0 100644
--- a/soh/soh/Enhancements/randomizer/item_location.cpp
+++ b/soh/soh/Enhancements/randomizer/item_location.cpp
@@ -1,11 +1,10 @@
+#include <spdlog/spdlog.h>
+
 #include "item_location.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "SeedContext.h"
-#include "logic.h"
 #include "rng.h"
 
-#include <spdlog/spdlog.h>
-
 namespace Rando {
 ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {
 }
diff --git a/soh/soh/Enhancements/randomizer/logic.cpp b/soh/soh/Enhancements/randomizer/logic.cpp
index b941dd527..55ad3ce09 100644
--- a/soh/soh/Enhancements/randomizer/logic.cpp
+++ b/soh/soh/Enhancements/randomizer/logic.cpp
@@ -1,20 +1,20 @@
+#include <spdlog/spdlog.h>
+
 #include "logic.h"
 #include "bean_patches.h"
 #include "../debugger/performanceTimer.h"
-
-#include <vector>
-
 #include "soh/OTRGlobals.h"
 #include "randomizer.h"
 #include "dungeon.h"
 #include "SeedContext.h"
-#include "macros.h"
-#include "variables.h"
 #include "randomizer.h"
-#include <spdlog/spdlog.h>
-#include <ship/utils/StringHelper.h>
 #include "location_access.h"
 
+extern "C" {
+#include "macros.h"
+#include "variables.h"
+}
+
 extern "C" PlayState* gPlayState;
 
 namespace Rando {
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index f7817ed25..1c51e7d35 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,9 +1,7 @@
+#include <libultraship/bridge/consolevariablebridge.h>
+
 #include "option.h"
-#include <ship/Context.h>
-#include <imgui.h>
-#include "soh/Enhancements/randomizer/settings.h"
 #include "soh/SohGui/SohMenu.h"
-#include "soh/SohGui/UIWidgets.hpp"
 #include "soh/Enhancements/Lang/Lang.h"
 #include <soh/cvar_prefixes.h>
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 133b17990..45041816c 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -1,19 +1,16 @@
-#include "randomizer.h"
-#include <nlohmann/json.hpp>
 #include <fstream>
-#include <variables.h>
-#include <macros.h>
-#include <functions.h>
+#include <sstream>
+#include <tuple>
+
+#include <nlohmann/json.hpp>
+#include <ship/window/FileDropMgr.h>
+
+#include "randomizer.h"
 #include "3drando/menu.hpp"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/SohGui.hpp"
-#include <imgui.h>
-#include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
 #include "randomizer_check_objects.h"
-#include <sstream>
-#include <tuple>
 #include "soh/OTRGlobals.h"
-#include <ship/window/FileDropMgr.h>
 #include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "settings.h"
@@ -25,8 +22,11 @@
 #include "logic.h"
 
 extern "C" {
+#include <variables.h>
+#include <macros.h>
+#include <functions.h>
+#include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
 #include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h"
-
 extern void func_80B8FE00(ObjBean*); // trigger planting
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp b/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp
index 2d9faf3d3..5269d217c 100644
--- a/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizerEnumStrings.cpp
@@ -1,7 +1,5 @@
 #include "randomizerEnumStrings.h"
 
-#include "randomizerEnums.h"
-
 // Redefine enum macros to generate string->enum maps for every enum.
 #define RANDO_ENUM_BEGIN(EnumName)                                                                     \
     template <> const std::unordered_map<std::string_view, EnumName>& GetStringToEnumMap<EnumName>() { \
@@ -17,8 +15,6 @@
     return map;                  \
     }
 
-#include "randomizerEnums.h"
-
 #undef RANDO_ENUM_BEGIN
 #undef RANDO_ENUM_ITEM
 #undef RANDO_ENUM_END
@@ -37,5 +33,3 @@
     ();                          \
     return map;                  \
     }
-
-#include "randomizerEnums.h"
\ No newline at end of file
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index e9dd89aaf..e3ca0930b 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -1,3 +1,12 @@
+#include <array>
+#include <string>
+#include <sstream>
+#include <vector>
+#include <set>
+
+#include <spdlog/common.h>
+#include <libultraship/controller/controldeck/ControlDeck.h>
+
 #include "randomizer_check_tracker.h"
 #include "randomizer_entrance_tracker.h"
 #include "randomizer_item_tracker.h"
@@ -6,10 +15,8 @@
 #include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
-#include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
-#include "soh/SohGui/SohMenu.h"
 #include "dungeon.h"
 #include "entrance.h"
 #include "fishsanity.h"
@@ -18,27 +25,19 @@
 #include "soh/Enhancements/debugger/performanceTimer.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
-#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
-
-#include <array>
-#include <string>
-#include <sstream>
-#include <vector>
-#include <set>
-#include <spdlog/common.h>
-#include <libultraship/controller/controldeck/ControlDeck.h>
 #include "location.h"
 #include "item_location.h"
 #include "randomizer_check_objects.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "z64item.h"
 
 extern "C" {
+#include "overlays/actors/ovl_En_GirlA/z_en_girla.h"
+#include "z64item.h"
 #include "variables.h"
-#include "functions.h"
 #include "macros.h"
 extern PlayState* gPlayState;
 }
+
 extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 modIndex, s16 getItemID);
 
 extern std::vector<ItemTrackerItem> dungeonRewardStones;
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance.c b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
index 34302bf72..604ae7654 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance.c
@@ -14,7 +14,9 @@
 #include "soh/SaveManager.h"
 #include <string.h>
 
-#include "global.h"
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
 #include "entrance.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_grotto.c b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
index 55185f567..f19fe2eaa 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_grotto.c
+++ b/soh/soh/Enhancements/randomizer/randomizer_grotto.c
@@ -6,7 +6,7 @@
 #include "randomizer_grotto.h"
 #include "soh/OTRGlobals.h"
 
-#include "global.h"
+#include "variables.h"
 
 extern PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp
index 0449f7f95..3267771e3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.cpp
@@ -1,8 +1,3 @@
-#include "randomizer_hint_tracker.h"
-#include "soh/OTRGlobals.h"
-#include "soh/SaveManager.h"
-#include "soh/SohGui/SohGui.hpp"
-
 #include <algorithm>
 #include <cctype>
 #include <map>
@@ -11,16 +6,14 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
+
 #include <libultraship/controller/controldeck/ControlDeck.h>
 #include <ship/window/gui/IconsFontAwesome4.h>
 
-extern "C" {
-#include <z64.h>
-#include "macros.h"
-#include "variables.h"
-extern PlayState* gPlayState;
-}
-
+#include "randomizer_hint_tracker.h"
+#include "soh/OTRGlobals.h"
+#include "soh/SaveManager.h"
+#include "soh/SohGui/SohGui.hpp"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/hint.h"
 #include "soh/Enhancements/randomizer/item_category_adj.h"
@@ -30,6 +23,12 @@ extern PlayState* gPlayState;
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/Enhancements/randomizer/static_data.h"
 
+extern "C" {
+#include <z64.h>
+#include "variables.h"
+extern PlayState* gPlayState;
+}
+
 using namespace UIWidgets;
 
 // Defined in debugSaveEditor.cpp.
diff --git a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h
index a9351ee74..383f921e4 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_hint_tracker.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ship/window/gui/GuiWindow.h>
-#include "randomizerTypes.h"
 
 typedef enum {
     // Every hint location grouped by area, with unread hint text masked.
diff --git a/soh/soh/Enhancements/randomizer/savefile.cpp b/soh/soh/Enhancements/randomizer/savefile.cpp
index 406940be3..ea0c15ca7 100644
--- a/soh/soh/Enhancements/randomizer/savefile.cpp
+++ b/soh/soh/Enhancements/randomizer/savefile.cpp
@@ -1,20 +1,17 @@
+#include <spdlog/spdlog.h>
+
 #include "savefile.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/bean_patches.h"
 #include "soh/Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/randomizer/logic.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 
-#include <spdlog/spdlog.h>
-
 extern "C" {
-#include <z64.h>
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-
 uint8_t Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 GetItemEntry Randomizer_GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
 }
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index 786d3d281..92a4689ef 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -1,3 +1,8 @@
+#include <spdlog/spdlog.h>
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <ship/Context.h>
+#include <ship/window/Window.h>
+
 #include "settings.h"
 #include "trial.h"
 #include "dungeon.h"
@@ -5,12 +10,6 @@
 #include "soh/Enhancements/randomizer/rng.h"
 #include "soh/OTRGlobals.h"
 
-#include <spdlog/spdlog.h>
-#include <libultraship/bridge/consolevariablebridge.h>
-#include <ship/Context.h>
-#include <ship/window/Window.h>
-#include <ship/window/gui/Gui.h>
-
 namespace Rando {
 std::shared_ptr<Settings> Settings::mInstance;
 
diff --git a/soh/soh/Enhancements/randomizer/settings.h b/soh/soh/Enhancements/randomizer/settings.h
index fcd274c58..b9c1d5797 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -5,7 +5,6 @@
 
 #include <array>
 #include <unordered_map>
-#include <nlohmann/json.hpp>
 
 namespace Rando {
 class Settings {
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
index 6ea87c1b8..d099d3453 100644
--- a/soh/soh/Enhancements/savestates.cpp
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -1,19 +1,19 @@
-#include "savestates.h"
-
 #include <memory>
-#include <spdlog/spdlog.h>
 
+#include <spdlog/spdlog.h>
 #include <ship/Context.h>
 #include <ship/window/Window.h>
-#include <ship/window/gui/GameOverlay.h>
+
+#include "savestates.h"
 #include <soh/OTRGlobals.h>
 #include <soh/OTRAudio.h>
+#include "savestate_serialize.h"
 
+extern "C" {
 #include "z64.h"
 #include "z64save.h"
 #include <variables.h>
-#include <functions.h>
-#include "savestate_serialize.h"
+}
 
 extern "C" PlayState* gPlayState;
 extern "C" EffectContext sEffectContext;
diff --git a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp
index f92959ff1..83b048aad 100644
--- a/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp
+++ b/soh/soh/Enhancements/speechsynthesizer/ESpeakSpeechSynthesizer.cpp
@@ -1,6 +1,8 @@
-#include "ESpeakSpeechSynthesizer.h"
 #include <dlfcn.h>
-#include <libultraship/libultraship.h>
+
+#include <libultraship/log/luslog.h>
+
+#include "ESpeakSpeechSynthesizer.h"
 
 ESpeakSpeechSynthesizer::ESpeakSpeechSynthesizer() {
 }
diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp
index dd4526dad..e525dba01 100644
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechLogger.cpp
@@ -1,5 +1,6 @@
+#include <libultraship/log/luslog.h>
+
 #include "SpeechLogger.h"
-#include <libultraship/luslog.h>
 
 SpeechLogger::SpeechLogger() {
 }
diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
index 689033ec0..f0f78e0de 100644
--- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp
+++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
@@ -1,19 +1,17 @@
 #include <vector>
 #include <fstream>
-#include <spdlog/common.h>
 
 #include <ship/Context.h>
+#include <fast/Fast3dGui.h>
+
 #include "TimeSplits.h"
 #include "soh/Enhancements/gameplaystats.h"
-
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh_assets.h"
 #include <soh/SohGui/SohGui.hpp>
 #include "soh/SohGui/UIWidgets.hpp"
 
-#include <fast/Fast3dGui.h>
-
 extern "C" {
+#include "soh_assets.h"
 #include "z64item.h"
 #include "macros.h"
 extern SaveContext gSaveContext;
diff --git a/soh/soh/Network/Anchor/Anchor.cpp b/soh/soh/Network/Anchor/Anchor.cpp
index f3883e2b9..76a6e98f0 100644
--- a/soh/soh/Network/Anchor/Anchor.cpp
+++ b/soh/soh/Network/Anchor/Anchor.cpp
@@ -1,11 +1,11 @@
-#include "Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/OTRGlobals.h"
+
+#include "Anchor.h"
 #include "soh/Enhancements/nametag.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
 
 extern "C" {
+#include "macros.h"
 #include "variables.h"
 #include "functions.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Network/Anchor/AnchorRoomWindow.cpp b/soh/soh/Network/Anchor/AnchorRoomWindow.cpp
index ec6ff5149..2d68a6297 100644
--- a/soh/soh/Network/Anchor/AnchorRoomWindow.cpp
+++ b/soh/soh/Network/Anchor/AnchorRoomWindow.cpp
@@ -1,12 +1,11 @@
-#include "Anchor.h"
 #include <ship/window/gui/IconsFontAwesome4.h>
+
+#include "Anchor.h"
 #include "soh/OTRGlobals.h"
 #include "soh/util.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
-#include "variables.h"
-#include "functions.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Network/Anchor/HookHandlers.cpp b/soh/soh/Network/Anchor/HookHandlers.cpp
index eec6e4461..a2084e816 100644
--- a/soh/soh/Network/Anchor/HookHandlers.cpp
+++ b/soh/soh/Network/Anchor/HookHandlers.cpp
@@ -2,7 +2,6 @@
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/frame_interpolation.h"
-#include "soh/OTRGlobals.h"
 
 extern "C" {
 #include "variables.h"
@@ -31,10 +30,8 @@ extern "C" {
 #include "src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h"
 #include "src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
-
 extern PlayState* gPlayState;
 extern MapData* gMapData;
-
 void func_8086ED70(BgBombwall* bgBombwall, PlayState* play);
 void BgBreakwall_Wait(BgBreakwall* bgBreakwall, PlayState* play);
 void BgHakaZou_WaitForHit(BgHakaZou* bgHakaZou, PlayState* play);
diff --git a/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp b/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp
index 6238a7f78..b6a877120 100644
--- a/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp
+++ b/soh/soh/Network/Anchor/Packets/DamagePlayer.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
index bf9b57237..7cbe5b371 100644
--- a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
+++ b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
@@ -1,5 +1,4 @@
 #include "soh/Network/Anchor/Anchor.h"
-#include <nlohmann/json.hpp>
 
 /**
  * DISABLE_ANCHOR
diff --git a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
index ce6efad13..70d827e34 100644
--- a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
+++ b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 
 /**
diff --git a/soh/soh/Network/Anchor/Packets/GameComplete.cpp b/soh/soh/Network/Anchor/Packets/GameComplete.cpp
index 0b01e3b64..da5ae111d 100644
--- a/soh/soh/Network/Anchor/Packets/GameComplete.cpp
+++ b/soh/soh/Network/Anchor/Packets/GameComplete.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 #include "soh/Notification/Notification.h"
 #include "soh/ShipUtils.h"
 
diff --git a/soh/soh/Network/Anchor/Packets/GiveItem.cpp b/soh/soh/Network/Anchor/Packets/GiveItem.cpp
index 4ab439894..1695c1e6c 100644
--- a/soh/soh/Network/Anchor/Packets/GiveItem.cpp
+++ b/soh/soh/Network/Anchor/Packets/GiveItem.cpp
@@ -1,11 +1,10 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
+#include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/Notification/Notification.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Enhancements/item-tables/ItemTableManager.h"
-#include "soh/OTRGlobals.h"
 
 extern "C" {
 #include "functions.h"
diff --git a/soh/soh/Network/Anchor/Packets/Handshake.cpp b/soh/soh/Network/Anchor/Packets/Handshake.cpp
index bfbb94f8e..ee88a2fde 100644
--- a/soh/soh/Network/Anchor/Packets/Handshake.cpp
+++ b/soh/soh/Network/Anchor/Packets/Handshake.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 
 /**
  * HANDSHAKE
diff --git a/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp b/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp
index 17b1d2793..cac233cf7 100644
--- a/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp
+++ b/soh/soh/Network/Anchor/Packets/RequestTeleport.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 
 /**
  * REQUEST_TELEPORT
diff --git a/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp b/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp
index 31d107e0a..7bd3d8286 100644
--- a/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp
+++ b/soh/soh/Network/Anchor/Packets/SetCheckStatus.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
diff --git a/soh/soh/Network/Anchor/Packets/SetFlag.cpp b/soh/soh/Network/Anchor/Packets/SetFlag.cpp
index 65c739dfe..f77a7f40d 100644
--- a/soh/soh/Network/Anchor/Packets/SetFlag.cpp
+++ b/soh/soh/Network/Anchor/Packets/SetFlag.cpp
@@ -1,10 +1,10 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
+#include "soh/Enhancements/game-interactor/GameInteractionEffect.h"
 
 extern "C" {
 #include "functions.h"
-
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
index cf97fb732..57cf9e309 100644
--- a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
+++ b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
@@ -1,6 +1,7 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
+#include "soh/Enhancements/game-interactor/GameInteractionEffect.h"
 
 extern "C" {
 #include "functions.h"
diff --git a/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp b/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp
index 4f50759ee..98a5ea99d 100644
--- a/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp
+++ b/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp
@@ -1,6 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 
 extern "C" {
 #include "macros.h"
diff --git a/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp b/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp
index 7a1ae9d3f..a49aacad1 100644
--- a/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp
+++ b/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp
@@ -1,7 +1,6 @@
-#include "soh/Network/Anchor/Anchor.h"
-#include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include "soh/OTRGlobals.h"
+
+#include "soh/Network/Anchor/Anchor.h"
 
 extern "C" {
 extern PlayState* gPlayState;
diff --git a/soh/soh/Network/CrowdControl/CrowdControl.cpp b/soh/soh/Network/CrowdControl/CrowdControl.cpp
index 94ce46ec1..d4450876e 100644
--- a/soh/soh/Network/CrowdControl/CrowdControl.cpp
+++ b/soh/soh/Network/CrowdControl/CrowdControl.cpp
@@ -1,12 +1,12 @@
-#include "CrowdControl.h"
-#include "CrowdControlTypes.h"
 #include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
+
+#include "CrowdControl.h"
+#include "CrowdControlTypes.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include <z64.h>
-#include "functions.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index 6b09fe87a..ef7f5d49e 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -19,7 +19,6 @@
 #include <ship/resource/File.h>
 #include <ship/window/Window.h>
 #include <soh/GameVersions.h>
-#include <spdlog/sinks/rotating_file_sink.h>
 
 #include "Enhancements/gameconsole.h"
 #ifdef _WIN32
@@ -27,7 +26,6 @@
 #else
 #include <time.h>
 #endif
-#include <ship/audio/AudioPlayer.h>
 #include <ship/resource/archive/O2rArchive.h>
 #include <ship/utils/binarytools/MemoryStream.h>
 #include "Enhancements/speechsynthesizer/SpeechSynthesizer.h"
@@ -91,9 +89,7 @@
 #include <fast/resource/ResourceType.h>
 
 // Resource Types/Factories
-#include <fast/resource/type/Matrix.h>
 #include "soh/resource/type/SohResourceType.h"
-#include "soh/resource/type/Animation.h"
 #include "soh/resource/type/Skeleton.h"
 #include <ship/resource/factory/BlobFactory.h>
 #include <fast/resource/factory/DisplayListFactory.h>
diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp
index 032b396a9..69a482f6b 100644
--- a/soh/soh/ResourceManagerHelpers.cpp
+++ b/soh/soh/ResourceManagerHelpers.cpp
@@ -1,9 +1,14 @@
-#include "ResourceManagerHelpers.h"
 #include <libultraship/bridge/consolevariablebridge.h>
+#include <fast/interpreter.h>
+#include <fast/resource/ResourceType.h>
+#include <fast/resource/type/DisplayList.h>
+#include <libultraship/bridge/resourcebridge.h>
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
+#include <stb_image.h>
+
+#include "ResourceManagerHelpers.h"
 #include "OTRGlobals.h"
-#include "variables.h"
-#include "z64.h"
-#include "macros.h"
 #include "cvar_prefixes.h"
 #include "Enhancements/enhancementTypes.h"
 #include "Enhancements/randomizer/dungeon.h"
@@ -13,15 +18,12 @@
 #include "resource/type/Array.h"
 #include "resource/type/Skeleton.h"
 #include "resource/type/PlayerAnimation.h"
-#include <fast/Fast3dWindow.h>
-#include <fast/resource/ResourceType.h>
-#include <fast/resource/type/DisplayList.h>
-#include <libultraship/bridge/resourcebridge.h>
-#include <ship/Context.h>
-#include <ship/resource/ResourceManager.h>
 
-#include <stb_image.h>
-#include <spdlog/common.h>
+extern "C" {
+#include "variables.h"
+#include "z64.h"
+#include "macros.h"
+}
 
 extern "C" PlayState* gPlayState;
 
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index af0f74664..227861530 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -7,15 +7,16 @@
 #include "Enhancements/randomizer/trial.h"
 #include "soh/util.h"
 #include "Enhancements/randomizer/hint.h"
-#include "Enhancements/randomizer/item.h"
 #include "soh/Enhancements/randomizer/settings.h"
 #include "ResourceManagerHelpers.h"
+#include "soh/SohGui/SohGui.hpp"
 
+extern "C" {
 #include "z64.h"
 #include "functions.h"
 #include "macros.h"
 #include <variables.h>
-#include "soh/SohGui/SohGui.hpp"
+}
 
 #define NOGDI // avoid various windows defines that conflict with things in z64.h
 #include <spdlog/spdlog.h>
diff --git a/soh/soh/SohGui/ImGuiUtils.cpp b/soh/soh/SohGui/ImGuiUtils.cpp
index 5452e3d29..c978540ec 100644
--- a/soh/soh/SohGui/ImGuiUtils.cpp
+++ b/soh/soh/SohGui/ImGuiUtils.cpp
@@ -1,13 +1,12 @@
-#include "ImGuiUtils.h"
 #include <ship/Context.h>
-#include <ship/window/Window.h>
-#include "assets/soh_assets.h"
+#include <fast/Fast3dGui.h>
+
+#include "ImGuiUtils.h"
 #include "soh/Enhancements/randomizer/rando_hash.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 
-#include <fast/Fast3dGui.h>
-
 extern "C" {
+#include "assets/soh_assets.h"
 #include "textures/icon_item_static/icon_item_static.h"
 #include "textures/parameter_static/parameter_static.h"
 }
diff --git a/soh/soh/SohGui/Menu.cpp b/soh/soh/SohGui/Menu.cpp
index 264952db3..4d8c60908 100644
--- a/soh/soh/SohGui/Menu.cpp
+++ b/soh/soh/SohGui/Menu.cpp
@@ -1,18 +1,20 @@
+#include <variant>
+#include <tuple>
+
+#include <ship/config/Config.h>
+#include <spdlog/common.h>
+
 #include "Menu.h"
 #include "BackendTypes.h"
 #include "UIWidgets.hpp"
 #include "soh/OTRGlobals.h"
-#include <ship/config/Config.h>
-#include <ship/window/gui/GuiElement.h>
 #include "SohModals.h"
-#include <variant>
-#include <spdlog/common.h>
-#include <tuple>
 
 extern "C" {
 #include "z64.h"
 extern PlayState* gPlayState;
 }
+
 std::vector<ImVec2> windowTypeSizes = { {} };
 
 extern std::unordered_map<s16, const char*> warpPointSceneList;
diff --git a/soh/soh/SohGui/ResolutionEditor.cpp b/soh/soh/SohGui/ResolutionEditor.cpp
index b9e0f798e..d61c74ce8 100644
--- a/soh/soh/SohGui/ResolutionEditor.cpp
+++ b/soh/soh/SohGui/ResolutionEditor.cpp
@@ -1,10 +1,9 @@
-#include "ResolutionEditor.h"
 #include <imgui.h>
-#include <spdlog/common.h>
-
-#include "soh/SohGui/UIWidgets.hpp"
 #include <fast/Fast3dWindow.h>
 #include <fast/interpreter.h>
+
+#include "ResolutionEditor.h"
+#include "soh/SohGui/UIWidgets.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp
index c00083e0b..3e4aa5d7f 100644
--- a/soh/soh/SohGui/SohGui.cpp
+++ b/soh/soh/SohGui/SohGui.cpp
@@ -5,10 +5,10 @@
 //  Created by David Chavez on 24.08.22.
 //
 
-#include "SohGui.hpp"
-
 #include <imgui.h>
 
+#include "SohGui.hpp"
+
 #ifdef __APPLE__
 #include <fast/backends/gfx_metal.h>
 #endif
@@ -16,7 +16,6 @@
 #ifdef __SWITCH__
 #include <port/switch/SwitchImpl.h>
 #endif
-#include "include/global.h"
 
 #include "soh/Enhancements/debugger/MessageViewer.h"
 #include "soh/Notification/Notification.h"
diff --git a/soh/soh/SohGui/SohMenu.cpp b/soh/soh/SohGui/SohMenu.cpp
index ee44714eb..ae098993e 100644
--- a/soh/soh/SohGui/SohMenu.cpp
+++ b/soh/soh/SohGui/SohMenu.cpp
@@ -1,7 +1,7 @@
-#include "SohMenu.h"
 #include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>
-#include <ship/utils/StringHelper.h>
+
+#include "SohMenu.h"
 
 extern "C" {
 extern PlayState* gPlayState;
diff --git a/soh/soh/SohGui/SohMenuDevTools.cpp b/soh/soh/SohGui/SohMenuDevTools.cpp
index fdb505c88..de178da7b 100644
--- a/soh/soh/SohGui/SohMenuDevTools.cpp
+++ b/soh/soh/SohGui/SohMenuDevTools.cpp
@@ -1,5 +1,7 @@
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <ship/Context.h>
+
 #include "SohMenu.h"
-#include "SohGui.hpp"
 
 extern "C" {
 extern PlayState* gPlayState;
diff --git a/soh/soh/SohGui/SohMenuNetwork.cpp b/soh/soh/SohGui/SohMenuNetwork.cpp
index c0f41fdff..5ee770d3e 100644
--- a/soh/soh/SohGui/SohMenuNetwork.cpp
+++ b/soh/soh/SohGui/SohMenuNetwork.cpp
@@ -1,6 +1,5 @@
 #include "SohMenu.h"
 #include <soh/Notification/Notification.h>
-#include <soh/Network/Network.h>
 #include "SohGui.hpp"
 #include "soh/OTRGlobals.h"
 #include "soh/util.h"
diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp
index eea57332b..86d69d4ab 100644
--- a/soh/soh/SohGui/SohMenuRandomizer.cpp
+++ b/soh/soh/SohGui/SohMenuRandomizer.cpp
@@ -1,10 +1,10 @@
 #include <unordered_set>
+
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "SohMenu.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/settings.h"
 #include "soh/ShipUtils.h"
 #include "soh/SohGui/SohGui.hpp"
diff --git a/soh/soh/SohGui/SohMenuStartingItems.cpp b/soh/soh/SohGui/SohMenuStartingItems.cpp
index caa60ed09..e97d802b8 100644
--- a/soh/soh/SohGui/SohMenuStartingItems.cpp
+++ b/soh/soh/SohGui/SohMenuStartingItems.cpp
@@ -1,18 +1,14 @@
+#include <vector>
+
+#include <fast/Fast3dGui.h>
+
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/settings.h"
 
-#include <vector>
-#include <fast/Fast3dGui.h>
-
-extern "C" {
-#include "z64.h"
-}
-
 namespace SohGui {
 
 using namespace UIWidgets;
diff --git a/soh/soh/SohGui/UIWidgets.cpp b/soh/soh/SohGui/UIWidgets.cpp
index b2cc7be92..9e6d80bfa 100644
--- a/soh/soh/SohGui/UIWidgets.cpp
+++ b/soh/soh/SohGui/UIWidgets.cpp
@@ -1,10 +1,10 @@
 #include "UIWidgets.hpp"
+
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui_internal.h>
 #include <string>
 #include <unordered_map>
 #include <libultraship/libultra/types.h>
-#include <spdlog/common.h>
 #include "soh/OTRGlobals.h"
 
 namespace UIWidgets {
diff --git a/soh/soh/framebuffer_effects.c b/soh/soh/framebuffer_effects.c
index 15324938c..ffa82da31 100644
--- a/soh/soh/framebuffer_effects.c
+++ b/soh/soh/framebuffer_effects.c
@@ -1,5 +1,5 @@
 #include "framebuffer_effects.h"
-#include "global.h"
+#include "variables.h"
 #include "OTRGlobals.h"
 
 int gfx_create_framebuffer(uint32_t width, uint32_t height, uint32_t native_width, uint32_t native_height,
diff --git a/soh/soh/framebuffer_effects.h b/soh/soh/framebuffer_effects.h
index 60ffbf428..8f69f5d7a 100644
--- a/soh/soh/framebuffer_effects.h
+++ b/soh/soh/framebuffer_effects.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <libultraship/libultra.h>
+#include <libultraship/libultra/gbi.h>
 
 extern s32 gPauseFrameBuffer;
 extern s32 gBlurFrameBuffer;
diff --git a/soh/soh/gu_pc.c b/soh/soh/gu_pc.c
index 48daaad16..245ac435c 100644
--- a/soh/soh/gu_pc.c
+++ b/soh/soh/gu_pc.c
@@ -1,5 +1,6 @@
 #include <math.h>
-#include "z64.h"
+
+#include <libultraship/libultra/types.h>
 
 void guMtxF2L(float mf[4][4], Mtx* m) {
     unsigned int r, c;
diff --git a/soh/soh/mixer.c b/soh/soh/mixer.c
index df6200139..6f5ca0232 100644
--- a/soh/soh/mixer.c
+++ b/soh/soh/mixer.c
@@ -1,9 +1,11 @@
 //! This file is always optimized by a rule in the CMakeList. This is done because the SIMD functions are very large
 //! when unoptimized and clang does not allow optimizing a single function.
+
 #include <stdint.h>
 #include <string.h>
 
 #include "mixer.h"
+
 #ifndef __clang__
 #ifndef _MSC_VER
 #pragma GCC optimize("unroll-loops")
@@ -104,7 +106,6 @@ void aLoadBufferImpl(const void* source_addr, uint16_t dest_addr, uint16_t nbyte
 #endif
 }
 
-#include <opus/opus.h>
 #include <opusfile.h>
 
 void aOPUSdecImpl(void* source_addr, uint16_t dest_addr, uint16_t nbytes, struct OggOpusFile** decState, int32_t pos,
diff --git a/soh/soh/resource/importer/ArrayFactory.cpp b/soh/soh/resource/importer/ArrayFactory.cpp
index 0e1b2ac04..e8247482e 100644
--- a/soh/soh/resource/importer/ArrayFactory.cpp
+++ b/soh/soh/resource/importer/ArrayFactory.cpp
@@ -1,7 +1,7 @@
+#include <fast/lus_gbi.h>
+
 #include "soh/resource/importer/ArrayFactory.h"
 #include "soh/resource/type/Array.h"
-#include "spdlog/spdlog.h"
-#include <fast/lus_gbi.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/AudioSampleFactory.cpp b/soh/soh/resource/importer/AudioSampleFactory.cpp
index 065e6bb32..e979a99b5 100644
--- a/soh/soh/resource/importer/AudioSampleFactory.cpp
+++ b/soh/soh/resource/importer/AudioSampleFactory.cpp
@@ -1,12 +1,16 @@
+#include <ship/Context.h>
+#include <ship/resource/archive/Archive.h>
+#include <ship/resource/ResourceManager.h>
+
 #include "soh/resource/importer/AudioSampleFactory.h"
 #include "soh/resource/importer/AudioSoundFontFactory.h"
 #include "soh/resource/type/AudioSample.h"
-#include "spdlog/spdlog.h"
+
+extern "C" {
 #include "z64.h"
 #include "z64audio.h"
-#include <ship/Context.h>
-#include <ship/resource/archive/Archive.h>
-#include <ship/resource/ResourceManager.h>
+}
+
 #define DR_WAV_IMPLEMENTATION
 #include <dr_wav.h>
 
diff --git a/soh/soh/resource/importer/AudioSequenceFactory.cpp b/soh/soh/resource/importer/AudioSequenceFactory.cpp
index 3cfc77515..118f302ed 100644
--- a/soh/soh/resource/importer/AudioSequenceFactory.cpp
+++ b/soh/soh/resource/importer/AudioSequenceFactory.cpp
@@ -1,14 +1,14 @@
-#include "soh/resource/importer/AudioSequenceFactory.h"
-#include "soh/resource/importer/AudioSoundFontFactory.h"
-#include "soh/resource/type/AudioSequence.h"
-#include "spdlog/spdlog.h"
+#include <type_traits>
+
 #include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
-
 #include <ship/Context.h>
 #include <ship/resource/archive/Archive.h>
 #include <ship/utils/binarytools/BinaryWriter.h>
-#include <type_traits>
+
+#include "soh/resource/importer/AudioSequenceFactory.h"
+#include "soh/resource/importer/AudioSoundFontFactory.h"
+#include "soh/resource/type/AudioSequence.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/BackgroundFactory.cpp b/soh/soh/resource/importer/BackgroundFactory.cpp
index 763690a3f..f2985145a 100644
--- a/soh/soh/resource/importer/BackgroundFactory.cpp
+++ b/soh/soh/resource/importer/BackgroundFactory.cpp
@@ -1,6 +1,5 @@
 #include "soh/resource/importer/BackgroundFactory.h"
 #include "soh/resource/type/Background.h"
-#include "spdlog/spdlog.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/CollisionHeaderFactory.cpp b/soh/soh/resource/importer/CollisionHeaderFactory.cpp
index 8a024ec7f..42d0e8ddb 100644
--- a/soh/soh/resource/importer/CollisionHeaderFactory.cpp
+++ b/soh/soh/resource/importer/CollisionHeaderFactory.cpp
@@ -1,7 +1,7 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/CollisionHeaderFactory.h"
 #include "soh/resource/type/CollisionHeader.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/PathFactory.cpp b/soh/soh/resource/importer/PathFactory.cpp
index 0aa01ed43..fe4692f75 100644
--- a/soh/soh/resource/importer/PathFactory.cpp
+++ b/soh/soh/resource/importer/PathFactory.cpp
@@ -1,9 +1,9 @@
+#include <tinyxml2.h>
+#include <libultraship/bridge/consolevariablebridge.h>
+
 #include "soh/resource/importer/PathFactory.h"
 #include "soh/resource/type/Path.h"
 #include "soh/resource/logging/PathLogger.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
-#include <libultraship/bridge/consolevariablebridge.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/PlayerAnimationFactory.cpp b/soh/soh/resource/importer/PlayerAnimationFactory.cpp
index 5543cf418..7834b80c1 100644
--- a/soh/soh/resource/importer/PlayerAnimationFactory.cpp
+++ b/soh/soh/resource/importer/PlayerAnimationFactory.cpp
@@ -1,6 +1,5 @@
 #include "soh/resource/importer/PlayerAnimationFactory.h"
 #include "soh/resource/type/PlayerAnimation.h"
-#include "spdlog/spdlog.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/SkeletonLimbFactory.cpp b/soh/soh/resource/importer/SkeletonLimbFactory.cpp
index 96d5c49de..0590a1e4b 100644
--- a/soh/soh/resource/importer/SkeletonLimbFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonLimbFactory.cpp
@@ -1,9 +1,9 @@
-#include "soh/resource/importer/SkeletonLimbFactory.h"
-#include "soh/resource/type/SkeletonLimb.h"
-#include <ship/Context.h>
 #include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
 
+#include "soh/resource/importer/SkeletonLimbFactory.h"
+#include "soh/resource/type/SkeletonLimb.h"
+
 namespace SOH {
 std::shared_ptr<Ship::IResource>
 ResourceFactoryBinarySkeletonLimbV0::ReadResource(std::shared_ptr<Ship::File> file,
diff --git a/soh/soh/resource/importer/TextFactory.cpp b/soh/soh/resource/importer/TextFactory.cpp
index 0a2c1afb4..af6088da5 100644
--- a/soh/soh/resource/importer/TextFactory.cpp
+++ b/soh/soh/resource/importer/TextFactory.cpp
@@ -1,7 +1,7 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/TextFactory.h"
 #include "soh/resource/type/Text.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
index b54f1cade..afbe06f15 100644
--- a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
@@ -1,7 +1,6 @@
 #include "soh/resource/importer/scenecommand/EndMarkerFactory.h"
 #include "soh/resource/type/scenecommand/EndMarker.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> EndMarkerFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
index 97ebdfc05..351178de3 100644
--- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.cpp
@@ -1,6 +1,5 @@
 #include "soh/resource/importer/scenecommand/SceneCommandFactory.h"
 #include "soh/resource/type/scenecommand/SceneCommand.h"
-#include "spdlog/spdlog.h"
 
 namespace SOH {
 void SceneCommandFactoryBinaryV0::ReadCommandId(std::shared_ptr<ISceneCommand> command,
diff --git a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
index 90367e9a9..5180c6996 100644
--- a/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetActorListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetActorListFactory.h"
 #include "soh/resource/type/scenecommand/SetActorList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetActorListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
index e2f4de65b..d3330e821 100644
--- a/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCameraSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetCameraSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetCameraSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
index eb54b0a22..f28a770a5 100644
--- a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
@@ -1,7 +1,6 @@
 #include "soh/resource/importer/scenecommand/SetCsCameraFactory.h"
 #include "soh/resource/type/scenecommand/SetCsCamera.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetCsCameraFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
index 3352a2ef2..98d3eafdb 100644
--- a/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetEchoSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetEchoSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetEchoSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetEchoSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
index d0fd94821..abb187931 100644
--- a/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetEntranceListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetEntranceListFactory.h"
 #include "soh/resource/type/scenecommand/SetEntranceList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetEntranceListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
index 9049b098c..292cd1add 100644
--- a/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetExitListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetExitListFactory.h"
 #include "soh/resource/type/scenecommand/SetExitList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetExitListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
index 9ba49d4b3..8427434e9 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetLightListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetLightListFactory.h"
 #include "soh/resource/type/scenecommand/SetLightList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetLightListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
index 01c5d59e1..90b5aac95 100644
--- a/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetLightingSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetLightingSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetLightingSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
index 459519255..ffd877537 100644
--- a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
@@ -1,10 +1,9 @@
+#include <spdlog/spdlog.h>
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetMeshFactory.h"
 #include "soh/resource/type/scenecommand/SetMesh.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include <ship/Context.h>
-#include <ship/resource/ResourceManager.h>
-#include <spdlog/spdlog.h>
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
index 35857a409..23c55a7a2 100644
--- a/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetObjectListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetObjectListFactory.h"
 #include "soh/resource/type/scenecommand/SetObjectList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetObjectListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
index 9b18593f5..f47f4f00c 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetRoomBehaviorFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetRoomBehaviorFactory.h"
 #include "soh/resource/type/scenecommand/SetRoomBehavior.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetRoomBehaviorFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
index c202ca812..131f3f5a1 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
@@ -1,9 +1,9 @@
+#include <libultraship/libultra/types.h>
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetRoomListFactory.h"
 #include "soh/resource/type/scenecommand/SetRoomList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include <libultraship/libultra/types.h>
-#include <spdlog/spdlog.h>
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetRoomListFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
index a071cc4d0..60fb7a607 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxModifierFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetSkyboxModifierFactory.h"
 #include "soh/resource/type/scenecommand/SetSkyboxModifier.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
index 3434505cb..0dddbf2cf 100644
--- a/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetSkyboxSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetSkyboxSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
index a72acce8c..c3deee9fd 100644
--- a/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSoundSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetSoundSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetSoundSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetSoundSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
index 2877dc88a..d6da7e676 100644
--- a/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetSpecialObjectsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetSpecialObjectsFactory.h"
 #include "soh/resource/type/scenecommand/SetSpecialObjects.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
index d25c9aeab..65d9b789b 100644
--- a/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetStartPositionListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetStartPositionListFactory.h"
 #include "soh/resource/type/scenecommand/SetStartPositionList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
index 714570208..0a392c783 100644
--- a/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetTimeSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetTimeSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetTimeSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetTimeSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
index e222fb789..ebdf84489 100644
--- a/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetTransitionActorListFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetTransitionActorListFactory.h"
 #include "soh/resource/type/scenecommand/SetTransitionActorList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
index 86f0af515..a69e7971d 100644
--- a/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetWindSettingsFactory.cpp
@@ -1,8 +1,8 @@
+#include <tinyxml2.h>
+
 #include "soh/resource/importer/scenecommand/SetWindSettingsFactory.h"
 #include "soh/resource/type/scenecommand/SetWindSettings.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetWindSettingsFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/logging/PathLogger.h b/soh/soh/resource/logging/PathLogger.h
index f9bfcb252..39c78dda8 100644
--- a/soh/soh/resource/logging/PathLogger.h
+++ b/soh/soh/resource/logging/PathLogger.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ship/resource/Resource.h>
-#include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/logging/SceneCommandLoggers.h b/soh/soh/resource/logging/SceneCommandLoggers.h
index d5790044d..3ad09f91e 100644
--- a/soh/soh/resource/logging/SceneCommandLoggers.h
+++ b/soh/soh/resource/logging/SceneCommandLoggers.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ship/resource/Resource.h>
-#include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/CollisionHeader.h b/soh/soh/resource/type/CollisionHeader.h
index 7479de99e..daba15fda 100644
--- a/soh/soh/resource/type/CollisionHeader.h
+++ b/soh/soh/resource/type/CollisionHeader.h
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <ship/resource/Resource.h>
-#include <libultraship/libultra.h>
 #include "z64math.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/Cutscene.cpp b/soh/soh/resource/type/Cutscene.cpp
index fec43126c..d92d2d795 100644
--- a/soh/soh/resource/type/Cutscene.cpp
+++ b/soh/soh/resource/type/Cutscene.cpp
@@ -1,5 +1,4 @@
 #include "Cutscene.h"
-#include <libultraship/libultra/gbi.h>
 
 namespace SOH {
 uint32_t* Cutscene::GetPointer() {
diff --git a/soh/soh/resource/type/PlayerAnimation.cpp b/soh/soh/resource/type/PlayerAnimation.cpp
index 46ba8a190..381813ccc 100644
--- a/soh/soh/resource/type/PlayerAnimation.cpp
+++ b/soh/soh/resource/type/PlayerAnimation.cpp
@@ -1,5 +1,4 @@
 #include "PlayerAnimation.h"
-#include <libultraship/libultra/gbi.h>
 
 namespace SOH {
 int16_t* PlayerAnimation::GetPointer() {
diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp
index 704d7e872..eac125517 100644
--- a/soh/soh/resource/type/Skeleton.cpp
+++ b/soh/soh/resource/type/Skeleton.cpp
@@ -1,13 +1,13 @@
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
+
 #include "Skeleton.h"
 #include "soh/OTRGlobals.h"
+
+extern "C" {
 #include <soh_assets.h>
 #include <objects/object_link_child/object_link_child.h>
 #include <objects/object_link_boy/object_link_boy.h>
-#include <ship/Context.h>
-#include <ship/resource/ResourceManager.h>
-
-extern "C" {
-#include "variables.h"
 #include "z64.h"
 #include "macros.h"
 #include "z64player.h"
diff --git a/soh/soh/resource/type/SkeletonLimb.h b/soh/soh/resource/type/SkeletonLimb.h
index 84acd7741..42224d449 100644
--- a/soh/soh/resource/type/SkeletonLimb.h
+++ b/soh/soh/resource/type/SkeletonLimb.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ship/resource/Resource.h>
-#include "libultraship/libultra.h"
 #include "z64math.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/Text.h b/soh/soh/resource/type/Text.h
index a9f00ef27..45275b1ce 100644
--- a/soh/soh/resource/type/Text.h
+++ b/soh/soh/resource/type/Text.h
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <ship/resource/Resource.h>
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 // TODO: we've moved away from using classes for this stuff
diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h
index bb3614eef..3dfd615ea 100644
--- a/soh/soh/resource/type/scenecommand/EndMarker.h
+++ b/soh/soh/resource/type/scenecommand/EndMarker.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
index 741d503d5..011477aed 100644
--- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
@@ -2,7 +2,6 @@
 
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h
index fcb48d403..efb8620d9 100644
--- a/soh/soh/resource/type/scenecommand/SetCsCamera.h
+++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
index 170e36d29..51e1e30b1 100644
--- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
@@ -2,7 +2,6 @@
 
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h
index 19e0129cb..5e15d8dc5 100644
--- a/soh/soh/resource/type/scenecommand/SetEntranceList.h
+++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetLightList.h b/soh/soh/resource/type/scenecommand/SetLightList.h
index a0d0cd1bb..7f8898be3 100644
--- a/soh/soh/resource/type/scenecommand/SetLightList.h
+++ b/soh/soh/resource/type/scenecommand/SetLightList.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetMesh.h b/soh/soh/resource/type/scenecommand/SetMesh.h
index 3843da819..d81c969da 100644
--- a/soh/soh/resource/type/scenecommand/SetMesh.h
+++ b/soh/soh/resource/type/scenecommand/SetMesh.h
@@ -2,9 +2,7 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include "SceneCommand.h"
-#include "libultraship/libultra.h"
 #include "z64math.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h
index 0286f0916..4d8b6704b 100644
--- a/soh/soh/resource/type/scenecommand/SetObjectList.h
+++ b/soh/soh/resource/type/scenecommand/SetObjectList.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <string>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
index 7df68934a..6707c3749 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <memory>
 #include "SceneCommand.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/scenecommand/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h
index 0fe114e89..40fdf7c13 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomList.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomList.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include <string>
 #include "SceneCommand.h"
 #include "RomFile.h"
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
index 73d23cc06..7db5c7899 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <memory>
 #include "SceneCommand.h"
 
 namespace SOH {
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
index 69c26196d..121864976 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
index d2db2b8c5..4b2aad73d 100644
--- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
index b7c233694..df1cb0b5f 100644
--- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
+++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
@@ -2,7 +2,6 @@
 
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
index cb170f7e8..be2550d7b 100644
--- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include "SceneCommand.h"
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetWindSettings.h b/soh/soh/resource/type/scenecommand/SetWindSettings.h
index 8a8374e1c..56a21a7db 100644
--- a/soh/soh/resource/type/scenecommand/SetWindSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 typedef struct {
diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c
index 7ea005209..2b0323c37 100644
--- a/soh/soh/stubs.c
+++ b/soh/soh/stubs.c
@@ -1,7 +1,7 @@
-#include <libultraship/libultra.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "z64.h"
 
 u32 osResetType;
diff --git a/soh/soh/util.cpp b/soh/soh/util.cpp
index d331eb3a7..daec2c288 100644
--- a/soh/soh/util.cpp
+++ b/soh/soh/util.cpp
@@ -1,13 +1,16 @@
-#include "util.h"
-
 #include <string.h>
 #include <vector>
 #include <algorithm>
 #include <array>
 #include <assert.h>
+
 #include <spdlog/spdlog.h>
-#include "Enhancements/randomizer/randomizerTypes.h"
+
+#include "util.h"
+
+extern "C" {
 #include <variables.h>
+}
 
 std::string invalidString = "";
 
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index 9d390cc82..1d2a70cfc 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -1,9 +1,11 @@
 #include <ship/Context.h>
 #include <ship/resource/ResourceManager.h>
-#include <ship/utils/StringHelper.h>
-#include "global.h"
+
 #include "soh/resource/type/Text.h"
+
+extern "C" {
 #include <message_data_static.h>
+}
 
 extern "C" MessageTableEntry* sNesMessageEntryTablePtr;
 extern "C" MessageTableEntry* sGerMessageEntryTablePtr;
diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp
index 719f2076a..a9537cea2 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -1,11 +1,16 @@
-#include "ResourceManagerHelpers.h"
-#include "soh/resource/type/Scene.h"
 #include <ship/Context.h>
 #include <ship/resource/ResourceManager.h>
 #include <ship/utils/StringHelper.h>
 #include <spdlog/spdlog.h>
+
+#include "ResourceManagerHelpers.h"
+#include "soh/resource/type/Scene.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "global.h"
+
+extern "C" {
+#include "functions.h"
+#include "variables.h"
+}
 
 extern "C" void Play_InitScene(PlayState* play, s32 spawn);
 extern "C" void Play_InitEnvironment(PlayState* play, s16 skyboxId);
diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp
index ab59068e6..72e2f063e 100644
--- a/soh/soh/z_scene_otr.cpp
+++ b/soh/soh/z_scene_otr.cpp
@@ -1,13 +1,12 @@
+#include <memory>
+#include <cassert>
+
+#include <ship/resource/type/Blob.h>
+#include <spdlog/spdlog.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "ResourceManagerHelpers.h"
 #include "soh/resource/type/Scene.h"
-#include "global.h"
-#include "vt.h"
-#include "soh/resource/type/CollisionHeader.h"
-#include "soh/resource/type/Cutscene.h"
-#include <ship/resource/type/Blob.h>
-#include <memory>
-#include <cassert>
 #include "soh/resource/type/scenecommand/SetCameraSettings.h"
 #include "soh/resource/type/scenecommand/SetCutscenes.h"
 #include "soh/resource/type/scenecommand/SetStartPositionList.h"
@@ -29,7 +28,13 @@
 #include "soh/resource/type/scenecommand/SetSoundSettings.h"
 #include "soh/resource/type/scenecommand/SetEchoSettings.h"
 #include "soh/resource/type/scenecommand/SetAlternateHeaders.h"
-#include <spdlog/spdlog.h>
+
+extern "C" {
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
+#include "vt.h"
+}
 
 extern Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName);
 extern "C" s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId);