From b65c1c83172ec57040ba3240617ea1c7ead142bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20Dub=C3=A9?= Date: Sat, 21 Mar 2026 20:22:32 +0000 Subject: [PATCH] Remove some unnecessary includes (#6385) --- soh/soh/Enhancements/boss-rush/BossRush.cpp | 2 +- soh/soh/Enhancements/controls/InputViewer.cpp | 1 - soh/soh/Enhancements/randomizer/hook_handlers.cpp | 1 - .../Enhancements/randomizer/randomizer_check_tracker.cpp | 1 - soh/soh/Enhancements/timesplits/TimeSplits.cpp | 7 +------ soh/soh/Network/Anchor/DummyPlayer.cpp | 1 - soh/soh/OTRGlobals.cpp | 3 --- soh/soh/SohGui/SohGui.cpp | 1 - soh/soh/z_message_OTR.cpp | 1 - soh/soh/z_play_otr.cpp | 1 - soh/soh/z_scene_otr.cpp | 2 +- 11 files changed, 3 insertions(+), 18 deletions(-) diff --git a/soh/soh/Enhancements/boss-rush/BossRush.cpp b/soh/soh/Enhancements/boss-rush/BossRush.cpp index 52daef0a7..170b175cb 100644 --- a/soh/soh/Enhancements/boss-rush/BossRush.cpp +++ b/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" diff --git a/soh/soh/Enhancements/controls/InputViewer.cpp b/soh/soh/Enhancements/controls/InputViewer.cpp index f2a6ebe72..9e46497b5 100644 --- a/soh/soh/Enhancements/controls/InputViewer.cpp +++ b/soh/soh/Enhancements/controls/InputViewer.cpp @@ -10,7 +10,6 @@ #include #include -#include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/UIWidgets.hpp" #include "soh/SohGui/SohGui.hpp" diff --git a/soh/soh/Enhancements/randomizer/hook_handlers.cpp b/soh/soh/Enhancements/randomizer/hook_handlers.cpp index 87f730641..73b2cda6d 100644 --- a/soh/soh/Enhancements/randomizer/hook_handlers.cpp +++ b/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" diff --git a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp index 9c5b64fae..fdd97f669 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp +++ b/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" { diff --git a/soh/soh/Enhancements/timesplits/TimeSplits.cpp b/soh/soh/Enhancements/timesplits/TimeSplits.cpp index 1aa15795e..e970b965c 100644 --- a/soh/soh/Enhancements/timesplits/TimeSplits.cpp +++ b/soh/soh/Enhancements/timesplits/TimeSplits.cpp @@ -1,23 +1,18 @@ #include #include -#include #include #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 #include "soh/SohGui/UIWidgets.hpp" extern "C" { #include "z64item.h" +#include "macros.h" extern SaveContext gSaveContext; extern PlayState* gPlayState; } diff --git a/soh/soh/Network/Anchor/DummyPlayer.cpp b/soh/soh/Network/Anchor/DummyPlayer.cpp index 4351e27f0..67bf6ac3f 100644 --- a/soh/soh/Network/Anchor/DummyPlayer.cpp +++ b/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" diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index d1b99cb3f..f1d010414 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1,6 +1,5 @@ #include "OTRGlobals.h" #include "OTRAudio.h" -#include #include #include #include @@ -11,7 +10,6 @@ #include "ResourceManagerHelpers.h" #include #include -#include #include #include #include @@ -66,7 +64,6 @@ #include #include "Enhancements/item-tables/ItemTableManager.h" -#include "soh/SohGui/SohGui.hpp" #include "soh/SohGui/ImGuiUtils.h" #include "ActorDB.h" #include "SaveManager.h" diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp index 7711fc5dd..625c13117 100644 --- a/soh/soh/SohGui/SohGui.cpp +++ b/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" diff --git a/soh/soh/z_message_OTR.cpp b/soh/soh/z_message_OTR.cpp index 24dbd7c70..1a83970ff 100644 --- a/soh/soh/z_message_OTR.cpp +++ b/soh/soh/z_message_OTR.cpp @@ -1,4 +1,3 @@ -#include "OTRGlobals.h" #include #include "soh/resource/type/Scene.h" #include diff --git a/soh/soh/z_play_otr.cpp b/soh/soh/z_play_otr.cpp index 8864351b4..f997c3728 100644 --- a/soh/soh/z_play_otr.cpp +++ b/soh/soh/z_play_otr.cpp @@ -1,4 +1,3 @@ -#include "OTRGlobals.h" #include "ResourceManagerHelpers.h" #include #include "soh/resource/type/Scene.h" diff --git a/soh/soh/z_scene_otr.cpp b/soh/soh/z_scene_otr.cpp index 1da9d729a..2ac7b8e38 100644 --- a/soh/soh/z_scene_otr.cpp +++ b/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 #include "soh/resource/type/Scene.h"