Remove some unnecessary includes (#6385)

soh/soh/Enhancements/boss-rush/BossRush.cpp

@@ -1,5 +1,5 @@
 #include "BossRush.h"
-#include "soh/OTRGlobals.h"
+#include "soh/ShipInit.hpp"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh_assets.h"

soh/soh/Enhancements/controls/InputViewer.cpp

@@ -10,7 +10,6 @@
 #include <spdlog/spdlog.h>
 #include <cmath>
 
-#include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 

soh/soh/Enhancements/randomizer/hook_handlers.cpp

@@ -54,7 +54,6 @@ extern "C" {
 #include "src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h"
 #include "src/overlays/actors/ovl_En_Xc/z_en_xc.h"
 #include "src/overlays/actors/ovl_Fishing/z_fishing.h"
-#include "src/overlays/actors/ovl_En_Mk/z_en_mk.h"
 #include "src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h"
 #include "src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h"
 #include "draw.h"

soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp

@@ -25,7 +25,6 @@
 #include "item_location.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "z64item.h"
-#include "randomizerTypes.h"
 #include "fishsanity.h"
 
 extern "C" {

soh/soh/Enhancements/timesplits/TimeSplits.cpp

@@ -1,23 +1,18 @@
 #include <vector>
 #include <fstream>
-#include <filesystem>
 
 #include <ship/Context.h>
 #include "TimeSplits.h"
 #include "soh/Enhancements/gameplaystats.h"
-#include "soh/SaveManager.h"
-#include "soh/util.h"
 
-#include "soh/OTRGlobals.h"
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/debugger/debugSaveEditor.h"
 #include "soh_assets.h"
-#include "assets/textures/parameter_static/parameter_static.h"
 #include <soh/SohGui/SohGui.hpp>
 #include "soh/SohGui/UIWidgets.hpp"
 
 extern "C" {
 #include "z64item.h"
+#include "macros.h"
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }

soh/soh/Network/Anchor/DummyPlayer.cpp

@@ -1,6 +1,5 @@
 #include "Anchor.h"
 #include "soh/Enhancements/nametag.h"
-#include "soh/frame_interpolation.h"
 
 extern "C" {
 #include "macros.h"

soh/soh/OTRGlobals.cpp

@@ -1,6 +1,5 @@
 #include "OTRGlobals.h"
 #include "OTRAudio.h"
-#include <iostream>
 #include <algorithm>
 #include <atomic>
 #include <filesystem>
@@ -11,7 +10,6 @@
 #include "ResourceManagerHelpers.h"
 #include <fast/Fast3dWindow.h>
 #include <ship/resource/File.h>
-#include <fast/resource/type/DisplayList.h>
 #include <ship/window/Window.h>
 #include <soh/GameVersions.h>
 #include <spdlog/sinks/rotating_file_sink.h>
@@ -66,7 +64,6 @@
 
 #include <functions.h>
 #include "Enhancements/item-tables/ItemTableManager.h"
-#include "soh/SohGui/SohGui.hpp"
 #include "soh/SohGui/ImGuiUtils.h"
 #include "ActorDB.h"
 #include "SaveManager.h"

soh/soh/SohGui/SohGui.cpp

@@ -25,7 +25,6 @@
 #include "soh/OTRGlobals.h"
 #include "soh/Enhancements/Presets/Presets.h"
 #include "soh/resource/type/Skeleton.h"
-#include "libultraship/libultraship.h"
 
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/cosmetics/authenticGfxPatches.h"

soh/soh/z_message_OTR.cpp

@@ -1,4 +1,3 @@
-#include "OTRGlobals.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"
 #include <ship/utils/StringHelper.h>

soh/soh/z_play_otr.cpp

@@ -1,4 +1,3 @@
-#include "OTRGlobals.h"
 #include "ResourceManagerHelpers.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"

soh/soh/z_scene_otr.cpp

@@ -1,4 +1,4 @@
-#include "OTRGlobals.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "ResourceManagerHelpers.h"
 #include <libultraship/libultraship.h>
 #include "soh/resource/type/Scene.h"