diff --git a/soh/include/global.h b/soh/include/global.h
index a313bcb212..038e48843e 100644
--- a/soh/include/global.h
+++ b/soh/include/global.h
@@ -17,7 +17,6 @@ extern "C++" {
 #ifdef __cplusplus
 }
 #endif
-#include <libultraship/bridge.h>
 
 #define _AudioseqSegmentRomStart "Audioseq"
 #define _AudiobankSegmentRomStart "Audiobank"
diff --git a/soh/include/z64audio.h b/soh/include/z64audio.h
index cbd82fcf2b..371d9da000 100644
--- a/soh/include/z64audio.h
+++ b/soh/include/z64audio.h
@@ -5,8 +5,6 @@
 extern "C" {
 #endif
 
-#include <ship/utils/binarytools/endianness.h>
-
 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))
 
 #define NO_LAYER ((SequenceLayer*)(-1))
diff --git a/soh/include/z64light.h b/soh/include/z64light.h
index aa79f3c2a7..f1c00d7d99 100644
--- a/soh/include/z64light.h
+++ b/soh/include/z64light.h
@@ -4,7 +4,6 @@
 #include <libultraship/libultra.h>
 #include <libultraship/libultra/gbi.h>
 #include "z64math.h"
-#include <libultraship/color.h>
 
 typedef struct {
     /* 0x0 */ s16 x;
diff --git a/soh/soh/CrashHandlerExt.cpp b/soh/soh/CrashHandlerExt.cpp
index f5277a9e8a..b5fcd0f618 100644
--- a/soh/soh/CrashHandlerExt.cpp
+++ b/soh/soh/CrashHandlerExt.cpp
@@ -2,7 +2,6 @@
 #include "variables.h"
 #include "z64.h"
 #include "z64actor.h"
-#include <string.h>
 #include <stdio.h>
 #include <array>
 #include "soh/ActorDB.h"
diff --git a/soh/soh/CrashHandlerExt.h b/soh/soh/CrashHandlerExt.h
index 8cda6e61e8..ad1a6f1c66 100644
--- a/soh/soh/CrashHandlerExt.h
+++ b/soh/soh/CrashHandlerExt.h
@@ -1,4 +1,4 @@
-#include <libultraship/bridge.h>
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soh/soh/Enhancements/AlwaysOnFixes.cpp b/soh/soh/Enhancements/AlwaysOnFixes.cpp
index 6b1eec2c95..f6452ffd48 100644
--- a/soh/soh/Enhancements/AlwaysOnFixes.cpp
+++ b/soh/soh/Enhancements/AlwaysOnFixes.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Cheats/DekuStick.cpp b/soh/soh/Enhancements/Cheats/DekuStick.cpp
index 6798780711..d3122f9fcd 100644
--- a/soh/soh/Enhancements/Cheats/DekuStick.cpp
+++ b/soh/soh/Enhancements/Cheats/DekuStick.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
diff --git a/soh/soh/Enhancements/Cheats/EasyISG.cpp b/soh/soh/Enhancements/Cheats/EasyISG.cpp
index f48788a9d9..263403cada 100644
--- a/soh/soh/Enhancements/Cheats/EasyISG.cpp
+++ b/soh/soh/Enhancements/Cheats/EasyISG.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Cheats/EasyQPA.cpp b/soh/soh/Enhancements/Cheats/EasyQPA.cpp
index 096123cdd0..78a30bd3cd 100644
--- a/soh/soh/Enhancements/Cheats/EasyQPA.cpp
+++ b/soh/soh/Enhancements/Cheats/EasyQPA.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Cheats/FreezeTime.cpp b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
index a3028d7dab..4c38e2870d 100644
--- a/soh/soh/Enhancements/Cheats/FreezeTime.cpp
+++ b/soh/soh/Enhancements/Cheats/FreezeTime.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/Cheats/GSTargetable.cpp b/soh/soh/Enhancements/Cheats/GSTargetable.cpp
index 60911a06ea..47dc918044 100644
--- a/soh/soh/Enhancements/Cheats/GSTargetable.cpp
+++ b/soh/soh/Enhancements/Cheats/GSTargetable.cpp
@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "functions.h"
-#include "macros.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 8be70c6976..9ef5a1f21a 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/OTRGlobals.h"
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
index d731059e5c..35f413d4ad 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Health.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
index 38b402d6d2..ac9a4b351b 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/Money.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
index f3ff5fe043..732437d499 100644
--- a/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
+++ b/soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/Cheats/MoonJump.cpp b/soh/soh/Enhancements/Cheats/MoonJump.cpp
index fb13c1c7b1..13495caf67 100644
--- a/soh/soh/Enhancements/Cheats/MoonJump.cpp
+++ b/soh/soh/Enhancements/Cheats/MoonJump.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
index b770ef863a..30113d3916 100644
--- a/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
+++ b/soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "macros.h"
 #include "src/overlays/actors/ovl_En_Insect/z_en_insect.h"
 
 extern s16 D_80A7DEB8;
diff --git a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
index 3616191cad..6c4d42ed30 100644
--- a/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
+++ b/soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp
@@ -1,11 +1,6 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "macros.h"
-}
-
 static constexpr int32_t CVAR_NOKEESEGUAYTARGET_DEFAULT = 0;
 #define CVAR_NOKEESEGUAYTARGET_NAME CVAR_CHEAT("NoKeeseGuayTarget")
 #define CVAR_NOKEESEGUAYTARGET_VALUE CVarGetInteger(CVAR_NOKEESEGUAYTARGET_NAME, CVAR_NOKEESEGUAYTARGET_DEFAULT)
diff --git a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
index 7ed2452348..2d8cb1b5b9 100644
--- a/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
+++ b/soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp
@@ -1,11 +1,6 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "macros.h"
-}
-
 static constexpr int32_t CVAR_NOREDEADFREEZE_DEFAULT = 0;
 #define CVAR_NOREDEADFREEZE_NAME CVAR_CHEAT("NoRedeadFreeze")
 #define CVAR_NOREDEADFREEZE_VALUE CVarGetInteger(CVAR_NOREDEADFREEZE_NAME, CVAR_NOREDEADFREEZE_DEFAULT)
diff --git a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
index 0b5aaebbc4..c0ee9675af 100644
--- a/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
+++ b/soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
index 8d3b06b1d4..2b21437b34 100644
--- a/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
+++ b/soh/soh/Enhancements/Difficulty/HyperBosses.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ShipInit.hpp"
 #include "functions.h"
 #include "macros.h"
diff --git a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
index b2e0c933b2..42f7c9cc15 100644
--- a/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
+++ b/soh/soh/Enhancements/Difficulty/HyperEnemies.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
diff --git a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
index 4d3975aca2..de9e6c1f1a 100644
--- a/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
+++ b/soh/soh/Enhancements/Difficulty/PermanentLosses.cpp
@@ -9,7 +9,6 @@
 
 extern "C" {
 #include "functions.h"
-#include "macros.h"
 #include "variables.h"
 #include "z64save.h"
 extern SaveContext gSaveContext;
diff --git a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
index 8d1643d8d6..d3ebc4305a 100644
--- a/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
+++ b/soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp b/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp
index 582e4d4240..458d066a7f 100644
--- a/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp
+++ b/soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp
@@ -5,7 +5,6 @@
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "variables.h"
-#include "soh/cvar_prefixes.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/SohMenu.h"
diff --git a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
index 75350a4fd3..abe9144daf 100644
--- a/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
+++ b/soh/soh/Enhancements/ExtraModes/ShadowTag.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
diff --git a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
index 08bec05646..d0525ac6a1 100644
--- a/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
+++ b/soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "macros.h"
 #include "functions.h"
 }
 
diff --git a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
index 8c05c5c675..86b13d5139 100644
--- a/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
+++ b/soh/soh/Enhancements/Fixes/FloorSwitches.cpp
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "macros.h"
 #include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
 }
 
diff --git a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
index 0174cc74da..7a8dccce35 100644
--- a/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
+++ b/soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp
@@ -4,7 +4,6 @@
 extern "C" {
 #include "src/overlays/actors/ovl_En_Bb/z_en_bb.h"
 #include "src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h"
-#include "src/overlays/actors/ovl_En_Mb/z_en_mb.h"
 #include "src/overlays/actors/ovl_En_Tite/z_en_tite.h"
 #include "src/overlays/actors/ovl_En_Zf/z_en_zf.h"
 #include "src/overlays/actors/ovl_En_Wf/z_en_wf.h"
diff --git a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
index 9fbc3375db..72f7bd3a3e 100644
--- a/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
+++ b/soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp
@@ -1,12 +1,9 @@
-#include <libultraship/bridge.h>
-#include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
-#include "macros.h"
 #include "variables.h"
 }
 
