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

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;

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"

soh/src/code/audio_playback.c

@@ -1,6 +1,5 @@
 #include "global.h"
 #include "soh/ResourceManagerHelpers.h"
-#include <libultraship/bridge.h>
 
 extern bool gUseLegacySD;
 

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"

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

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;

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"

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>
 

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"

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"