Cleanup unused includes & remove remaining LUS umbrella includes (#6813)

2026-06-27 19:13:00 -04:00 · 2026-06-27 02:20:03 +02:00
parent 210c5d5885
commit 633e920969
227 changed files with 92 additions and 423 deletions
@@ -17,7 +17,6 @@ extern "C++" {
 #ifdef __cplusplus
 }
 #endif
-#include <libultraship/bridge.h>

 #define _AudioseqSegmentRomStart "Audioseq"
 #define _AudiobankSegmentRomStart "Audiobank"
@@ -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))
@@ -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;
@@ -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"
@@ -1,4 +1,4 @@
-#include <libultraship/bridge.h>
+#include <stddef.h>

 #ifdef __cplusplus
 extern "C" {
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -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;
@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -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;
@@ -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)
@@ -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)
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ShipInit.hpp"
 #include "functions.h"
 #include "macros.h"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
@@ -9,7 +9,6 @@

 extern "C" {
 #include "functions.h"
-#include "macros.h"
 #include "variables.h"
 #include "z64save.h"
 extern SaveContext gSaveContext;
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"

 extern "C" {
-#include "macros.h"
 #include "functions.h"
 }

@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"

 extern "C" {
-#include "macros.h"
 #include "src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h"
 }

@@ -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"
@@ -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"
 }

@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Notification/Notification.h"
 #include "soh/ShipInit.hpp"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ShipInit.hpp"
 #include "functions.h"
 #include "macros.h"
@@ -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;
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/OTRGlobals.h"
@@ -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
@@ -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"

@@ -7,6 +7,7 @@
 #include "soh/SohGui/ImGuiUtils.h"

 #include <fast/Fast3dGui.h>
+#include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>

 extern "C" {
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
@@ -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; });
@@ -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*);
@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include <ship/Context.h>
 #include <ship/config/Config.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
@@ -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>

@@ -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"

@@ -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 {
@@ -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"

@@ -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
@@ -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;
 }
@@ -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"
@@ -3,7 +3,6 @@
 #include "soh/ShipInit.hpp"

 extern "C" {
-#include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;
 }
@@ -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"
 }

@@ -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"
@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -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"

@@ -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

@@ -1,5 +1,3 @@
 #pragma once

-#include <stdint.h>
-
 void DebugConsole_Init(void);
@@ -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"
@@ -4,7 +4,7 @@

 #ifdef __cplusplus
 #include <ship/window/gui/GuiWindow.h>
-#include <unordered_map>
+
 extern "C" {
 #endif
 /**
@@ -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 {
@@ -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 {
@@ -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
@@ -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;
 }
@@ -22,7 +22,6 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "macros.h"
-#include "soh/cvar_prefixes.h"
 extern PlayState* gPlayState;
 }

@@ -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"
 }

@@ -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;

@@ -1,6 +1,5 @@
 #pragma once

-#include <vector>
 #include <array>
 #include <chrono>

@@ -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;
@@ -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" {
@@ -10,7 +10,6 @@ GameInteractor functions can be called directly.
 */

 #include "GameInteractor.h"
-#include <libultraship/bridge.h>

 extern "C" {
 #include "variables.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
@@ -2,7 +2,6 @@

 #include "vanilla-behavior/GIVanillaBehavior.h"
 #include "GameInteractor.h"
-#include <stdarg.h>

 #ifdef __cplusplus
 extern "C" {
@@ -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;
 }
@@ -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;

@@ -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

@@ -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"

@@ -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;
 }
@@ -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"
@@ -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;
 }
@@ -2,7 +2,6 @@
 #define NAMETAG_H

 #include <libultraship/color.h>
-#include <libultraship/libultra.h>

 struct Actor;

@@ -1,6 +1,5 @@
 #pragma once

-#include "../randomizerTypes.h"
 #include "../location_access.h"
 #include "../entrance.h"

@@ -1,4 +1,3 @@
-#include "../randomizerTypes.h"
 #include "../SeedContext.h"
 #include "../static_data.h"

@@ -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"
@@ -5,7 +5,6 @@
 #include <variant>

 #include <functional>
-#include "../randomizerTypes.h"
 #include "../../custom-message/CustomMessageManager.h"

 struct HintDistributionSetting {
@@ -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>

@@ -2,7 +2,6 @@

 #include <cstddef>
 #include <vector>
-#include <stdint.h>
 #include "../randomizerTypes.h"

 class ItemLocation;
@@ -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;
@@ -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"
@@ -1,6 +1,5 @@
 #pragma once

-#include <string>
 #include <set>
 #include "../SeedContext.h"

@@ -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,
@@ -2,7 +2,6 @@
 #include "../SeedContext.h"

 #include <vector>
-#include <array>

 struct PriceSettingsStruct {
    RandomizerSettingKey main;
@@ -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>

@@ -1,4 +1,3 @@
-#include <libultraship/bridge.h>
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 #include "z64save.h"
@@ -5,7 +5,6 @@

 extern "C" {
 extern PlayState* gPlayState;
-#include "macros.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 }

@@ -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;
 }
@@ -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;
 }

@@ -22,6 +22,7 @@
 #include <spdlog/spdlog.h>
 extern "C" {
 #include <functions.h>
+#include <variables.h>
 }

 namespace Rando {
@@ -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"
--- a/Show More
+++ b/Show More