diff --git a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
index e6dc670821..e3a409196d 100644
--- a/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
+++ b/soh/soh/Enhancements/Graphics/ToTMedallions.cpp
@@ -1,7 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
-#include "soh/ResourceManagerHelpers.h"
 
 extern "C" {
 #include "align_asset_macro.h"
diff --git a/soh/soh/Enhancements/Items/ItemUnequip.cpp b/soh/soh/Enhancements/Items/ItemUnequip.cpp
index df590fe25c..68e1987f5a 100644
--- a/soh/soh/Enhancements/Items/ItemUnequip.cpp
+++ b/soh/soh/Enhancements/Items/ItemUnequip.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp b/soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp
index bb215eb7a7..acd73ade1e 100644
--- a/soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp
+++ b/soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
diff --git a/soh/soh/Enhancements/QoL/Autosave.cpp b/soh/soh/Enhancements/QoL/Autosave.cpp
index fd595007b0..3ec3240048 100644
--- a/soh/soh/Enhancements/QoL/Autosave.cpp
+++ b/soh/soh/Enhancements/QoL/Autosave.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Notification/Notification.h"
 #include "soh/ShipInit.hpp"
diff --git a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
index 12b220e6b2..9cbb3de053 100644
--- a/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
+++ b/soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ShipInit.hpp"
 #include "functions.h"
 #include "macros.h"
diff --git a/soh/soh/Enhancements/QoL/ResetHotKey.cpp b/soh/soh/Enhancements/QoL/ResetHotKey.cpp
index 589ff89032..fb92f1a014 100644
--- a/soh/soh/Enhancements/QoL/ResetHotKey.cpp
+++ b/soh/soh/Enhancements/QoL/ResetHotKey.cpp
@@ -1,12 +1,13 @@
-#include <libultraship/classes.h>
+#include <ship/Context.h>
+#include <ship/window/Window.h>
+#include <ship/window/gui/ConsoleWindow.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "functions.h"
 #include "soh/OTRGlobals.h"
 
 extern "C" {
-#include "z64.h"
-#include "overlays/gamestates/ovl_file_choose/file_choose.h"
+#include "macros.h"
+#include "variables.h"
 }
 
 static constexpr int32_t CVAR_RESET_BTN_MASK_DEFAULT = BTN_CUSTOM_MODIFIER2;
diff --git a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
index aa2b5f06c6..9ffc33f405 100644
--- a/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
+++ b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/OTRGlobals.h"
diff --git a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
index adb2664ee0..f36c07a483 100644
--- a/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
+++ b/soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp
@@ -1,11 +1,11 @@
-#include <libultraship/classes.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
-#include "soh/Enhancements/enhancementTypes.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/SwitchAge.cpp b/soh/soh/Enhancements/SwitchAge.cpp
index 1e3973fe0c..03837f0406 100644
--- a/soh/soh/Enhancements/SwitchAge.cpp
+++ b/soh/soh/Enhancements/SwitchAge.cpp
@@ -1,12 +1,9 @@
 #include "soh/Enhancements/SwitchAge.h"
-#include <libultraship/bridge.h>
-#include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 extern "C" {
 #include <z64.h>
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 #include "variables.h"
 #include "functions.h"
 
diff --git a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
index 959d6156c0..de0cc594df 100644
--- a/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
+++ b/soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp
@@ -7,6 +7,7 @@
 #include "soh/SohGui/ImGuiUtils.h"
 
 #include <fast/Fast3dGui.h>
+#include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>
 
 extern "C" {
diff --git a/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
index 2b8794978f..54ed6119c7 100644
--- a/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
+++ b/soh/soh/Enhancements/TimeSavers/CrawlSpeed.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
diff --git a/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
index 20011bba31..255eca833b 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterBeanSkulltula.cpp
@@ -1,10 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "z64save.h"
-}
-
 void RegisterFasterBeanSkulltula() {
     COND_VB_SHOULD(VB_SPAWN_BEAN_SKULLTULA, CVarGetInteger(CVAR_ENHANCEMENT("FasterBeanSkull"), 0),
                    { *should = true; });
diff --git a/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
index 47b6b7461e..018bf7b430 100644
--- a/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
+++ b/soh/soh/Enhancements/TimeSavers/FasterBottleEmpty.cpp
@@ -1,10 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "z64save.h"
-}
-
 void RegisterFasterEmptyBottle() {
     COND_VB_SHOULD(VB_EMPTYING_BOTTLE, CVarGetInteger(CVAR_ENHANCEMENT("FasterBottleEmpty"), 0), {
         Player* player = va_arg(args, Player*);
diff --git a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp
index 9661d1a369..4a1fcfa851 100644
--- a/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp
+++ b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include <spdlog/spdlog.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
diff --git a/soh/soh/Enhancements/Warping.cpp b/soh/soh/Enhancements/Warping.cpp
index fa0f3be016..2773391ae8 100644
--- a/soh/soh/Enhancements/Warping.cpp
+++ b/soh/soh/Enhancements/Warping.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include <ship/Context.h>
 #include <ship/config/Config.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
diff --git a/soh/soh/Enhancements/audio/AudioCollection.cpp b/soh/soh/Enhancements/audio/AudioCollection.cpp
index 4ed88a60c0..bda1588094 100644
--- a/soh/soh/Enhancements/audio/AudioCollection.cpp
+++ b/soh/soh/Enhancements/audio/AudioCollection.cpp
@@ -9,7 +9,6 @@
 #include <ship/Context.h>
 #include <ship/utils/StringHelper.h>
 #include <ship/window/Window.h>
-#include <soh/OTRGlobals.h>
 #include <locale>
 #include <filesystem>
 
diff --git a/soh/soh/Enhancements/audio/AudioEditor.cpp b/soh/soh/Enhancements/audio/AudioEditor.cpp
index 59d8774692..935c7927aa 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.cpp
+++ b/soh/soh/Enhancements/audio/AudioEditor.cpp
@@ -13,7 +13,6 @@
 #include "soh/SohGui/SohGui.hpp"
 #include "AudioCollection.h"
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/ShipUtils.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 
diff --git a/soh/soh/Enhancements/audio/AudioEditor.h b/soh/soh/Enhancements/audio/AudioEditor.h
index 1a6e887746..eb0a685698 100644
--- a/soh/soh/Enhancements/audio/AudioEditor.h
+++ b/soh/soh/Enhancements/audio/AudioEditor.h
@@ -1,12 +1,10 @@
 #pragma once
-#include <stdint.h>
 
 #ifdef __cplusplus
 
 #include <libultraship/libultra/types.h>
 #include <ship/window/gui/GuiWindow.h>
 
-#include <imgui.h>
 #include "AudioCollection.h"
 
 class AudioEditor final : public Ship::GuiWindow {
diff --git a/soh/soh/Enhancements/bootcommands.c b/soh/soh/Enhancements/bootcommands.c
index b9838cf66a..3cda26a823 100644
--- a/soh/soh/Enhancements/bootcommands.c
+++ b/soh/soh/Enhancements/bootcommands.c
@@ -1,6 +1,5 @@
-#include <stddef.h>
 #include <stdbool.h>
-#include <libultraship/bridge.h>
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "bootcommands.h"
 #include "soh/cvar_prefixes.h"
 
diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp
index c585588413..de34e55a16 100644
--- a/soh/soh/Enhancements/controls/InputViewer.cpp
+++ b/soh/soh/Enhancements/controls/InputViewer.cpp
@@ -5,7 +5,6 @@
 #include <ship/Context.h>
 #include <libultraship/controller/controldeck/ControlDeck.h>
 #include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
 #include <imgui.h>
 #include <spdlog/spdlog.h>
 #include <cmath>
@@ -15,8 +14,6 @@
 
 #include <fast/Fast3dGui.h>
 
-#include <fast/Fast3dGui.h>
-
 using namespace UIWidgets;
 
 // Text colors
diff --git a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
index c093594ef9..767f8bf9c6 100644
--- a/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
+++ b/soh/soh/Enhancements/cosmetics/A11yNoScreenFlashForFinishingBlow.cpp
@@ -1,10 +1,8 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
-#include "macros.h"
 
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
index 9bc3cc9ea5..c3db529a94 100644
--- a/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/CosmeticsEditor.cpp
@@ -3,8 +3,8 @@
 #include "authenticGfxPatches.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 
+#include <ship/controller/controldeck/ControlDeck.h>
 #include <string>
-#include <libultraship/libultraship.h>
 
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohMenu.h"
diff --git a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
index 77be9b19ad..43f911f46b 100644
--- a/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
+++ b/soh/soh/Enhancements/cosmetics/CustomSkeletons.cpp
@@ -3,7 +3,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/cosmetics/DynamicCosmeticsEditor.cpp b/soh/soh/Enhancements/cosmetics/DynamicCosmeticsEditor.cpp
index 7df9aaefda..e2254ed190 100644
--- a/soh/soh/Enhancements/cosmetics/DynamicCosmeticsEditor.cpp
+++ b/soh/soh/Enhancements/cosmetics/DynamicCosmeticsEditor.cpp
@@ -7,7 +7,6 @@
 #include <vector>
 #include <cctype>
 #include <cstdlib>
-#include <math.h>
 #include <tinyxml2.h>
 #include <fast/resource/type/DisplayList.h>
 #include <ship/resource/archive/Archive.h>
@@ -17,7 +16,6 @@
 #include "soh/OTRGlobals.h"
 
 extern "C" {
-#include "macros.h"
 #include "soh/cvar_prefixes.h"
 }
 
diff --git a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
index 048a27cf9e..1b204be28d 100644
--- a/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
+++ b/soh/soh/Enhancements/cosmetics/FileSelectMoreInfo.cpp
@@ -3,7 +3,6 @@
 #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 "textures/nes_font_static/nes_font_static.h"
 #include "soh_assets.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/SaveManager.h"
diff --git a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
index bd99ca1b11..0cb528c0ac 100644
--- a/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
+++ b/soh/soh/Enhancements/cosmetics/TimeFlowFileSelect.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
index 6ef8774a62..3d0012b6c4 100644
--- a/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
+++ b/soh/soh/Enhancements/cosmetics/authenticGfxPatches.cpp
@@ -1,6 +1,6 @@
-#include <libultraship/bridge.h>
 #include <string>
-#include "soh/OTRGlobals.h"
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/cvar_prefixes.h"
 #include "soh/ResourceManagerHelpers.h"
 
diff --git a/soh/soh/Enhancements/debugconsole.cpp b/soh/soh/Enhancements/debugconsole.cpp
index caa0f9f7a6..45dcebb0f5 100644
--- a/soh/soh/Enhancements/debugconsole.cpp
+++ b/soh/soh/Enhancements/debugconsole.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 #include <string>
 #include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
 #include <soh/Enhancements/item-tables/ItemTableManager.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
@@ -21,8 +20,6 @@
 
 #include <ship/window/Window.h>
 #include <ship/Context.h>
-#include <imgui.h>
-#include <imgui_internal.h>
 #undef PATH_HACK
 #undef Path
 
diff --git a/soh/soh/Enhancements/debugconsole.h b/soh/soh/Enhancements/debugconsole.h
index c41c641bb7..ffd0cb0cb6 100644
--- a/soh/soh/Enhancements/debugconsole.h
+++ b/soh/soh/Enhancements/debugconsole.h
@@ -1,5 +1,3 @@
 #pragma once
 
-#include <stdint.h>
-
 void DebugConsole_Init(void);
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.cpp b/soh/soh/Enhancements/debugger/MessageViewer.cpp
index 36766e160d..8f5808024d 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.cpp
+++ b/soh/soh/Enhancements/debugger/MessageViewer.cpp
@@ -10,7 +10,6 @@
 #include "../custom-message/CustomMessageManager.h"
 #include "functions.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 #include "message_data_static.h"
 #include "variables.h"
 #include "soh/util.h"
diff --git a/soh/soh/Enhancements/debugger/MessageViewer.h b/soh/soh/Enhancements/debugger/MessageViewer.h
index 9df7f2eb40..0faed49cc5 100644
--- a/soh/soh/Enhancements/debugger/MessageViewer.h
+++ b/soh/soh/Enhancements/debugger/MessageViewer.h
@@ -4,7 +4,7 @@
 
 #ifdef __cplusplus
 #include <ship/window/gui/GuiWindow.h>
-#include <unordered_map>
+
 extern "C" {
 #endif
 /**
diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.h b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
index 9ae390d146..daf401451c 100644
--- a/soh/soh/Enhancements/debugger/SohConsoleWindow.h
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
@@ -1,7 +1,6 @@
 #ifndef SOH_CONSOLE_H
 #define SOH_CONSOLE_H
 
-#include <ship/window/gui/GuiWindow.h>
 #include <ship/window/gui/ConsoleWindow.h>
 
 class SohConsoleWindow : public Ship::ConsoleWindow {
diff --git a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
index 7b9267693a..9de2d752f1 100644
--- a/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
+++ b/soh/soh/Enhancements/debugger/SohGfxDebuggerWindow.h
@@ -1,7 +1,6 @@
 #ifndef SOH_GFX_DEBUGGER_H
 #define SOH_GFX_DEBUGGER_H
 
-#include <ship/window/gui/GuiWindow.h>
 #include <libultraship/window/gui/GfxDebuggerWindow.h>
 
 class SohGfxDebuggerWindow : public LUS::GfxDebuggerWindow {
diff --git a/soh/soh/Enhancements/debugger/actorViewer.cpp b/soh/soh/Enhancements/debugger/actorViewer.cpp
index 6d9c400e6c..4ff9f82f13 100644
--- a/soh/soh/Enhancements/debugger/actorViewer.cpp
+++ b/soh/soh/Enhancements/debugger/actorViewer.cpp
@@ -9,11 +9,8 @@
 
 #include <algorithm>
 #include <array>
-#include <bit>
-#include <map>
 #include <unordered_map>
 #include <string>
-#include <libultraship/bridge.h>
 #include <spdlog/fmt/fmt.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
@@ -22,13 +19,9 @@
 extern "C" {
 #include <z64.h>
 #include "z64math.h"
-#include "variables.h"
 #include "functions.h"
 #include "macros.h"
 extern PlayState* gPlayState;
-
-#include "textures/icon_item_static/icon_item_static.h"
-#include "textures/icon_item_24_static/icon_item_24_static.h"
 }
 
 #define DEKUNUTS_FLOWER 10
diff --git a/soh/soh/Enhancements/debugger/colViewer.cpp b/soh/soh/Enhancements/debugger/colViewer.cpp
index 14a753b5ab..ce6c88b7d4 100644
--- a/soh/soh/Enhancements/debugger/colViewer.cpp
+++ b/soh/soh/Enhancements/debugger/colViewer.cpp
@@ -12,7 +12,6 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 #include "overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
index 99c6eee523..3a53670551 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -22,7 +22,6 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/debugger/dlViewer.cpp b/soh/soh/Enhancements/debugger/dlViewer.cpp
index df3bff6465..82107309a9 100644
--- a/soh/soh/Enhancements/debugger/dlViewer.cpp
+++ b/soh/soh/Enhancements/debugger/dlViewer.cpp
@@ -1,4 +1,3 @@
-#include "actorViewer.h"
 #include "soh/util.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
@@ -8,17 +7,12 @@
 #include <fast/resource/type/DisplayList.h>
 #include "soh/OTRGlobals.h"
 
-#include <array>
-#include <bit>
 #include <map>
 #include <string>
 #include "dlViewer.h"
 
 extern "C" {
 #include <z64.h>
-#include "z64math.h"
-#include "variables.h"
-#include "functions.h"
 #include "macros.h"
 }
 
diff --git a/soh/soh/Enhancements/debugger/hookDebugger.cpp b/soh/soh/Enhancements/debugger/hookDebugger.cpp
index c101b7c716..1c554933e3 100644
--- a/soh/soh/Enhancements/debugger/hookDebugger.cpp
+++ b/soh/soh/Enhancements/debugger/hookDebugger.cpp
@@ -1,11 +1,9 @@
 #include "hookDebugger.h"
-#include <libultraship/libultra.h>
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/OTRGlobals.h"
 #include <string>
-#include <version>
 
 static std::map<const char*, std::map<HOOK_ID, HookInfo>*> hookData;
 
diff --git a/soh/soh/Enhancements/debugger/performanceTimer.h b/soh/soh/Enhancements/debugger/performanceTimer.h
index 6bff229a39..336e5bf8d2 100644
--- a/soh/soh/Enhancements/debugger/performanceTimer.h
+++ b/soh/soh/Enhancements/debugger/performanceTimer.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <vector>
 #include <array>
 #include <chrono>
 
diff --git a/soh/soh/Enhancements/debugger/valueViewer.cpp b/soh/soh/Enhancements/debugger/valueViewer.cpp
index 85d78f5cbc..4e3f3cf940 100644
--- a/soh/soh/Enhancements/debugger/valueViewer.cpp
+++ b/soh/soh/Enhancements/debugger/valueViewer.cpp
@@ -12,7 +12,6 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 #include "overlays/actors/ovl_Door_Warp1/z_door_warp1.h"
 
 extern PlayState* gPlayState;
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
index 5b7899bcd2..2c6f1ab6a0 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractionEffect.cpp
@@ -10,7 +10,6 @@ have functions to both enable and disable said effect.
 
 #include "GameInteractionEffect.h"
 #include "GameInteractor.h"
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/cosmetics/CosmeticsEditor.h"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
index d8e6abdb66..b3bc3195ec 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.cpp
@@ -10,7 +10,6 @@ GameInteractor functions can be called directly.
 */
 
 #include "GameInteractor.h"
-#include <libultraship/bridge.h>
 
 extern "C" {
 #include "variables.h"
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor.h b/soh/soh/Enhancements/game-interactor/GameInteractor.h
index 45840b4890..7c0fed98f3 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor.h
@@ -89,7 +89,6 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);
 #include <functional>
 #include <cstring>
 
-#include <version>
 #ifdef __cpp_lib_source_location
 #include <source_location>
 #else
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
index c93568712b..85a9bb57f2 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_Hooks.h
@@ -2,7 +2,6 @@
 
 #include "vanilla-behavior/GIVanillaBehavior.h"
 #include "GameInteractor.h"
-#include <stdarg.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
index 9267724456..0e0129f367 100644
--- a/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
+++ b/soh/soh/Enhancements/game-interactor/GameInteractor_RawAction.cpp
@@ -1,15 +1,12 @@
 #include "GameInteractor.h"
-#include <libultraship/bridge.h>
 #include "soh/ShipUtils.h"
 #include <math.h>
 #include "soh/Enhancements/debugger/colViewer.h"
 #include "soh/Enhancements/nametag.h"
-#include "soh/ShipUtils.h"
 
 extern "C" {
 #include "variables.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 #include "functions.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/gameconsole.c b/soh/soh/Enhancements/gameconsole.c
index 6992b7fb45..4cf3002459 100644
--- a/soh/soh/Enhancements/gameconsole.c
+++ b/soh/soh/Enhancements/gameconsole.c
@@ -1,19 +1,5 @@
 #include "gameconsole.h"
-#include "../OTRGlobals.h"
-#include <macros.h>
-#include <z64.h>
-#include <libultraship/libultra.h>
 #include <functions.h>
-#include <variables.h>
-#include <stdarg.h>
-#include <string.h>
-#include <z64.h>
-#include <libultraship/libultra/gbi.h>
-#include <libultraship/libultra/gs2dex.h>
-#include <libultraship/libultra/controller.h>
-#include <string.h> /* memcpy */
-#include <stdio.h>
-#include <stdlib.h>
 
 extern PlayState* gPlayState;
 
diff --git a/soh/soh/Enhancements/gameconsole.h b/soh/soh/Enhancements/gameconsole.h
index 0952baf08a..09d445f559 100644
--- a/soh/soh/Enhancements/gameconsole.h
+++ b/soh/soh/Enhancements/gameconsole.h
@@ -1,9 +1,10 @@
 #ifndef _GAMECONSOLE_H_
 #define _GAMECONSOLE_H_
 
+#include <stdbool.h>
+#include <libultraship/bridge/consolevariablebridge.h>
 #include <libultraship/libultra.h>
 #include <z64.h>
-#include <libultraship/bridge.h>
 
 #define MAX_CVARS 2048
 
diff --git a/soh/soh/Enhancements/gameplaystats.cpp b/soh/soh/Enhancements/gameplaystats.cpp
index 06a6db848c..c2e4a7de33 100644
--- a/soh/soh/Enhancements/gameplaystats.cpp
+++ b/soh/soh/Enhancements/gameplaystats.cpp
@@ -8,9 +8,7 @@
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/util.h"
 
-#include <vector>
 #include <string>
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/OTRGlobals.h"
 
diff --git a/soh/soh/Enhancements/kaleido.cpp b/soh/soh/Enhancements/kaleido.cpp
index af3bf1207a..c576cd92b8 100644
--- a/soh/soh/Enhancements/kaleido.cpp
+++ b/soh/soh/Enhancements/kaleido.cpp
@@ -12,7 +12,6 @@ extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include <textures/message_static/message_static.h>
 #include <textures/parameter_static/parameter_static.h>
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/mod_menu.cpp b/soh/soh/Enhancements/mod_menu.cpp
index 08193ccfd0..84280ac19e 100644
--- a/soh/soh/Enhancements/mod_menu.cpp
+++ b/soh/soh/Enhancements/mod_menu.cpp
@@ -4,12 +4,10 @@
 #include <set>
 #include <vector>
 
-#include <libultraship/classes.h>
 #include <ship/utils/StringHelper.h>
 
 #include "mod_menu.h"
 #include "soh/OTRGlobals.h"
-#include "soh/resource/type/Skeleton.h"
 #include "soh/SohGui/MenuTypes.h"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
diff --git a/soh/soh/Enhancements/nametag.cpp b/soh/soh/Enhancements/nametag.cpp
index 7f17c96eb2..49d5d5f1ce 100644
--- a/soh/soh/Enhancements/nametag.cpp
+++ b/soh/soh/Enhancements/nametag.cpp
@@ -1,5 +1,4 @@
 #include "nametag.h"
-#include <libultraship/bridge.h>
 #include <vector>
 #include <algorithm>
 #include "soh/frame_interpolation.h"
@@ -12,7 +11,6 @@ extern "C" {
 #include "macros.h"
 #include "soh/cvar_prefixes.h"
 #include "functions.h"
-#include "variables.h"
 #include "textures/message_static/message_static.h"
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/nametag.h b/soh/soh/Enhancements/nametag.h
index 6926434276..95e335dcca 100644
--- a/soh/soh/Enhancements/nametag.h
+++ b/soh/soh/Enhancements/nametag.h
@@ -2,7 +2,6 @@
 #define NAMETAG_H
 
 #include <libultraship/color.h>
-#include <libultraship/libultra.h>
 
 struct Actor;
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/fill.hpp b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
index b5285becae..0c972bb427 100644
--- a/soh/soh/Enhancements/randomizer/3drando/fill.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/fill.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "../randomizerTypes.h"
 #include "../location_access.h"
 #include "../entrance.h"
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
index 1de7336627..c524953c19 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hint_list.cpp
@@ -1,4 +1,3 @@
-#include "../randomizerTypes.h"
 #include "../SeedContext.h"
 #include "../static_data.h"
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.cpp b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
index 99ab971e52..08ec7eeca0 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.cpp
@@ -5,7 +5,6 @@
 #include "../trial.h"
 #include "../entrance.h"
 #include <spdlog/spdlog.h>
-#include "../randomizerTypes.h"
 #include "pool_functions.hpp"
 #include "../hint.h"
 #include "../static_data.h"
diff --git a/soh/soh/Enhancements/randomizer/3drando/hints.hpp b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
index d9cd86879d..8ad5bc32c9 100644
--- a/soh/soh/Enhancements/randomizer/3drando/hints.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/hints.hpp
@@ -5,7 +5,6 @@
 #include <variant>
 
 #include <functional>
-#include "../randomizerTypes.h"
 #include "../../custom-message/CustomMessageManager.h"
 
 struct HintDistributionSetting {
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
index 0dc1cb095c..e6146641c5 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
@@ -4,11 +4,8 @@
 #include "fill.hpp"
 #include "../static_data.h"
 #include "../SeedContext.h"
-#include "pool_functions.hpp"
 #include "random.hpp"
-#include "spoiler_log.hpp"
 #include "soh/Enhancements/randomizer/Traps.h"
-#include "z64item.h"
 #include <algorithm>
 #include <spdlog/spdlog.h>
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
index 01b9a24593..b8bda99fdd 100644
--- a/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
@@ -2,7 +2,6 @@
 
 #include <cstddef>
 #include <vector>
-#include <stdint.h>
 #include "../randomizerTypes.h"
 
 class ItemLocation;
diff --git a/soh/soh/Enhancements/randomizer/3drando/menu.cpp b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
index a0886da62f..d891abd129 100644
--- a/soh/soh/Enhancements/randomizer/3drando/menu.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/menu.cpp
@@ -3,7 +3,6 @@
 #include "soh/Enhancements/debugger/performanceTimer.h"
 #include "soh/ShipUtils.h"
 #include <spdlog/spdlog.h>
-#include "../../randomizer/randomizerTypes.h"
 
 namespace {
 bool seedChanged;
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
index 4f174a8556..882676e73e 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
@@ -5,7 +5,6 @@
 #include "../location_access.h"
 #include "random.hpp"
 #include "spoiler_log.hpp"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/settings.h"
 #include "variables.h"
 #include "soh/cvar_prefixes.h"
diff --git a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
index 513c4b2fee..afb3926432 100644
--- a/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/playthrough.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <string>
 #include <set>
 #include "../SeedContext.h"
 
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
index b3835cb5ea..1931460df2 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp
@@ -6,9 +6,7 @@
 
 #include <array>
 #include <math.h>
-#include <map>
 #include <spdlog/spdlog.h>
-#include "z64item.h"
 
 PriceSettingsStruct::PriceSettingsStruct(RandomizerSettingKey _main, RandomizerSettingKey _fixedPrice,
                                          RandomizerSettingKey _range1, RandomizerSettingKey _range2,
diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.hpp b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
index 1e81656673..1446f30796 100644
--- a/soh/soh/Enhancements/randomizer/3drando/shops.hpp
+++ b/soh/soh/Enhancements/randomizer/3drando/shops.hpp
@@ -2,7 +2,6 @@
 #include "../SeedContext.h"
 
 #include <vector>
-#include <array>
 
 struct PriceSettingsStruct {
     RandomizerSettingKey main;
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index eb5c529eff..c2eacbdbca 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -12,7 +12,6 @@
 #include <spdlog/spdlog.h>
 
 #include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include <map>
 #include <string>
@@ -24,7 +23,6 @@
 #include <variables.h>
 
 #include <ship/Context.h>
-#include <soh/OTRGlobals.h>
 
 #include <libultraship/bridge/consolevariablebridge.h>
 
diff --git a/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp b/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp
index fe6d6d3c51..018dc3d2ce 100644
--- a/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp
+++ b/soh/soh/Enhancements/randomizer/ColoredMapsAndCompasses.cpp
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
diff --git a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
index 5d945e4749..fdc3e1659d 100644
--- a/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
+++ b/soh/soh/Enhancements/randomizer/LockOverworldDoors.cpp
@@ -5,7 +5,6 @@
 
 extern "C" {
 extern PlayState* gPlayState;
-#include "macros.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 }
 
diff --git a/soh/soh/Enhancements/randomizer/Plandomizer.cpp b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
index 314151efbd..f77a1d3098 100644
--- a/soh/soh/Enhancements/randomizer/Plandomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/Plandomizer.cpp
@@ -13,18 +13,17 @@
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "soh/Enhancements/randomizer/logic.h"
-#include "soh/Enhancements/randomizer/randomizer_check_objects.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>
 
-#include <fast/Fast3dGui.h>
-
 extern "C" {
 #include "include/z64item.h"
 #include "objects/gameplay_keep/gameplay_keep.h"
+#include "textures/icon_item_static/icon_item_static.h"
+#include "textures/parameter_static/parameter_static.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }
diff --git a/soh/soh/Enhancements/randomizer/RocsFeather.cpp b/soh/soh/Enhancements/randomizer/RocsFeather.cpp
index 4a570370cb..28809ffa7b 100644
--- a/soh/soh/Enhancements/randomizer/RocsFeather.cpp
+++ b/soh/soh/Enhancements/randomizer/RocsFeather.cpp
@@ -9,7 +9,6 @@ extern "C" {
 #include "functions.h"
 #include "variables.h"
 #include "macros.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/SeedContext.cpp b/soh/soh/Enhancements/randomizer/SeedContext.cpp
index a80957498f..c07c2f7ff3 100644
--- a/soh/soh/Enhancements/randomizer/SeedContext.cpp
+++ b/soh/soh/Enhancements/randomizer/SeedContext.cpp
@@ -22,6 +22,7 @@
 #include <spdlog/spdlog.h>
 extern "C" {
 #include <functions.h>
+#include <variables.h>
 }
 
 namespace Rando {
diff --git a/soh/soh/Enhancements/randomizer/SeedContext.h b/soh/soh/Enhancements/randomizer/SeedContext.h
index 8b46efb9c2..40c9fb22bf 100644
--- a/soh/soh/Enhancements/randomizer/SeedContext.h
+++ b/soh/soh/Enhancements/randomizer/SeedContext.h
@@ -3,7 +3,6 @@
 #include "randomizerTypes.h"
 #include "z64save.h"
 #include "item_override.h"
-#include "soh/Enhancements/custom-message/text.h"
 #include "hint.h"
 #include "fishsanity.h"
 #include "trial.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
index 1d40ed87a0..17c6503971 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleFairies.cpp
@@ -1,7 +1,6 @@
 #include "soh/OTRGlobals.h"
 #include "randomizer_grotto.h"
 #include "draw.h"
-#include "soh/cvar_prefixes.h"
 #include "static_data.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
diff --git a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
index 45fc1b2ed1..943f6a797f 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleIcicles.cpp
@@ -2,6 +2,7 @@
 #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/ShuffleRedIce.cpp b/soh/soh/Enhancements/randomizer/ShuffleRedIce.cpp
index 979b13367e..3e742a0925 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleRedIce.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleRedIce.cpp
@@ -8,7 +8,6 @@
 extern "C" {
 #include "functions.h"
 #include "overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h"
-#include "objects/object_ice_objects/object_ice_objects.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
index 571566220f..cd9792532d 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleRocks.cpp
@@ -4,6 +4,7 @@
 #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.h b/soh/soh/Enhancements/randomizer/ShuffleRocks.h
index 9784af34bb..c8c9a877b9 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleRocks.h
+++ b/soh/soh/Enhancements/randomizer/ShuffleRocks.h
@@ -1,9 +1,6 @@
 #ifndef SHUFFLEROCKS_H
 #define SHUFFLEROCKS_H
 
-#include <z64.h>
-#include <soh/OTRGlobals.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/soh/soh/Enhancements/randomizer/ShuffleSigns.cpp b/soh/soh/Enhancements/randomizer/ShuffleSigns.cpp
index fadfe5b66f..9f6b1ce487 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleSigns.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleSigns.cpp
@@ -8,7 +8,6 @@
 extern "C" {
 extern PlayState* gPlayState;
 #include "overlays/actors/ovl_En_Kanban/z_en_kanban.h"
-#include "objects/gameplay_keep/gameplay_keep.h"
 #include "overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h"
 #include "overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h"
 }
diff --git a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
index 48352bd08d..96ed5cee62 100644
--- a/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
+++ b/soh/soh/Enhancements/randomizer/ShuffleTrees.cpp
@@ -10,7 +10,6 @@ extern "C" {
 #include "variables.h"
 #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h"
 #include "objects/object_wood02/object_wood02.h"
-#include "soh/Enhancements/enhancementTypes.h"
 extern PlayState* gPlayState;
 void EnWood02_Draw(Actor*, PlayState*);
 }
diff --git a/soh/soh/Enhancements/randomizer/Traps.cpp b/soh/soh/Enhancements/randomizer/Traps.cpp
index 3e06735039..c140031f51 100644
--- a/soh/soh/Enhancements/randomizer/Traps.cpp
+++ b/soh/soh/Enhancements/randomizer/Traps.cpp
@@ -1,6 +1,5 @@
 #include "Traps.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/randomizer/static_data.h"
 #include "soh/ShipUtils.h"
 
diff --git a/soh/soh/Enhancements/randomizer/Traps.h b/soh/soh/Enhancements/randomizer/Traps.h
index dbb4fb6a74..c8170c147d 100644
--- a/soh/soh/Enhancements/randomizer/Traps.h
+++ b/soh/soh/Enhancements/randomizer/Traps.h
@@ -5,9 +5,7 @@
 #endif
 
 #include "soh/Enhancements/custom-message/CustomMessageManager.h"
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "soh/Enhancements/custom-message/text.h"
-#include "libultraship/libultra/types.h"
 
 namespace Rando {
 namespace Traps {
diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp
index fe16e5b10e..9fabbb2fd3 100644
--- a/soh/soh/Enhancements/randomizer/draw.cpp
+++ b/soh/soh/Enhancements/randomizer/draw.cpp
@@ -1,7 +1,5 @@
 #include "draw.h"
 #include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
-#include "randomizerTypes.h"
 #include "soh_assets.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
@@ -13,16 +11,13 @@ extern "C" {
 #include "functions.h"
 #include "variables.h"
 #include "dungeon.h"
-#include "objects/object_box/object_box.h"
 #include "objects/object_gi_key/object_gi_key.h"
 #include "objects/object_gi_bosskey/object_gi_bosskey.h"
-#include "objects/object_gi_bracelet/object_gi_bracelet.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"
 #include "objects/object_gi_scale/object_gi_scale.h"
 #include "objects/object_gi_fire/object_gi_fire.h"
-#include "objects/object_fish/object_fish.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"
@@ -32,12 +27,10 @@ extern "C" {
 #include "objects/object_fd/object_fd.h"
 #include "objects/object_mamenoki/object_mamenoki.h"
 #include "objects/object_mo/object_mo.h"
-#include "objects/object_mori_objects/object_mori_objects.h"
 #include "objects/object_sst/object_sst.h"
 #include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
 #include "objects/object_tw/object_tw.h"
 #include "objects/object_ganon2/object_ganon2.h"
-#include "objects/object_gi_shield_1/object_gi_shield_1.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
 }
diff --git a/soh/soh/Enhancements/randomizer/dungeon.h b/soh/soh/Enhancements/randomizer/dungeon.h
index 14613f7c67..e688b69cc3 100644
--- a/soh/soh/Enhancements/randomizer/dungeon.h
+++ b/soh/soh/Enhancements/randomizer/dungeon.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "randomizerTypes.h"
-
 #include <array>
 #include <vector>
 #include <string>
diff --git a/soh/soh/Enhancements/randomizer/hint.cpp b/soh/soh/Enhancements/randomizer/hint.cpp
index 4f692373f7..17328f8d13 100644
--- a/soh/soh/Enhancements/randomizer/hint.cpp
+++ b/soh/soh/Enhancements/randomizer/hint.cpp
@@ -1,5 +1,4 @@
 #include "hint.h"
-#include "map"
 #include "string"
 #include "SeedContext.h"
 #include <spdlog/spdlog.h>
diff --git a/soh/soh/Enhancements/randomizer/hint.h b/soh/soh/Enhancements/randomizer/hint.h
index 3c820bcdb9..4dbce61a6d 100644
--- a/soh/soh/Enhancements/randomizer/hint.h
+++ b/soh/soh/Enhancements/randomizer/hint.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "soh/Enhancements/custom-message/text.h"
 #include "3drando/hints.hpp"
 #include "../custom-message/CustomMessageManager.h"
 #include "randomizerTypes.h"
diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
index fb3fbc8a35..e105b364fa 100644
--- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp
+++ b/soh/soh/Enhancements/randomizer/hook_handlers.cpp
@@ -1,5 +1,4 @@
-#include <libultraship/bridge.h>
-#include "soh/OTRGlobals.h"
+#include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
diff --git a/soh/soh/Enhancements/randomizer/item.cpp b/soh/soh/Enhancements/randomizer/item.cpp
index 14a35a8d29..ffbb7f130f 100644
--- a/soh/soh/Enhancements/randomizer/item.cpp
+++ b/soh/soh/Enhancements/randomizer/item.cpp
@@ -6,7 +6,6 @@
 #include "3drando/item_pool.hpp"
 #include "z64item.h"
 #include "variables.h"
-#include "macros.h"
 #include "functions.h"
 #include "../../OTRGlobals.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
diff --git a/soh/soh/Enhancements/randomizer/item_category_adj.cpp b/soh/soh/Enhancements/randomizer/item_category_adj.cpp
index a64f1ca833..9a2d2c3644 100644
--- a/soh/soh/Enhancements/randomizer/item_category_adj.cpp
+++ b/soh/soh/Enhancements/randomizer/item_category_adj.cpp
@@ -1,4 +1,3 @@
-#include <stdint.h>
 #include "item_category_adj.h"
 #include "z64item.h"
 #include "variables.h"
diff --git a/soh/soh/Enhancements/randomizer/item_location.h b/soh/soh/Enhancements/randomizer/item_location.h
index 54e3ea55ca..5d74406818 100644
--- a/soh/soh/Enhancements/randomizer/item_location.h
+++ b/soh/soh/Enhancements/randomizer/item_location.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "randomizerTypes.h"
 #include "soh/Enhancements/custom-message/text.h"
 #include "static_data.h"
 #include "option.h"
diff --git a/soh/soh/Enhancements/randomizer/location.h b/soh/soh/Enhancements/randomizer/location.h
index 9426ebd36c..c0249fcae3 100644
--- a/soh/soh/Enhancements/randomizer/location.h
+++ b/soh/soh/Enhancements/randomizer/location.h
@@ -1,12 +1,10 @@
 #pragma once
 
 #include <utility>
-#include <vector>
 
 #include "3drando/spoiler_log.hpp"
 #include "3drando/hints.hpp"
 
-#include "randomizerTypes.h"
 #include "z64actor_enum.h"
 #include "z64scene.h"
 #include "../../util.h"
diff --git a/soh/soh/Enhancements/randomizer/logic.h b/soh/soh/Enhancements/randomizer/logic.h
index 42e3d14e63..ec5ad9e265 100644
--- a/soh/soh/Enhancements/randomizer/logic.h
+++ b/soh/soh/Enhancements/randomizer/logic.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "randomizerTypes.h"
 #include "SeedContext.h"
 #include <stdint.h>
 
diff --git a/soh/soh/Enhancements/randomizer/option.cpp b/soh/soh/Enhancements/randomizer/option.cpp
index 17e8a8cbaf..e789ce4598 100644
--- a/soh/soh/Enhancements/randomizer/option.cpp
+++ b/soh/soh/Enhancements/randomizer/option.cpp
@@ -1,9 +1,7 @@
 #include "option.h"
-#include "libultraship/bridge.h"
 #include <ship/Context.h>
 #include <imgui.h>
 #include "soh/Enhancements/randomizer/settings.h"
-#include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/Enhancements/Lang/Lang.h"
diff --git a/soh/soh/Enhancements/randomizer/option.h b/soh/soh/Enhancements/randomizer/option.h
index 2188aeed7f..b71038d1b1 100644
--- a/soh/soh/Enhancements/randomizer/option.h
+++ b/soh/soh/Enhancements/randomizer/option.h
@@ -8,9 +8,7 @@
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include <type_traits>
 
-#include "randomizerTypes.h"
 #include "tricks.h"
 #include "soh/SohGui/MenuTypes.h"
 
diff --git a/soh/soh/Enhancements/randomizer/particle_cmc.h b/soh/soh/Enhancements/randomizer/particle_cmc.h
index 046c25fa4e..618cd28fe0 100644
--- a/soh/soh/Enhancements/randomizer/particle_cmc.h
+++ b/soh/soh/Enhancements/randomizer/particle_cmc.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <ship/utils/color.h>
-#include "soh/OTRGlobals.h"
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 
 #ifndef PARTICLE_CMC_H
diff --git a/soh/soh/Enhancements/randomizer/rando_hash.h b/soh/soh/Enhancements/randomizer/rando_hash.h
index 3fdcd205e6..9c9526c28c 100644
--- a/soh/soh/Enhancements/randomizer/rando_hash.h
+++ b/soh/soh/Enhancements/randomizer/rando_hash.h
@@ -5,8 +5,6 @@
 
 #include "randomizerTypes.h"
 #include <array>
-#include "variables.h"
-#include <string>
 #include <textures/icon_item_static/icon_item_static.h>
 #include <textures/icon_item_24_static/icon_item_24_static.h>
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 67459e6775..bd21c2a575 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -3,32 +3,24 @@
 #include <fstream>
 #include <variables.h>
 #include <macros.h>
-#include <objects/gameplay_keep/gameplay_keep.h>
 #include <functions.h>
-#include <textures/icon_item_static/icon_item_static.h>
-#include <textures/icon_item_24_static/icon_item_24_static.h>
 #include "3drando/menu.hpp"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/SohGui.hpp"
 #include <imgui.h>
-#include <imgui_internal.h>
 #include "../../../src/overlays/actors/ovl_En_GirlA/z_en_girla.h"
 #include "randomizer_check_objects.h"
 #include <sstream>
 #include <tuple>
-#include "draw.h"
 #include "soh/OTRGlobals.h"
 #include <ship/window/FileDropMgr.h>
 #include "static_data.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "trial.h"
 #include "settings.h"
 #include "soh/util.h"
 #include "randomizerTypes.h"
-#include "soh/Notification/Notification.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "soh/Enhancements/randomizer/RCToRandInf.h"
-#include "static_data.h"
 #include "dungeon.h"
 
 extern "C" {
diff --git a/soh/soh/Enhancements/randomizer/randomizer.h b/soh/soh/Enhancements/randomizer/randomizer.h
index bd105d782a..6a75509efa 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.h
+++ b/soh/soh/Enhancements/randomizer/randomizer.h
@@ -6,8 +6,6 @@
 #include "z64item.h"
 #include "SeedContext.h"
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
-#include "soh/Enhancements/randomizer/randomizer_check_objects.h"
-#include "soh/Enhancements/randomizer/tricks.h"
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
 #include "../custom-message/CustomMessageTypes.h"
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
index fb9ba56b91..5571d601a3 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
@@ -3,9 +3,6 @@
 #include "SeedContext.h"
 #include <map>
 #include <string>
-#include <libultraship/bridge.h>
-#include "z64.h"
-#include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
 #include "fishsanity.h"
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
index f777b84d03..9355ca322a 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_objects.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "randomizerTypes.h"
-#include "z64actor_enum.h"
 #include "z64scene.h"
 #include <string>
 #include <vector>
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
index ade412b7d4..a3c2ec0495 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
@@ -3,7 +3,6 @@
 #include "randomizer_item_tracker.h"
 #include "randomizerTypes.h"
 #include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
 #include "soh/SaveManager.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/SohGui/UIWidgets.hpp"
@@ -25,6 +24,7 @@
 #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"
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
index 99aea52d36..3c54a2b010 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+++ b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
@@ -2,7 +2,6 @@
 
 #include <nlohmann/json.hpp>
 #include "randomizerTypes.h"
-#include "randomizer_check_objects.h"
 #include "soh/SohGui/UIWidgets.hpp"
 
 namespace CheckTracker {
diff --git a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
index a4180971aa..03761053ac 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.cpp
@@ -1,6 +1,5 @@
 #include "randomizer_entrance_tracker.h"
 #include "soh/OTRGlobals.h"
-#include "soh/cvar_prefixes.h"
 #include "soh/SohGui/SohGui.hpp"
 
 #include <string>
@@ -10,13 +9,10 @@
 
 extern "C" {
 #include <z64.h>
-#include "variables.h"
-#include "functions.h"
 #include "macros.h"
 extern PlayState* gPlayState;
 
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
-#include "soh/Enhancements/randomizer/randomizer_grotto.h"
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
 }
 
diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
index 95af06fe11..4bd8a8371d 100644
--- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
@@ -5,10 +5,9 @@
 
 #include <libultraship/controller/controldeck/ControlDeck.h>
 
+#include "randomizer_check_objects.h"
 #include "randomizer_check_tracker.h"
 #include "randomizer_item_tracker.h"
-#include "randomizerTypes.h"
-#include "soh/cvar_prefixes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
diff --git a/soh/soh/Enhancements/randomizer/settings.cpp b/soh/soh/Enhancements/randomizer/settings.cpp
index d27933cca3..4d62e10397 100644
--- a/soh/soh/Enhancements/randomizer/settings.cpp
+++ b/soh/soh/Enhancements/randomizer/settings.cpp
@@ -7,7 +7,9 @@
 
 #include <spdlog/spdlog.h>
 #include <libultraship/bridge/consolevariablebridge.h>
-#include <libultraship/classes.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 ecef3bfa0d..c8a525afb3 100644
--- a/soh/soh/Enhancements/randomizer/settings.h
+++ b/soh/soh/Enhancements/randomizer/settings.h
@@ -2,11 +2,8 @@
 
 #include "SeedContext.h"
 #include "option.h"
-#include "randomizerTypes.h"
-#include "3drando/spoiler_log.hpp"
 
 #include <array>
-#include <set>
 #include <unordered_map>
 #include <nlohmann/json.hpp>
 
diff --git a/soh/soh/Enhancements/randomizer/trial.h b/soh/soh/Enhancements/randomizer/trial.h
index 1ca39d0964..5757dfc369 100644
--- a/soh/soh/Enhancements/randomizer/trial.h
+++ b/soh/soh/Enhancements/randomizer/trial.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "randomizerTypes.h"
 #include "../custom-message/CustomMessageManager.h"
 #include <nlohmann/json.hpp>
 #include "static_data.h"
diff --git a/soh/soh/Enhancements/savestates.cpp b/soh/soh/Enhancements/savestates.cpp
index 795ce86e4c..672de6658d 100644
--- a/soh/soh/Enhancements/savestates.cpp
+++ b/soh/soh/Enhancements/savestates.cpp
@@ -1,9 +1,10 @@
 #include "savestates.h"
 
-#include <soh/GameVersions.h>
-
 #include <spdlog/spdlog.h>
 
+#include <ship/Context.h>
+#include <ship/window/Window.h>
+#include <ship/window/gui/GameOverlay.h>
 #include <soh/OTRGlobals.h>
 #include <soh/OTRAudio.h>
 
@@ -18,8 +19,6 @@
 #include "../../src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h"
 #include "../../src/overlays/actors/ovl_En_Fr/z_en_fr.h"
 
-#include <libultraship/libultraship.h>
-
 extern "C" PlayState* gPlayState;
 
 // FROM z_lights.c
diff --git a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
index e82da907f9..5456e9611b 100644
--- a/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
+++ b/soh/soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h
@@ -8,8 +8,6 @@
 #ifndef SOHSpeechSynthesizer_h
 #define SOHSpeechSynthesizer_h
 
-#include <stdio.h>
-
 class SpeechSynthesizer {
   public:
     static SpeechSynthesizer* Instance;
diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
index 5d33bba7ca..18db859101 100644
--- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp
+++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp
@@ -12,8 +12,6 @@
 
 #include <fast/Fast3dGui.h>
 
-#include <fast/Fast3dGui.h>
-
 extern "C" {
 #include "z64item.h"
 #include "macros.h"
diff --git a/soh/soh/Enhancements/tts/tts.cpp b/soh/soh/Enhancements/tts/tts.cpp
index 7300735b04..8bd411a5ee 100644
--- a/soh/soh/Enhancements/tts/tts.cpp
+++ b/soh/soh/Enhancements/tts/tts.cpp
@@ -2,9 +2,10 @@
 #include "soh/Enhancements/speechsynthesizer/SpeechSynthesizer.h"
 
 #include <cassert>
+#include <ship/Context.h>
 #include <ship/resource/File.h>
+#include <ship/resource/ResourceManager.h>
 #include <ship/resource/type/Json.h>
-#include <libultraship/classes.h>
 #include <nlohmann/json.hpp>
 
 #include "soh/ShipInit.hpp"
diff --git a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
index 4ee60b8f44..bf9b57237e 100644
--- a/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
+++ b/soh/soh/Network/Anchor/Packets/DisableAnchor.cpp
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 
 /**
  * DISABLE_ANCHOR
diff --git a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
index 6198496052..ce6efad131 100644
--- a/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
+++ b/soh/soh/Network/Anchor/Packets/EntranceDiscovered.cpp
@@ -2,7 +2,6 @@
 #include <nlohmann/json.hpp>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
-#include "soh/OTRGlobals.h"
 
 /**
  * ENTRANCE_DISCOVERED
diff --git a/soh/soh/Network/Anchor/Packets/OcarinaSfx.cpp b/soh/soh/Network/Anchor/Packets/OcarinaSfx.cpp
index 8d4cb7c700..23bc996d8c 100644
--- a/soh/soh/Network/Anchor/Packets/OcarinaSfx.cpp
+++ b/soh/soh/Network/Anchor/Packets/OcarinaSfx.cpp
@@ -2,7 +2,6 @@
 #include <nlohmann/json.hpp>
 
 extern "C" {
-#include "macros.h"
 #include "functions.h"
 #include "variables.h"
 extern PlayState* gPlayState;
diff --git a/soh/soh/Network/Anchor/Packets/PlayerSfx.cpp b/soh/soh/Network/Anchor/Packets/PlayerSfx.cpp
index 8645d09fee..1e09005ef1 100644
--- a/soh/soh/Network/Anchor/Packets/PlayerSfx.cpp
+++ b/soh/soh/Network/Anchor/Packets/PlayerSfx.cpp
@@ -1,11 +1,8 @@
 #include "soh/Network/Anchor/Anchor.h"
-#include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
 
 extern "C" {
-#include "macros.h"
 #include "functions.h"
-#include "variables.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Network/Anchor/Packets/RequestTeamState.cpp b/soh/soh/Network/Anchor/Packets/RequestTeamState.cpp
index a876c9a259..a7113dc3b8 100644
--- a/soh/soh/Network/Anchor/Packets/RequestTeamState.cpp
+++ b/soh/soh/Network/Anchor/Packets/RequestTeamState.cpp
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include "soh/OTRGlobals.h"
 
 /**
  * REQUEST_TEAM_STATE
diff --git a/soh/soh/Network/Anchor/Packets/SetFlag.cpp b/soh/soh/Network/Anchor/Packets/SetFlag.cpp
index 2403efbc30..f416797a3f 100644
--- a/soh/soh/Network/Anchor/Packets/SetFlag.cpp
+++ b/soh/soh/Network/Anchor/Packets/SetFlag.cpp
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.h"
 
 extern "C" {
 #include "functions.h"
diff --git a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
index 03ce9568c2..cf97fb732e 100644
--- a/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
+++ b/soh/soh/Network/Anchor/Packets/UnsetFlag.cpp
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.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 57ece94346..4f50759ee2 100644
--- a/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp
+++ b/soh/soh/Network/Anchor/Packets/UpdateBeansCount.cpp
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.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 496d7784e4..7a1ae9d3fc 100644
--- a/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp
+++ b/soh/soh/Network/Anchor/Packets/UpdateRoomState.cpp
@@ -4,7 +4,6 @@
 #include "soh/OTRGlobals.h"
 
 extern "C" {
-#include "variables.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Network/CrowdControl/CrowdControl.cpp b/soh/soh/Network/CrowdControl/CrowdControl.cpp
index 57647af811..49bdc11793 100644
--- a/soh/soh/Network/CrowdControl/CrowdControl.cpp
+++ b/soh/soh/Network/CrowdControl/CrowdControl.cpp
@@ -7,9 +7,7 @@
 
 extern "C" {
 #include <z64.h>
-#include "variables.h"
 #include "functions.h"
-#include "macros.h"
 extern PlayState* gPlayState;
 }
 
diff --git a/soh/soh/Network/Sail/Sail.cpp b/soh/soh/Network/Sail/Sail.cpp
index ce6a1ece2d..757467e3bf 100644
--- a/soh/soh/Network/Sail/Sail.cpp
+++ b/soh/soh/Network/Sail/Sail.cpp
@@ -1,6 +1,9 @@
 #include "Sail.h"
-#include <libultraship/libultraship.h>
 #include <nlohmann/json.hpp>
+#include <ship/Context.h>
+#include <ship/window/Window.h>
+#include <ship/window/gui/ConsoleWindow.h>
+#include <spdlog/spdlog.h>
 #include "soh/ShipUtils.h"
 
 template <class DstType, class SrcType> bool IsType(const SrcType* src) {
diff --git a/soh/soh/Notification/Notification.cpp b/soh/soh/Notification/Notification.cpp
index b101e2e753..b92c7a4cc0 100644
--- a/soh/soh/Notification/Notification.cpp
+++ b/soh/soh/Notification/Notification.cpp
@@ -1,11 +1,7 @@
 
 #include "Notification.h"
-#include <libultraship/libultraship.h>
-#include "soh/OTRGlobals.h"
-
-#include <fast/Fast3dGui.h>
-
-#include <fast/Fast3dGui.h>
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <ship/Context.h>
 
 extern "C" {
 #include "functions.h"
@@ -13,6 +9,8 @@ extern "C" {
 #include "variables.h"
 }
 
+#include <fast/Fast3dGui.h>
+
 namespace Notification {
 
 static uint32_t nextId = 0;
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
index e0a256aacf..8e1e5148ff 100644
--- a/soh/soh/OTRGlobals.cpp
+++ b/soh/soh/OTRGlobals.cpp
@@ -11,6 +11,9 @@
 
 #include "ResourceManagerHelpers.h"
 #include <fast/Fast3dWindow.h>
+#include <libultraship/bridge/audiobridge.h>
+#include <libultraship/bridge/gfxdebuggerbridge.h>
+#include <libultraship/bridge/windowbridge.h>
 #include <ship/Context.h>
 #include <ship/resource/File.h>
 #include <ship/window/Window.h>
@@ -35,7 +38,6 @@
 #include "Enhancements/randomizer/randomizer_check_tracker.h"
 #include "Enhancements/randomizer/static_data.h"
 #include "soh/Enhancements/randomizer/settings.h"
-#include "Enhancements/gameplaystats.h"
 #include "soh/Enhancements/savestates.h"
 #include "frame_interpolation.h"
 #include "SohGui/SohMenu.h"
@@ -75,7 +77,6 @@
 #include <functions.h>
 #include "Enhancements/item-tables/ItemTableManager.h"
 #include "Enhancements/Lang/Lang.h"
-#include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "ActorDB.h"
 #include "SaveManager.h"
@@ -88,25 +89,10 @@
 #include <fast/resource/ResourceType.h>
 
 // Resource Types/Factories
-#include "soh/resource/type/Array.h"
-#include <ship/resource/type/Blob.h>
-#include <fast/resource/type/DisplayList.h>
 #include <fast/resource/type/Matrix.h>
-#include <fast/resource/type/Texture.h>
-#include <fast/resource/type/Vertex.h>
 #include "soh/resource/type/SohResourceType.h"
 #include "soh/resource/type/Animation.h"
-#include "soh/resource/type/AudioSample.h"
-#include "soh/resource/type/AudioSequence.h"
-#include "soh/resource/type/AudioSoundFont.h"
-#include "soh/resource/type/CollisionHeader.h"
-#include "soh/resource/type/Cutscene.h"
-#include "soh/resource/type/Path.h"
-#include "soh/resource/type/PlayerAnimation.h"
-#include "soh/resource/type/Scene.h"
 #include "soh/resource/type/Skeleton.h"
-#include "soh/resource/type/SkeletonLimb.h"
-#include "soh/resource/type/Text.h"
 #include <ship/resource/factory/BlobFactory.h>
 #include <fast/resource/factory/DisplayListFactory.h>
 #include <fast/resource/factory/MatrixFactory.h>
diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp
index 0d745dd084..16c112114e 100644
--- a/soh/soh/ResourceManagerHelpers.cpp
+++ b/soh/soh/ResourceManagerHelpers.cpp
@@ -7,7 +7,6 @@
 #include "Enhancements/enhancementTypes.h"
 #include "Enhancements/randomizer/dungeon.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
-#include <libultraship/libultraship.h>
 #include <soh/GameVersions.h>
 #include "resource/type/SohResourceType.h"
 #include "resource/type/Array.h"
@@ -16,6 +15,9 @@
 #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>
 
diff --git a/soh/soh/ResourceManagerHelpers.h b/soh/soh/ResourceManagerHelpers.h
index 15022c6256..0f47d3b6a9 100644
--- a/soh/soh/ResourceManagerHelpers.h
+++ b/soh/soh/ResourceManagerHelpers.h
@@ -12,7 +12,10 @@
 
 #ifdef __cplusplus
 #include <memory>
-#include <ship/resource/Resource.h>
+
+namespace Ship {
+class IResource;
+} // namespace Ship
 
 std::shared_ptr<Ship::IResource> ResourceMgr_GetResourceByNameHandlingMQ(const char* path);
 
diff --git a/soh/soh/SaveManager.cpp b/soh/soh/SaveManager.cpp
index 696836874c..c7252a9378 100644
--- a/soh/soh/SaveManager.cpp
+++ b/soh/soh/SaveManager.cpp
@@ -12,7 +12,6 @@
 #include "ResourceManagerHelpers.h"
 
 #include "z64.h"
-#include "cvar_prefixes.h"
 #include "functions.h"
 #include "macros.h"
 #include <variables.h>
diff --git a/soh/soh/SaveManager.h b/soh/soh/SaveManager.h
index 80f58b915e..06e8bd5851 100644
--- a/soh/soh/SaveManager.h
+++ b/soh/soh/SaveManager.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <libultraship/libultra/gbi.h>
 #include "z64save.h"
 
 #define SECTION_PARENT_NONE -1
@@ -48,7 +47,6 @@ typedef enum {
 
 #include <map>
 #include <string>
-#include <tuple>
 #include <functional>
 #include <vector>
 #include <filesystem>
diff --git a/soh/soh/ShipUtils.cpp b/soh/soh/ShipUtils.cpp
index 976106757f..ef6a1358f5 100644
--- a/soh/soh/ShipUtils.cpp
+++ b/soh/soh/ShipUtils.cpp
@@ -6,7 +6,6 @@
 
 extern "C" {
 #include "z64.h"
-#include "functions.h"
 #include "macros.h"
 
 extern float OTRGetAspectRatio();
diff --git a/soh/soh/SohGui/ImGuiUtils.cpp b/soh/soh/SohGui/ImGuiUtils.cpp
index eedac81c07..49d4f47cc1 100644
--- a/soh/soh/SohGui/ImGuiUtils.cpp
+++ b/soh/soh/SohGui/ImGuiUtils.cpp
@@ -7,7 +7,10 @@
 
 #include <fast/Fast3dGui.h>
 
-#include <fast/Fast3dGui.h>
+extern "C" {
+#include "textures/icon_item_static/icon_item_static.h"
+#include "textures/parameter_static/parameter_static.h"
+}
 
 std::map<uint32_t, ItemMapEntry> itemMapping = {
     ITEM_MAP_ENTRY(ITEM_STICK),
diff --git a/soh/soh/SohGui/ImGuiUtils.h b/soh/soh/SohGui/ImGuiUtils.h
index a92a1d7375..aaa1514085 100644
--- a/soh/soh/SohGui/ImGuiUtils.h
+++ b/soh/soh/SohGui/ImGuiUtils.h
@@ -7,15 +7,8 @@
 #include <array>
 #include <map>
 #include <string>
-#include "soh/Enhancements/randomizer/randomizerTypes.h"
 #include "variables.h" //only for gItemIcons
 
-extern "C" {
-#include "textures/icon_item_static/icon_item_static.h"
-#include "textures/icon_item_24_static/icon_item_24_static.h"
-#include "textures/parameter_static/parameter_static.h"
-}
-
 const char* GetTextureForItemId(uint32_t itemId);
 void RegisterImGuiItemIcons();
 
diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp
index 2aa79b1d00..1b6a8c5d07 100644
--- a/soh/soh/SohGui/SohGui.cpp
+++ b/soh/soh/SohGui/SohGui.cpp
@@ -7,10 +7,7 @@
 
 #include "SohGui.hpp"
 
-#include <spdlog/spdlog.h>
 #include <imgui.h>
-#include <imgui_internal.h>
-#include <libultraship/libultraship.h>
 
 #ifdef __APPLE__
 #include <fast/backends/gfx_metal.h>
diff --git a/soh/soh/SohGui/SohGui.hpp b/soh/soh/SohGui/SohGui.hpp
index bfaee2d6e8..705ea3ddd3 100644
--- a/soh/soh/SohGui/SohGui.hpp
+++ b/soh/soh/SohGui/SohGui.hpp
@@ -8,7 +8,6 @@
 #ifndef SohGui_hpp
 #define SohGui_hpp
 
-#include <stdio.h>
 #include "SohMenu.h"
 #include "soh/Enhancements/audio/AudioEditor.h"
 #include "soh/Enhancements/controls/InputViewer.h"
diff --git a/soh/soh/SohGui/SohMenu.cpp b/soh/soh/SohGui/SohMenu.cpp
index 4a746e3a91..584f6343a5 100644
--- a/soh/soh/SohGui/SohMenu.cpp
+++ b/soh/soh/SohGui/SohMenu.cpp
@@ -1,11 +1,7 @@
 #include "SohMenu.h"
-#include <libultraship/libultra.h>
 #include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>
-#include <ship/window/gui/GuiMenuBar.h>
-#include <ship/window/gui/GuiElement.h>
 #include <ship/utils/StringHelper.h>
-#include <spdlog/fmt/fmt.h>
 
 extern "C" {
 extern PlayState* gPlayState;
diff --git a/soh/soh/SohGui/SohMenu.h b/soh/soh/SohGui/SohMenu.h
index aeb5349d16..9cae3bd240 100644
--- a/soh/soh/SohGui/SohMenu.h
+++ b/soh/soh/SohGui/SohMenu.h
@@ -2,8 +2,6 @@
 #define SOHMENU_H
 
 #include "Menu.h"
-#include <fast/backends/gfx_rendering_api.h>
-#include "soh/cvar_prefixes.h"
 
 extern "C" {
 #include "z64.h"
diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp
index 44272400bd..08e1b2eff5 100644
--- a/soh/soh/SohGui/SohMenuRandomizer.cpp
+++ b/soh/soh/SohGui/SohMenuRandomizer.cpp
@@ -1,5 +1,6 @@
 #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"
diff --git a/soh/soh/SohGui/SohMenuStartingItems.cpp b/soh/soh/SohGui/SohMenuStartingItems.cpp
index 32139f07a8..23e3649cad 100644
--- a/soh/soh/SohGui/SohMenuStartingItems.cpp
+++ b/soh/soh/SohGui/SohMenuStartingItems.cpp
@@ -1,4 +1,3 @@
-#include "SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/ImGuiUtils.h"
@@ -11,7 +10,6 @@
 #include <fast/Fast3dGui.h>
 
 extern "C" {
-#include "variables.h"
 #include "z64.h"
 }
 
diff --git a/soh/soh/SohGui/SohModals.cpp b/soh/soh/SohGui/SohModals.cpp
index 8cdd1a09b9..54393de097 100644
--- a/soh/soh/SohGui/SohModals.cpp
+++ b/soh/soh/SohGui/SohModals.cpp
@@ -2,12 +2,8 @@
 #include <imgui.h>
 #include <vector>
 #include <string>
-#include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
 #include "UIWidgets.hpp"
 #include "SohGui.hpp"
-#include "soh/OTRGlobals.h"
-#include "z64.h"
 
 extern "C" PlayState* gPlayState;
 struct SohModal {
diff --git a/soh/soh/SohGui/UIWidgets.cpp b/soh/soh/SohGui/UIWidgets.cpp
index a96a21c6d3..617809453d 100644
--- a/soh/soh/SohGui/UIWidgets.cpp
+++ b/soh/soh/SohGui/UIWidgets.cpp
@@ -2,7 +2,6 @@
 #define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui_internal.h>
 #include <string>
-#include <math.h>
 #include <unordered_map>
 #include <libultraship/libultra/types.h>
 #include <spdlog/fmt/fmt.h>
diff --git a/soh/soh/frame_interpolation.cpp b/soh/soh/frame_interpolation.cpp
index 6648020008..b519830d7e 100644
--- a/soh/soh/frame_interpolation.cpp
+++ b/soh/soh/frame_interpolation.cpp
@@ -1,5 +1,3 @@
-#include <libultraship/bridge.h>
-
 #include <vector>
 #include <map>
 #include <unordered_map>
diff --git a/soh/soh/mixer.c b/soh/soh/mixer.c
index 3be7111004..df62001399 100644
--- a/soh/soh/mixer.c
+++ b/soh/soh/mixer.c
@@ -1,9 +1,7 @@
 //! 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 <stdbool.h>
 #include <stdint.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "mixer.h"
 #ifndef __clang__
diff --git a/soh/soh/resource/importer/SkeletonFactory.cpp b/soh/soh/resource/importer/SkeletonFactory.cpp
index f44de85461..89fbf43824 100644
--- a/soh/soh/resource/importer/SkeletonFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonFactory.cpp
@@ -1,8 +1,9 @@
 #include "soh/resource/importer/SkeletonFactory.h"
 #include "soh/resource/type/Skeleton.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <spdlog/spdlog.h>
 #include <tinyxml2.h>
-#include <libultraship/libultraship.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 2f08a8f987..96d5c49de2 100644
--- a/soh/soh/resource/importer/SkeletonLimbFactory.cpp
+++ b/soh/soh/resource/importer/SkeletonLimbFactory.cpp
@@ -1,8 +1,8 @@
 #include "soh/resource/importer/SkeletonLimbFactory.h"
 #include "soh/resource/type/SkeletonLimb.h"
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
-#include "libultraship/libultraship.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 f96d541f52..b54f1cadeb 100644
--- a/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/EndMarkerFactory.cpp
@@ -2,7 +2,6 @@
 #include "soh/resource/type/scenecommand/EndMarker.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
-#include <tinyxml2.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.h b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
index 6a038fa839..f1cad48ba3 100644
--- a/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
+++ b/soh/soh/resource/importer/scenecommand/SceneCommandFactory.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 #include <ship/resource/Resource.h>
-#include <ship/resource/ResourceFactory.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include <libultraship/bridge/consolevariablebridge.h>
 
diff --git a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
index e1446d3d93..b5e429c7b6 100644
--- a/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetAlternateHeadersFactory.cpp
@@ -1,9 +1,9 @@
 #include "soh/resource/importer/scenecommand/SetAlternateHeadersFactory.h"
 #include "soh/resource/type/scenecommand/SetAlternateHeaders.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
-#include "libultraship/libultraship.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource>
diff --git a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
index 8e3a8f6d40..e638f57a1c 100644
--- a/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCollisionHeaderFactory.cpp
@@ -1,8 +1,8 @@
 #include "soh/resource/importer/scenecommand/SetCollisionHeaderFactory.h"
 #include "soh/resource/type/scenecommand/SetCollisionHeader.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "libultraship/libultraship.h"
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
index ed08c88be7..eb54b0a225 100644
--- a/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCsCameraFactory.cpp
@@ -2,7 +2,6 @@
 #include "soh/resource/type/scenecommand/SetCsCamera.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
 #include "spdlog/spdlog.h"
-#include <tinyxml2.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetCsCameraFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
index 3aee3231e1..4d9b632ae6 100644
--- a/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetCutscenesFactory.cpp
@@ -1,8 +1,8 @@
 #include "soh/resource/importer/scenecommand/SetCutscenesFactory.h"
 #include "soh/resource/type/scenecommand/SetCutscenes.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include <libultraship/libultraship.h>
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
index 1edd994c1b..4595192557 100644
--- a/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetMeshFactory.cpp
@@ -1,9 +1,10 @@
 #include "soh/resource/importer/scenecommand/SetMeshFactory.h"
 #include "soh/resource/type/scenecommand/SetMesh.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
+#include <spdlog/spdlog.h>
 #include <tinyxml2.h>
-#include "libultraship/libultraship.h"
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetMeshFactory::ReadResource(std::shared_ptr<Ship::ResourceInitData> initData,
diff --git a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
index 95c62199e5..d75165618a 100644
--- a/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetPathwaysFactory.cpp
@@ -1,9 +1,9 @@
 #include "soh/resource/importer/scenecommand/SetPathwaysFactory.h"
 #include "soh/resource/type/scenecommand/SetPathways.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <tinyxml2.h>
-#include <libultraship/libultraship.h>
 
 namespace SOH {
 std::shared_ptr<Ship::IResource> SetPathwaysFactory::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 1a3dde3e0d..c202ca8128 100644
--- a/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
+++ b/soh/soh/resource/importer/scenecommand/SetRoomListFactory.cpp
@@ -1,7 +1,8 @@
 #include "soh/resource/importer/scenecommand/SetRoomListFactory.h"
 #include "soh/resource/type/scenecommand/SetRoomList.h"
 #include "soh/resource/logging/SceneCommandLoggers.h"
-#include "spdlog/spdlog.h"
+#include <libultraship/libultra/types.h>
+#include <spdlog/spdlog.h>
 #include <tinyxml2.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/AudioSample.h b/soh/soh/resource/type/AudioSample.h
index b07523bc44..c6c7f38c96 100644
--- a/soh/soh/resource/type/AudioSample.h
+++ b/soh/soh/resource/type/AudioSample.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <stdint.h>
 #include <ship/resource/Resource.h>
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/PlayerAnimation.h b/soh/soh/resource/type/PlayerAnimation.h
index 66cac19e04..de4f75fdcb 100644
--- a/soh/soh/resource/type/PlayerAnimation.h
+++ b/soh/soh/resource/type/PlayerAnimation.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <vector>
-#include <string>
 #include <ship/resource/Resource.h>
 
 namespace SOH {
diff --git a/soh/soh/resource/type/Scene.h b/soh/soh/resource/type/Scene.h
index 6394bff5e1..8b00e7743a 100644
--- a/soh/soh/resource/type/Scene.h
+++ b/soh/soh/resource/type/Scene.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <stdint.h>
 #include <vector>
 #include <memory>
 #include <ship/resource/Resource.h>
diff --git a/soh/soh/resource/type/Skeleton.cpp b/soh/soh/resource/type/Skeleton.cpp
index 35d29e0c9c..ac83d16615 100644
--- a/soh/soh/resource/type/Skeleton.cpp
+++ b/soh/soh/resource/type/Skeleton.cpp
@@ -1,10 +1,10 @@
-#include <ship/resource/ResourceManager.h>
 #include "Skeleton.h"
 #include "soh/OTRGlobals.h"
-#include "libultraship/libultraship.h"
 #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"
diff --git a/soh/soh/resource/type/scenecommand/EndMarker.h b/soh/soh/resource/type/scenecommand/EndMarker.h
index 17b3b4fff1..bb3614eefb 100644
--- a/soh/soh/resource/type/scenecommand/EndMarker.h
+++ b/soh/soh/resource/type/scenecommand/EndMarker.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SceneCommand.h b/soh/soh/resource/type/scenecommand/SceneCommand.h
index 8d684e1465..555da7386b 100644
--- a/soh/soh/resource/type/scenecommand/SceneCommand.h
+++ b/soh/soh/resource/type/scenecommand/SceneCommand.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
 #include <ship/resource/Resource.h>
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 
diff --git a/soh/soh/resource/type/scenecommand/SetActorList.h b/soh/soh/resource/type/scenecommand/SetActorList.h
index 63d218a248..c0594ea3bd 100644
--- a/soh/soh/resource/type/scenecommand/SetActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetActorList.h
@@ -2,9 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
-#include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 // #include <libultraship/libultra/types.h>
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
index 2d6118fe0c..4163d2f7d2 100644
--- a/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
+++ b/soh/soh/resource/type/scenecommand/SetAlternateHeaders.h
@@ -4,11 +4,8 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "soh/resource/type/Scene.h"
-#include "RomFile.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 
diff --git a/soh/soh/resource/type/scenecommand/SetCameraSettings.h b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
index 62bee9aaa8..741d503d5f 100644
--- a/soh/soh/resource/type/scenecommand/SetCameraSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetCameraSettings.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
-#include <memory>
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
index 17940cb133..63fe6088e7 100644
--- a/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
+++ b/soh/soh/resource/type/scenecommand/SetCollisionHeader.h
@@ -1,10 +1,7 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
 #include <memory>
 #include <string>
-#include <ship/resource/Resource.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/type/CollisionHeader.h"
 // #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetCsCamera.h b/soh/soh/resource/type/scenecommand/SetCsCamera.h
index 7af48b990c..fcb48d4031 100644
--- a/soh/soh/resource/type/scenecommand/SetCsCamera.h
+++ b/soh/soh/resource/type/scenecommand/SetCsCamera.h
@@ -1,9 +1,5 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetCutscenes.h b/soh/soh/resource/type/scenecommand/SetCutscenes.h
index d24dddbb0c..0f98fe7e6f 100644
--- a/soh/soh/resource/type/scenecommand/SetCutscenes.h
+++ b/soh/soh/resource/type/scenecommand/SetCutscenes.h
@@ -1,10 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
 #include <string>
-#include <ship/resource/Resource.h>
 #include "soh/resource/type/scenecommand/SceneCommand.h"
 #include "soh/resource/type/Cutscene.h"
 // #include <libultraship/libultra.h>
diff --git a/soh/soh/resource/type/scenecommand/SetEchoSettings.h b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
index bfdbecf58e..170e36d292 100644
--- a/soh/soh/resource/type/scenecommand/SetEchoSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetEchoSettings.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
-#include <memory>
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetEntranceList.h b/soh/soh/resource/type/scenecommand/SetEntranceList.h
index d9fad36fb4..19e0129cb3 100644
--- a/soh/soh/resource/type/scenecommand/SetEntranceList.h
+++ b/soh/soh/resource/type/scenecommand/SetEntranceList.h
@@ -3,8 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-#include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetExitList.h b/soh/soh/resource/type/scenecommand/SetExitList.h
index 958f62f7bc..0eb5a6d7bd 100644
--- a/soh/soh/resource/type/scenecommand/SetExitList.h
+++ b/soh/soh/resource/type/scenecommand/SetExitList.h
@@ -2,8 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #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 a9c48914b1..a0d0cd1bb2 100644
--- a/soh/soh/resource/type/scenecommand/SetLightList.h
+++ b/soh/soh/resource/type/scenecommand/SetLightList.h
@@ -3,8 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-#include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetLightingSettings.h b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
index 6eadad1e7c..ea62d8ca5e 100644
--- a/soh/soh/resource/type/scenecommand/SetLightingSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetLightingSettings.h
@@ -1,9 +1,6 @@
 #pragma once
 
-#include <stdint.h>
 #include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #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 baf7744f27..3843da8196 100644
--- a/soh/soh/resource/type/scenecommand/SetMesh.h
+++ b/soh/soh/resource/type/scenecommand/SetMesh.h
@@ -3,7 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "libultraship/libultra.h"
 #include "z64math.h"
diff --git a/soh/soh/resource/type/scenecommand/SetObjectList.h b/soh/soh/resource/type/scenecommand/SetObjectList.h
index 49fc5079da..0286f09164 100644
--- a/soh/soh/resource/type/scenecommand/SetObjectList.h
+++ b/soh/soh/resource/type/scenecommand/SetObjectList.h
@@ -2,9 +2,7 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetPathways.h b/soh/soh/resource/type/scenecommand/SetPathways.h
index 6862049bbc..4bd758b471 100644
--- a/soh/soh/resource/type/scenecommand/SetPathways.h
+++ b/soh/soh/resource/type/scenecommand/SetPathways.h
@@ -2,7 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
 #include <ship/resource/Resource.h>
 #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 8114a4b625..7df68934a7 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomBehavior.h
@@ -1,11 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
-#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/SetRoomList.h b/soh/soh/resource/type/scenecommand/SetRoomList.h
index f8530a1a77..0fe114e899 100644
--- a/soh/soh/resource/type/scenecommand/SetRoomList.h
+++ b/soh/soh/resource/type/scenecommand/SetRoomList.h
@@ -4,10 +4,8 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "RomFile.h"
-#include <libultraship/libultra/types.h>
 
 namespace SOH {
 // typedef struct {
diff --git a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
index 003b8411e2..73d23cc06b 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxModifier.h
@@ -1,11 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
-#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/SetSkyboxSettings.h b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
index d5bdc97c37..69c26196d0 100644
--- a/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSkyboxSettings.h
@@ -1,9 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetSoundSettings.h b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
index 184063afd3..d2db2b8c50 100644
--- a/soh/soh/resource/type/scenecommand/SetSoundSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetSoundSettings.h
@@ -1,9 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
-#include <memory>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
 
diff --git a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
index d2c0b93606..b7c233694b 100644
--- a/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
+++ b/soh/soh/resource/type/scenecommand/SetSpecialObjects.h
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <stdint.h>
-#include <vector>
-#include <memory>
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetStartPositionList.h b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
index 64b4b89b78..caa49724a6 100644
--- a/soh/soh/resource/type/scenecommand/SetStartPositionList.h
+++ b/soh/soh/resource/type/scenecommand/SetStartPositionList.h
@@ -2,9 +2,6 @@
 
 #include <stdint.h>
 #include <vector>
-#include <memory>
-#include <string>
-#include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include "soh/resource/type/scenecommand/SetActorList.h"
 // #include <libultraship/libultra/types.h>
diff --git a/soh/soh/resource/type/scenecommand/SetTimeSettings.h b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
index 76eda7439a..13dc2c6364 100644
--- a/soh/soh/resource/type/scenecommand/SetTimeSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetTimeSettings.h
@@ -1,11 +1,8 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
 #include <memory>
-#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 6b395d9793..cb170f7e88 100644
--- a/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
+++ b/soh/soh/resource/type/scenecommand/SetTransitionActorList.h
@@ -3,8 +3,6 @@
 #include <stdint.h>
 #include <vector>
 #include <memory>
-#include <string>
-#include <ship/resource/Resource.h>
 #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 f712488d30..8a8374e1ca 100644
--- a/soh/soh/resource/type/scenecommand/SetWindSettings.h
+++ b/soh/soh/resource/type/scenecommand/SetWindSettings.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <stdint.h>
-#include <vector>
-#include <memory>
 #include <ship/resource/Resource.h>
 #include "SceneCommand.h"
 #include <libultraship/libultra/types.h>
diff --git a/soh/soh/stubs.c b/soh/soh/stubs.c
index f62034d4e4..59809d8e4a 100644
--- a/soh/soh/stubs.c
+++ b/soh/soh/stubs.c
@@ -3,8 +3,6 @@
 #include <stdio.h>
 #include <string.h>
 #include "z64.h"
-#include "OTRGlobals.h"
-//#include <math.h>
 
 u32 osResetType;
 u32 osTvType = OS_TV_NTSC;
diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp
index a515f6287c..9d390cc821 100644
--- a/soh/soh/z_message_OTR.cpp
+++ b/soh/soh/z_message_OTR.cpp
@@ -1,12 +1,9 @@
-#include <libultraship/libultraship.h>
-#include "soh/resource/type/Scene.h"
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
 #include <ship/utils/StringHelper.h>
 #include "global.h"
-#include "vt.h"
 #include "soh/resource/type/Text.h"
 #include <message_data_static.h>
-#include "Enhancements/custom-message/CustomMessageManager.h"
-#include "Enhancements/custom-message/CustomMessageTypes.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 892edd5fd0..719f2076a2 100644
--- a/soh/soh/z_play_otr.cpp
+++ b/soh/soh/z_play_otr.cpp
@@ -1,11 +1,11 @@
 #include "ResourceManagerHelpers.h"
-#include <libultraship/libultraship.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 "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "global.h"
-#include "vt.h"
-#include <fast/resource/type/Vertex.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 101e049a63..b5a82e6597 100644
--- a/soh/soh/z_scene_otr.cpp
+++ b/soh/soh/z_scene_otr.cpp
@@ -1,15 +1,10 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "ResourceManagerHelpers.h"
-#include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
-#include <ship/utils/StringHelper.h>
 #include "global.h"
 #include "vt.h"
 #include "soh/resource/type/CollisionHeader.h"
-#include <fast/resource/type/DisplayList.h>
 #include "soh/resource/type/Cutscene.h"
-#include "soh/resource/type/Path.h"
-#include "soh/resource/type/Text.h"
 #include <ship/resource/type/Blob.h>
 #include <memory>
 #include <cassert>
@@ -34,6 +29,7 @@
 #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 Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName);
 extern "C" s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId);
diff --git a/soh/src/code/audioMgr.c b/soh/src/code/audioMgr.c
index b1ad53a209..51b3ce53e8 100644
--- a/soh/src/code/audioMgr.c
+++ b/soh/src/code/audioMgr.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include <string.h>
-#include "soh/OTRGlobals.h"
 
 void func_800C3C80(AudioMgr* audioMgr) {
     AudioTask* task;
diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c
index 760ecc61d6..6b136eacd2 100644
--- a/soh/src/code/audio_load.c
+++ b/soh/src/code/audio_load.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <assert.h>
 
+#include <libultraship/bridge/resourcebridge.h>
 #include <libultraship/libultra.h>
 #include "global.h"
 #include "soh/OTRGlobals.h"
diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c
index a43a083800..6569123781 100644
--- a/soh/src/code/audio_playback.c
+++ b/soh/src/code/audio_playback.c
@@ -1,6 +1,5 @@
 #include "global.h"
 #include "soh/ResourceManagerHelpers.h"
-#include <libultraship/bridge.h>
 
 extern bool gUseLegacySD;
 
diff --git a/soh/src/code/game.c b/soh/src/code/game.c
index dbbe5e75c2..354c6ce67c 100644
--- a/soh/src/code/game.c
+++ b/soh/src/code/game.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include "global.h"
 #include "vt.h"
-#include "libultraship/bridge.h"
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ResourceManagerHelpers.h"
diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c
index 31dcb211ec..be406ce1ec 100644
--- a/soh/src/code/graph.c
+++ b/soh/src/code/graph.c
@@ -6,9 +6,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <libultraship/bridge/gfxdebuggerbridge.h>
+#include <libultraship/bridge/windowbridge.h>
 #include "soh/Enhancements/gameconsole.h"
 #include "soh/OTRGlobals.h"
-#include "libultraship/bridge.h"
 
 #define GFXPOOL_HEAD_MAGIC 0x1234
 #define GFXPOOL_TAIL_MAGIC 0x5678
diff --git a/soh/src/code/main.c b/soh/src/code/main.c
index c9d87c66ca..98c632665b 100644
--- a/soh/src/code/main.c
+++ b/soh/src/code/main.c
@@ -6,10 +6,9 @@
 #include "global.h"
 #include "vt.h"
 #include "stdio.h"
+#include <libultraship/bridge/crashhandlerbridge.h>
 #include <soh/Enhancements/bootcommands.h>
 #include "soh/OTRGlobals.h"
-
-#include <libultraship/bridge.h>
 #include "soh/CrashHandlerExt.h"
 
 s32 gScreenWidth = SCREEN_WIDTH;
diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c
index 6d8222e5a2..8860363527 100644
--- a/soh/src/code/z_map_exp.c
+++ b/soh/src/code/z_map_exp.c
@@ -5,6 +5,7 @@
 #include "textures/map_i_static/map_i_static.h"
 #include "textures/map_grand_static/map_grand_static.h"
 #include <assert.h>
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c
index 7da3f61cb9..701a1e3397 100644
--- a/soh/src/code/z_play.c
+++ b/soh/src/code/z_play.c
@@ -14,8 +14,6 @@
 #include "soh/SaveManager.h"
 #include "soh/framebuffer_effects.h"
 
-#include <libultraship/libultraship.h>
-
 #include <time.h>
 #include <assert.h>
 
diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c
index a440c9348a..b7132bc599 100644
--- a/soh/src/code/z_player_lib.c
+++ b/soh/src/code/z_player_lib.c
@@ -5,6 +5,7 @@
 #include "objects/object_link_child/object_link_child.h"
 #include "overlays/actors/ovl_Demo_Effect/z_demo_effect.h"
 
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/draw.h"
diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c
index 317ee0775a..342bc734aa 100644
--- a/soh/src/code/z_room.c
+++ b/soh/src/code/z_room.c
@@ -9,6 +9,7 @@
 #include <assert.h>
 
 #include <libultraship/bridge/gfxbridge.h>
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
 
diff --git a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
index 16391b36f1..399cd936cd 100644
--- a/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
+++ b/soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
@@ -7,6 +7,7 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ResourceManagerHelpers.h"
+#include <libultraship/bridge/resourcebridge.h>
 
 #include <stdlib.h> // malloc
 #include <string.h> // memcpy
diff --git a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
index 4aa8984a2b..743eea2c7d 100644
--- a/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
+++ b/soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
@@ -13,6 +13,7 @@
 #include "soh/frame_interpolation.h"
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include <libultraship/bridge/resourcebridge.h>
 
 #include <string.h>
 
diff --git a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
index 0592207a52..e437510d2c 100644
--- a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
+++ b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c
@@ -7,6 +7,7 @@
 #include "z_en_jsjutan.h"
 #include "overlays/actors/ovl_En_Bom/z_en_bom.h"
 #include "soh/ResourceManagerHelpers.h"
+#include <libultraship/bridge/resourcebridge.h>
 
 #define FLAGS (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY)
 
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index d4d66c5253..4d48d3bc70 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -14,6 +14,7 @@
 #include "textures/map_48x85_static/map_48x85_static.h"
 #include "vt.h"
 
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/frame_interpolation.h"
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"