Reduce LUS header bloat & improve build speed (#6802)

* Avoid `randomizer_check_tracker.h` in widely used `randomizer.h` due to transitive `libultraship.h`/`UIWidgets.hpp` inclusion * Avoid `libultraship.h` inclusion in heavily used `GameInteractor.h` header * Remove unused libultraship includes * Break huge unneeded transitive include chain (via UIWidgets.hpp) This avoids that changing just UIWidgets.hpp, for example, would retrigger a rebuild of like half the project. There were a huge transitive include chains, mostly via MenuTypes.h and UIWidgets.hpp. Because of that, I'm splitting UIWidgets into a second header file UIWidgetOptions.hpp, which can be consumed by MenuTypes.h. MenuTypes.h is split into BackendTypes.h to avoid pulling in Fast3D/Windowing/GUI stuff into unrelated code. Example chain, one of many: libultraship.h <- UIWidgets.hpp <- MenuTypes.hpp <- randomizer/option.h <- randomizer/item_location.h <- trial.h <- static_data.h <- SeedContext <- (basically all randomizer related sources, lots of other sources in Enhancement, more...) * Avoid libultraship.h in Notification.h and ObjectExtension.h; these headers are also heavily used * Add missing include * Remove unused libultraship includes * Include only ship/window/GuiWindow.h in GUI-related headers instead of libultraship.h * Cleanup ConfigUpdater.h and playthrough.cpp * Remove libultraship.h from Anchor.h and fix transitive dependencies in OTRGlobals.cpp * Remove unused libultraship.h includes in Anchor code
2026-06-23 09:39:54 -04:00 · 2026-06-23 07:09:25 +02:00
parent e50d03dab0
commit 0d2346d322
119 changed files with 730 additions and 710 deletions
@@ -9,8 +9,14 @@
 #include "variables.h"
 #include "macros.h"
 #include "soh/cvar_prefixes.h"
+#ifdef __cplusplus
+extern "C++" {
+#endif
 #include "soh/Enhancements/gameconsole.h"
 #include "soh/Enhancements/gameplaystats.h"
+#ifdef __cplusplus
+}
+#endif
 #include <libultraship/bridge.h>

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

@@ -1,3 +1,6 @@
+#include <ship/Context.h>
+#include <ship/window/Window.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/OTRGlobals.h"
@@ -3,6 +3,7 @@
 #include "soh/ShipInit.hpp"

 extern "C" {
+#include "variables.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 extern PlayState* gPlayState;
 }
@@ -1,3 +1,4 @@
+#include <libultraship/bridge/resourcebridge.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ResourceManagerHelpers.h"
@@ -2,9 +2,7 @@
 #include <string>
 #include <fstream>
 #include <ship/config/Config.h>
-#include <libultraship/classes.h>
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include <ship/resource/type/Json.h>
 #include "soh/OTRGlobals.h"
 #include "soh/util.h"
@@ -1,4 +1,4 @@
-#include <libultraship/bridge.h>
+#include <libultraship/classes.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
@@ -1,4 +1,4 @@
-#include <libultraship/bridge/consolevariablebridge.h>
+#include <libultraship/classes.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
@@ -1,4 +1,3 @@
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"

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

 #include <fast/Fast3dGui.h>
-
-#include <fast/Fast3dGui.h>
+#include <ship/Context.h>

 extern "C" {
 #include "macros.h"
@@ -1,4 +1,5 @@
-#include <libultraship/libultraship.h>
+#include <vector>
+#include <ship/window/gui/GuiWindow.h>

 class TimeDisplayWindow final : public Ship::GuiWindow {
  public:
@@ -1,4 +1,5 @@
 #include <libultraship/bridge.h>
+#include <spdlog/spdlog.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/enhancementTypes.h"
@@ -1,9 +1,12 @@
 #include <libultraship/bridge.h>
+#include <ship/Context.h>
+#include <ship/config/Config.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "functions.h"
 #include "soh/SohGui/MenuTypes.h"
+#include "soh/SohGui/UIWidgets.hpp"
 #include "soh/util.h"

 extern "C" {
@@ -4,9 +4,11 @@
 #include "soh/cvar_prefixes.h"
 #include "soh/Notification/Notification.h"
 #include <vector>
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <libultraship/libultra/types.h>
+#include <ship/Context.h>
 #include <ship/utils/StringHelper.h>
-#include <libultraship/bridge.h>
-#include <libultraship/classes.h>
+#include <ship/window/Window.h>
 #include <soh/OTRGlobals.h>
 #include <locale>
 #include <filesystem>
@@ -4,7 +4,6 @@
 #include <map>
 #include <set>
 #include <string>
-#include <libultraship/libultraship.h>
 #include <functions.h>
 #include "soh/ShipUtils.h"
 #include "soh/OTRGlobals.h"
@@ -3,7 +3,9 @@

 #ifdef __cplusplus

-#include <libultraship/libultraship.h>
+#include <libultraship/libultra/types.h>
+#include <ship/window/gui/GuiWindow.h>
+
 #include <imgui.h>
 #include "AudioCollection.h"

@@ -3,6 +3,7 @@
 #include "AudioCollection.h"
 #include <soh/Notification/Notification.h>
 #include <soh/SohGui/ImGuiUtils.h>
+#include <ship/window/gui/IconsFontAwesome4.h>

 extern "C" {
 #include "variables.h"
@@ -8,6 +8,7 @@
 #include <array>
 #include <string>
 #include <vector>
+#include <spdlog/spdlog.h>

 extern "C" {
 #include "functions.h"
@@ -1,6 +1,6 @@
 #pragma once

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 #define CVAR_INPUT_VIEWER(var) "gInputViewer." var

@@ -2,6 +2,7 @@
 #include "soh/OTRGlobals.h"
 #include "z64player.h"
 #include "global.h"
+#include <ship/Context.h>
 #include <ship/window/Window.h>
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
@@ -3,7 +3,7 @@

 #pragma once

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

 struct Player;

@@ -1,5 +1,7 @@
 #include "SohInputEditorWindow.h"
+#include <ship/controller/controldeck/ControlDeck.h>
 #include <ship/utils/StringHelper.h>
+#include <libultraship/libultra.h>
 #include <fast/Fast3dWindow.h>
 #include "soh/OTRGlobals.h"
 #include "soh/SohGui/SohMenu.h"
@@ -1,14 +1,16 @@
 #pragma once

-#include <stdint.h>
-#include <libultraship/libultraship.h>
 #include <imgui.h>
 #include <unordered_map>
+#include <memory>
 #include <string>
 #include <vector>
 #include <set>
 #include <list>

+#include <ship/controller/controldevice/controller/Controller.h>
+#include <ship/window/gui/GuiWindow.h>
+
 typedef CONTROLLERBUTTONS_T N64ButtonMask;

 typedef struct {
@@ -4,8 +4,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"

 #include <string>
-#include <libultraship/bridge.h>
-#include <math.h>
 #include <libultraship/libultraship.h>

 #include "soh/SohGui/UIWidgets.hpp"
@@ -1,5 +1,4 @@
 #pragma once
-#include <libultraship/libultraship.h>

 // Not to be confused with tabs, groups are 1:1 with the boxes shown in the UI, grouping them allows us to
 // reset/randomize every item in a group at once. If you are looking for tabs they are rendered manually in ImGui in
@@ -32,6 +31,7 @@ typedef enum {
 #ifdef __cplusplus
 #include <string>
 #include <map>
+#include <ship/window/gui/GuiWindow.h>
 #include "soh/SohGui/UIWidgets.hpp"
 extern "C" {
 #endif //__cplusplus
@@ -1,4 +1,5 @@
 #include <initializer_list>
+#include <libultraship/bridge/resourcebridge.h>
 #include "objects/object_link_boy/object_link_boy.h"
 #include "objects/object_link_child/object_link_child.h"
 #include "objects/object_custom_equip/object_custom_equip.h"
@@ -13,6 +13,7 @@
 #include "soh/Enhancements/audio/AudioEditor.h"
 #include "soh/Enhancements/randomizer/logic.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"

 #define Path _Path
 #define PATH_HACK
@@ -33,9 +34,6 @@ extern "C" {
 extern PlayState* gPlayState;
 }

-#include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
-
 #define CMD_REGISTER Ship::Context::GetRawInstance()->GetConsole()->AddCommand
 // TODO: Commands should be using the output passed in.
 #define ERROR_MESSAGE                                                                    \
@@ -1,7 +1,7 @@
 #ifndef SOH_STATS_H
 #define SOH_STATS_H

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 class SohStatsWindow final : public Ship::GuiWindow {
  public:
@@ -14,7 +14,6 @@
 #include <unordered_map>
 #include <string>
 #include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
 #include <spdlog/fmt/fmt.h>
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
@@ -1,6 +1,6 @@
 #pragma once

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 #include "z64actor.h"

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

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 typedef enum { COLVIEW_DISABLED, COLVIEW_SOLID, COLVIEW_TRANSPARENT } ColViewerRenderSetting;

@@ -13,8 +13,6 @@
 #include <bit>
 #include <map>
 #include <string>
-#include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
 #include <soh_assets.h>

 #include <fast/Fast3dGui.h>
@@ -5,7 +5,7 @@
 #include <vector>
 #include <stdint.h>
 #include "soh/Enhancements/randomizer/randomizerTypes.h"
-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 typedef enum {
    EVENT_CHECK_INF,
@@ -2,6 +2,7 @@
 #include "soh/util.h"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
+#include <libultraship/bridge/resourcebridge.h>
 #include <ship/resource/ResourceManager.h>
 #include <fast/resource/ResourceType.h>
 #include <fast/resource/type/DisplayList.h>
@@ -11,7 +12,6 @@
 #include <bit>
 #include <map>
 #include <string>
-#include <libultraship/libultraship.h>
 #include "dlViewer.h"

 extern "C" {
@@ -1,6 +1,6 @@
 #pragma once

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 class DLViewerWindow final : public Ship::GuiWindow {
  public:
@@ -1,4 +1,5 @@
 #include "hookDebugger.h"
+#include <libultraship/libultra.h>
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/SohGui/UIWidgets.hpp"
@@ -1,7 +1,7 @@
 #ifndef hookDebugger_h
 #define hookDebugger_h

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 class HookDebuggerWindow final : public Ship::GuiWindow {
  public:
@@ -1,4 +1,5 @@
 #include "valueViewer.h"
+#include <ship/config/Config.h>
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/OTRGlobals.h"
@@ -2,7 +2,8 @@

 #ifdef __cplusplus

-#include <libultraship/libultraship.h>
+#include <nlohmann/json.hpp>
+#include <ship/window/gui/GuiWindow.h>

 typedef enum {
    TYPE_S8,
@@ -3,7 +3,7 @@
 #ifndef GameInteractor_h
 #define GameInteractor_h

-#include "libultraship/libultraship.h"
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "vanilla-behavior/GIVanillaBehavior.h"
 #include <z64.h>

@@ -82,6 +82,7 @@ void GameInteractor_SetTriforceHuntCreditsWarpActive(uint8_t state);

 #ifdef __cplusplus
 #include <stdarg.h>
+#include <cstdint>
 #include <map>
 #include <unordered_map>
 #include <vector>
@@ -11,7 +11,6 @@
 #include <vector>
 #include <string>
 #include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/OTRGlobals.h"

@@ -1,4 +1,4 @@
-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 class GameplayStatsWindow final : public Ship::GuiWindow {
  public:
@@ -1,6 +1,6 @@
 #pragma once

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 #ifdef __cplusplus
 class ModMenuWindow : public Ship::GuiWindow {
@@ -1,6 +1,6 @@
 #include "playthrough.hpp"

-#include <libultraship/libultraship.h>
+#include <spdlog/spdlog.h>
 #include "fill.hpp"
 #include "../location_access.h"
 #include "random.hpp"
@@ -1,4 +1,3 @@
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
@@ -1,4 +1,3 @@
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
@@ -12,7 +12,7 @@ extern "C" {

 #endif // PLANDOMIZER_H

-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>
 #include "soh/Enhancements/randomizer/item.h"

 #ifdef __cplusplus
@@ -2,7 +2,6 @@

 #include "randomizerTypes.h"
 #include "z64save.h"
-#include "item_location.h"
 #include "item_override.h"
 #include "soh/Enhancements/custom-message/text.h"
 #include "hint.h"
@@ -33,6 +32,7 @@ class DungeonInfo;
 class TrialInfo;
 class Trials;
 class Kaleido;
+class ItemLocation;

 class Context {
  public:
@@ -15,6 +15,7 @@
 #include "soh/ObjectExtension/ObjectExtension.h"
 #include "item_category_adj.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
 #include "soh/Enhancements/randomizer/RCToRandInf.h"

 extern "C" {
@@ -3,6 +3,8 @@
 #include "logic.h"
 #include "3drando/random.hpp"

+#include <spdlog/spdlog.h>
+
 namespace Rando {
 ItemLocation::ItemLocation() : rc(RC_UNKNOWN_CHECK) {
 }
@@ -6,6 +6,7 @@
 #include "soh/Enhancements/debugger/performanceTimer.h"

 #include <fstream>
+#include <libultraship/log/luslog.h>
 #include <soh/OTRGlobals.h>

 #include "3drando/shops.hpp"
@@ -5,7 +5,6 @@
 #include <macros.h>
 #include <objects/gameplay_keep/gameplay_keep.h>
 #include <functions.h>
-#include <libultraship/libultraship.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"
@@ -7,7 +7,6 @@
 #include "SeedContext.h"
 #include <soh/Enhancements/randomizer/randomizerTypes.h>
 #include "soh/Enhancements/randomizer/randomizer_check_objects.h"
-#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
 #include "soh/Enhancements/randomizer/tricks.h"
 #include <soh/Enhancements/custom-message/CustomMessageManager.h>
 #include "soh/Enhancements/item-tables/ItemTableTypes.h"
@@ -22,7 +22,6 @@
 #include <sstream>
 #include <vector>
 #include <set>
-#include <libultraship/libultraship.h>
 #include <libultraship/controller/controldeck/ControlDeck.h>
 #include "location.h"
 #include "item_location.h"
@@ -5,8 +5,6 @@
 #include "randomizer_check_objects.h"
 #include "soh/SohGui/UIWidgets.hpp"

-#include <libultraship/libultraship.h>
-
 namespace CheckTracker {

 class CheckTrackerSettingsWindow final : public Ship::GuiWindow {
@@ -6,7 +6,6 @@
 #include <string>
 #include <vector>
 #include <libultraship/controller/controldeck/ControlDeck.h>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/randomizer/randomizer.h"

 extern "C" {
@@ -1,10 +1,14 @@
 #pragma once

 #include <string>
+#include <map>
 #include <vector>
 #include <stdint.h>

-#include <libultraship/libultraship.h>
+#include <nlohmann/json_fwd.hpp>
+#include <libultraship/color.h>
+#include <libultraship/libultra.h>
+#include <ship/window/gui/GuiWindow.h>
 #include "randomizerTypes.h"

 typedef enum {
@@ -3,7 +3,6 @@
 #include <string>
 #include <vector>

-#include <libultraship/libultraship.h>
 #include <libultraship/controller/controldeck/ControlDeck.h>

 #include "randomizer_check_tracker.h"
@@ -3,7 +3,6 @@
 #include <string>
 #include <vector>
 #include <stdint.h>
-#include <libultraship/libultraship.h>

 void DrawItemAmmo(int itemId);

@@ -5,6 +5,8 @@
 #include "soh/Enhancements/randomizer/logic.h"
 #include "soh/Enhancements/randomizer/randomizer.h"

+#include <spdlog/spdlog.h>
+
 extern "C" {
 #include <z64.h>
 #include "variables.h"
@@ -7,7 +7,7 @@

 #include <spdlog/spdlog.h>
 #include <libultraship/bridge/consolevariablebridge.h>
-#include <libultraship/libultraship.h>
+#include <libultraship/classes.h>

 namespace Rando {
 std::shared_ptr<Settings> Settings::mInstance;
@@ -6,6 +6,7 @@
 #include <unordered_map>
 #include "randomizerTypes.h"
 #include "item.h"
+#include "item_location.h"
 #include "location.h"

 namespace Rando {
@@ -1,5 +1,5 @@
 #include "SpeechLogger.h"
-#include <libultraship/libultraship.h>
+#include <libultraship/luslog.h>

 SpeechLogger::SpeechLogger() {
 }
@@ -2,8 +2,7 @@
 #ifndef TIMESPLITS_H
 #define TIMESPLITS_H

-#include <stdint.h>
-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 #ifdef __cplusplus
 class TimeSplitWindow final : public Ship::GuiWindow {
@@ -1,6 +1,5 @@
 #include "Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/nametag.h"
 #include "soh/ObjectExtension/ObjectExtension.h"
@@ -3,7 +3,9 @@
 #ifdef __cplusplus

 #include "soh/Network/Network.h"
-#include <libultraship/libultraship.h>
+#include <libultraship/bridge/consolevariablebridge.h>
+#include <ship/window/gui/GuiWindow.h>
+#include <spdlog/spdlog.h>
 #include <queue>
 #include <mutex>

@@ -1,4 +1,5 @@
 #include "Anchor.h"
+#include <ship/window/gui/IconsFontAwesome4.h>
 #include "soh/OTRGlobals.h"
 #include "soh/util.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
@@ -1,5 +1,4 @@
 #include "Anchor.h"
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/cosmetics/cosmeticsTypes.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/frame_interpolation.h"
@@ -3,7 +3,6 @@
 #ifdef __cplusplus

 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "Anchor.h"

 extern "C" {
@@ -1,5 +1,4 @@
 #include "Anchor.h"
-#include <libultraship/libultraship.h>
 #include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/SohMenu.h"
 #include "soh/util.h"
@@ -1,7 +1,8 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
+#include <ship/Context.h>
+#include <ship/window/Window.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Notification/Notification.h"

@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"

 extern "C" {
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"

 /**
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 #include "soh/OTRGlobals.h"
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Notification/Notification.h"
 #include "soh/ShipUtils.h"
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Notification/Notification.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
@@ -1,8 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/OTRGlobals.h"

 /**
 * HANDSHAKE
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>

 extern "C" {
 #include "macros.h"
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>

 extern "C" {
 #include "macros.h"
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>

 extern "C" {
 #include "macros.h"
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"

 /**
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"

 /**
@@ -1,7 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Notification/Notification.h"

 /**
@@ -1,9 +1,8 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"
-#include "soh/Enhancements/randomizer/randomizerEnums/RandomizerCheck.h"
+#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
 #include "soh/Enhancements/randomizer/randomizer.h"

 static bool isResultOfHandling = false;
@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"

@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"

@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"

@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/OTRGlobals.h"

@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"

@@ -1,6 +1,5 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include <spdlog/spdlog.h>

 extern "C" {
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"

 extern "C" {
@@ -1,7 +1,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "soh/Network/Anchor/JsonConversions.hpp"
 #include <nlohmann/json.hpp>
-#include <libultraship/libultraship.h>
 #include "soh/OTRGlobals.h"
 #include "soh/Notification/Notification.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
@@ -1,7 +1,5 @@
 #include "CrowdControl.h"
 #include "CrowdControlTypes.h"
-#include <libultraship/bridge.h>
-#include <libultraship/libultraship.h>
 #include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
 #include <spdlog/fmt/fmt.h>
@@ -4,6 +4,7 @@

 #include <thread>
 #include <memory>
+#include <mutex>
 #include <vector>

 #include "soh/Network/Network.h"
@@ -1,6 +1,5 @@
 #include "Network.h"
 #include <spdlog/spdlog.h>
-#include <libultraship/libultraship.h>

 // MARK: - Public

@@ -1,5 +1,4 @@
 #include "Sail.h"
-#include <libultraship/bridge.h>
 #include <libultraship/libultraship.h>
 #include <nlohmann/json.hpp>
 #include "soh/ShipUtils.h"
@@ -3,7 +3,7 @@
 #ifdef __cplusplus

 #include <string>
-#include <libultraship/libultraship.h>
+#include <ship/window/gui/GuiWindow.h>

 namespace Notification {

@@ -1,4 +1,4 @@
-#include "OTRGlobals.h"
+#include "OTRGlobals.h"
 #include "OTRAudio.h"
 #include <algorithm>
 #include <atomic>
@@ -24,6 +24,8 @@
 #include <time.h>
 #endif
 #include <ship/audio/AudioPlayer.h>
+#include <ship/resource/archive/O2rArchive.h>
+#include <ship/utils/binarytools/MemoryStream.h>
 #include "Enhancements/speechsynthesizer/SpeechSynthesizer.h"
 #include "Enhancements/controls/SohInputEditorWindow.h"
 #include "Enhancements/audio/AudioCollection.h"
@@ -82,7 +84,6 @@
 #include "soh/Network/Anchor/Anchor.h"
 #include "Enhancements/game-interactor/GameInteractor.h"
 #include "Enhancements/randomizer/draw.h"
-#include <libultraship/libultraship.h>
 #include <libultraship/controller/controldeck/ControlDeck.h>
 #include <fast/resource/ResourceType.h>

@@ -2,9 +2,8 @@

 #ifdef __cplusplus

-#include <libultraship/libultraship.h>
-
 #include <any>
+#include <cassert>
 #include <limits>
 #include <stdint.h>
 #include <unordered_map>
@@ -16,7 +16,6 @@
 #include "functions.h"
 #include "macros.h"
 #include <variables.h>
-#include <libultraship/libultraship.h>
 #include "soh/SohGui/SohGui.hpp"

 #define NOGDI // avoid various windows defines that conflict with things in z64.h
--- a/Show More
+++ b/Show More