clean up includes (#7114)

soh/soh/Enhancements/ActorSkeletonUnregister.c

@@ -3,7 +3,6 @@
 
 #include "soh/ResourceManagerHelpers.h"
 
-#include "z64.h"
 #include "include/z64player.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h"
@@ -114,7 +113,6 @@
 #include "src/overlays/actors/ovl_En_Test/z_en_test.h"
 #include "src/overlays/actors/ovl_En_Tite/z_en_tite.h"
 #include "src/overlays/actors/ovl_En_Tk/z_en_tk.h"
-#include "src/overlays/actors/ovl_En_Torch2/z_en_torch2.h"
 #include "src/overlays/actors/ovl_En_Toryo/z_en_toryo.h"
 #include "src/overlays/actors/ovl_En_Tr/z_en_tr.h"
 #include "src/overlays/actors/ovl_En_Vali/z_en_vali.h"

soh/soh/Enhancements/BunnyHood.cpp

@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "z64.h"
-#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;

soh/soh/Enhancements/Cheats/DekuStick.cpp

@@ -1,12 +1,12 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "z64.h"
 #include "macros.h"
+extern PlayState* gPlayState;
 }
 
 #define CVAR_DEKU_STICK_NAME CVAR_CHEAT("DekuStick")

soh/soh/Enhancements/Cheats/EasyFrameAdvance.cpp

@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
 }
 

soh/soh/Enhancements/Cheats/EasyISG.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/Cheats/EasyQPA.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Cheats/FreezeTime.cpp

@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 

soh/soh/Enhancements/Cheats/GSTargetable.cpp

@@ -1,12 +1,13 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/ShipInit.hpp"
-#include <spdlog/spdlog.h>
 #include <vector>
 
+#include <spdlog/spdlog.h>
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
 extern "C" {
 #include "functions.h"
 #include "src/overlays/actors/ovl_En_Sw/z_en_sw.h"
-
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/Cheats/Infinite/Ammo.cpp

@@ -1,13 +1,13 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
-#include "z64save.h"
 
 extern "C" {
-extern SaveContext gSaveContext;
+#include "z64save.h"
 #include "variables.h"
 #include "macros.h"
+extern SaveContext gSaveContext;
 }
 
 #define CVAR_INFINITE_AMMO_NAME CVAR_CHEAT("InfiniteAmmo")

soh/soh/Enhancements/Cheats/Infinite/Health.cpp

@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 

soh/soh/Enhancements/Cheats/Infinite/Magic.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Cheats/Infinite/Money.cpp

@@ -1,12 +1,12 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "z64save.h"
-#include "variables.h"
 
 extern "C" {
+#include "z64save.h"
+#include "variables.h"
+#include "macros.h"
 extern SaveContext gSaveContext;
 extern s32 Flags_GetRandomizerInf(RandomizerInf flag);
-#include "macros.h"
 }
 
 #define CVAR_INFINITE_MONEY_NAME CVAR_CHEAT("InfiniteMoney")

soh/soh/Enhancements/Cheats/Infinite/NayrusLove.cpp

@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "z64save.h"
+}
 
 extern "C" SaveContext gSaveContext;
 

soh/soh/Enhancements/Cheats/MoonJump.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/Cheats/NoBugsDespawn.cpp

@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Insect/z_en_insect.h"
-
 extern s16 sDroppedCount;
 }
 

soh/soh/Enhancements/Cheats/NoKeeseGuayTarget.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/Cheats/NoRedeadFreeze.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/Cheats/UnrestrictedItems.cpp

@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "z64.h"
+extern PlayState* gPlayState;
 }
 
 #define CVAR_UNRESTRICTED_ITEMS_NAME CVAR_CHEAT("NoRestrictItems")

soh/soh/Enhancements/Difficulty/AlwaysWinGoronPot.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/Difficulty/BonkDamage.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 

soh/soh/Enhancements/Difficulty/CuccosToReturn.cpp

@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h"
+extern PlayState* gPlayState;
 }
 
 static constexpr int32_t CVAR_CUCCOS_TO_RETURN_DEFAULT = 7;

soh/soh/Enhancements/Difficulty/DampeFire.cpp

@@ -1,10 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/Enhancements/enhancementTypes.h"
 
 extern "C" {
-extern PlayState* gPlayState;
 #include "src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h"
+extern PlayState* gPlayState;
 }
 
 static constexpr DampeDropRate CVAR_DAMPE_DROP_RATE_DEFAULT = DAMPE_NORMAL;

soh/soh/Enhancements/Difficulty/HyperBosses.cpp

@@ -1,9 +1,12 @@
 #include "soh/ShipInit.hpp"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/boss-rush/BossRush.h"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/Enhancements/boss-rush/BossRush.h"
+}
 
 extern "C" PlayState* gPlayState;
 

soh/soh/Enhancements/Difficulty/HyperEnemies.cpp

@@ -1,7 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
+}
 
 extern "C" PlayState* gPlayState;
 

soh/soh/Enhancements/Difficulty/PermanentLosses.cpp

@@ -1,14 +1,13 @@
 #include <ship/Context.h>
 #include <ship/window/Window.h>
 
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/randomizer.h"
 #include "soh/OTRGlobals.h"
 #include "soh/SaveManager.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "variables.h"
 #include "z64save.h"
 extern SaveContext gSaveContext;

soh/soh/Enhancements/Difficulty/SwitchTimerMultiplier.cpp

@@ -1,6 +1,7 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
+
 extern "C" {
 #include "z64.h"
 extern PlayState* gPlayState;

soh/soh/Enhancements/Difficulty/TreesDropSticks.cpp

@@ -1,7 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
+#include "functions.h"
 #include "src/overlays/actors/ovl_En_Wood02/z_en_wood02.h"
 }
 

soh/soh/Enhancements/DropThrowOnlyActors.cpp

@@ -1,5 +1,4 @@
 #include <soh/Enhancements/game-interactor/GameInteractor.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/ExtraModes/BounceOffWalls.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/ExtraModes/HurtContainer.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/ExtraModes/IvanCoop.cpp

@@ -1,9 +1,9 @@
 #include "soh/ActorDB.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h"
 
 extern "C" {
+#include "src/overlays/actors/ovl_En_Partner/z_en_partner.h"
 #include "macros.h"
 #include "functions.h"
 extern PlayState* gPlayState;

soh/soh/Enhancements/ExtraModes/RandomizedEnemySizes.cpp

@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "functions.h"
-#include "src/overlays/actors/ovl_En_Fz/z_en_fz.h"
 #include "src/overlays/actors/ovl_En_Crow/z_en_crow.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
 extern void EnCrow_TurnAway(EnCrow*, PlayState*);

soh/soh/Enhancements/ExtraModes/RupeeDash.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/ExtraModes/ShadowTag.cpp

@@ -1,6 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+
+extern "C" {
 #include "functions.h"
+}
 
 extern "C" PlayState* gPlayState;
 

soh/soh/Enhancements/FileSelectEnhancements.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "z64.h"
+#include <libultraship/libultra/types.h>
 
 #ifdef __cplusplus
 extern "C" {

soh/soh/Enhancements/Fixes/BrokenGiantsKnife.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Fixes/DampeGoingBackwards.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Fixes/DekuNutUpgradeFix.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Fixes/DirtPathFix.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/enhancementTypes.h"
 #include "soh/ShipInit.hpp"
 

soh/soh/Enhancements/Fixes/FixFlexDrops.cpp

@@ -1,8 +1,8 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
+#include "soh/cvar_prefixes.h"
 
 extern "C" {
-#include "z64.h"
 // Converts a drop id based on age, health and owned items. Returns -1 when the drop can't be given.
 s16 func_8001F404(s16 dropId);
 }

soh/soh/Enhancements/Fixes/FixTwoHandedIdleAnim.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Fixes/FixWaterMQLock.cpp

@@ -1,9 +1,8 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "src/overlays/actors/ovl_En_Door/z_en_door.h"
 extern PlayState* gPlayState;
 }

soh/soh/Enhancements/Fixes/FloorSwitches.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Fixes/HammerHandFix.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 

soh/soh/Enhancements/GameplayStats/BossDefeatTimestamps.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/GameplayStats/EnemyDefeatCounts.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -13,7 +13,6 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Poh/z_en_poh.h"
 #include "src/overlays/actors/ovl_En_Tp/z_en_tp.h"
 #include "src/overlays/actors/ovl_En_Firefly/z_en_firefly.h"
-
 extern SaveContext gSaveContext;
 }
 

soh/soh/Enhancements/Graphics/AgeDependentEquipment.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ResourceManagerHelpers.h"
 

soh/soh/Enhancements/Graphics/Disable2DBackgrounds.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/resource/type/scenecommand/SetTimeSettings.h"
 

soh/soh/Enhancements/Graphics/DisableFixedCamera.cpp

@@ -1,8 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/ShipInit.hpp"
 #include <set>
 #include <unordered_map>
 
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/ShipInit.hpp"
+
 extern "C" {
 #include "functions.h"
 #include "variables.h"

soh/soh/Enhancements/Graphics/DisableLinkSpinWithGoronPot.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Graphics/ToTMedallions.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ResourceManagerHelpers.h"
 #include "soh/ShipInit.hpp"
 

soh/soh/Enhancements/Items/ArrowCycle.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -7,10 +7,8 @@ extern "C" {
 #include "variables.h"
 #include "functions.h"
 #include "overlays/actors/ovl_En_Arrow/z_en_arrow.h"
-
 s32 func_808351D4(Player* thisx, PlayState* play); // Arrow nocked
 void EnArrow_Init(Actor* thisx, PlayState* play);
-
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp

@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64.h"
 #include "macros.h"
 #include "variables.h"
-
 extern s32 Player_GetItemOnButton(PlayState*, s32);
 extern void Inventory_ChangeEquipment(s16, u16);
 extern void Player_SetEquipmentData(PlayState*, Player*);

soh/soh/Enhancements/Items/BlueFireArrows.cpp

@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h"
 #include "overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h"
-
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/Items/ItemUnequip.cpp

@@ -6,7 +6,6 @@ extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
 extern SaveContext gSaveContext;
 }
 

soh/soh/Enhancements/Items/MaskSelect.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Items/RemoteBombchu.cpp

@@ -1,9 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
+#include "functions.h"
 #include "src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h"
-
 void EnBomChu_Move(EnBomChu*, PlayState*);
 void EnBomChu_Explode(EnBomChu*, PlayState*);
 s32 Camera_BGCheck(Camera* camera, Vec3f* from, Vec3f* to);

soh/soh/Enhancements/Items/SunlightArrows.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/randomizer/SeedContext.h"
 #include "soh/ShipInit.hpp"
 #include "soh/ObjectExtension/ObjectExtension.h"

soh/soh/Enhancements/Lang/Lang.cpp

@@ -1,20 +1,17 @@
-#include "Lang.h"
-
-#include "soh/SohGui/MenuTypes.h"
-#include "soh/SohGui/SohGui.hpp"
-#include "soh/SohGui/SohMenu.h"
-#include "soh/util.h"
+#include <memory>
 
+#include <libultraship/bridge/consolevariablebridge.h>
 #include "ship/Context.h"
 #include "ship/resource/File.h"
-#include "ship/resource/ResourceManager.h"
 #include "ship/resource/type/Json.h"
 #include "ship/utils/StringHelper.h"
 
+#include "Lang.h"
+#include "soh/SohGui/MenuTypes.h"
+#include "soh/SohGui/SohMenu.h"
+#include "soh/util.h"
 #include "spdlog/spdlog.h"
 
-#include <memory>
-
 namespace SohGui {
 extern std::shared_ptr<SohMenu> mSohMenu;
 }

soh/soh/Enhancements/Minigames/BombchuBowling.cpp

@@ -1,5 +1,5 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Minigames/DampeBothPrizes.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Minigames/DivingGameTimer.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Minigames/FrogsOcarinaGame.cpp

@@ -1,11 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "src/overlays/actors/ovl_En_Fr/z_en_fr.h"
 extern PlayState* gPlayState;
-
 extern void EnFr_SetupReward(EnFr* enFr, PlayState* play, u8 unkCondition);
 }
 

soh/soh/Enhancements/Minigames/HorsebackArchery.cpp

@@ -1,11 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
 #include "src/overlays/actors/ovl_En_Ge1/z_en_ge1.h"
 extern SaveContext gSaveContext;
-
 extern void EnGe1_TalkAfterGame_Archery(EnGe1* enGe1, PlayState* play);
 }
 

soh/soh/Enhancements/Minigames/IngoRaceOnce.cpp

@@ -1,5 +1,5 @@
 #include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Minigames/LostWoodsOcarinaGame.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
@@ -6,7 +6,6 @@ extern "C" {
 #include "variables.h"
 #include "src/overlays/actors/ovl_En_Skj/z_en_skj.h"
 extern PlayState* gPlayState;
-
 void EnSkj_WaitForPlayback(EnSkj* enSkj, PlayState* play);
 }
 

soh/soh/Enhancements/Minigames/ShootingGallery.cpp

@@ -2,7 +2,6 @@
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "functions.h"
 #include "src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h"
 extern PlayState* gPlayState;
 }

soh/soh/Enhancements/QoL/DaytimeGS.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/QoL/EasyButterflyFairies.cpp

@@ -4,7 +4,6 @@
 
 extern "C" {
 #include "src/overlays/actors/ovl_En_Butte/z_en_butte.h"
-#include "variables.h"
 extern void EnButte_SetupTransformIntoFairy(EnButte* enButte);
 }
 

soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp

@@ -1,5 +1,6 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/randomizer/randomizer.h"
+#include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
 #include "variables.h"

soh/soh/Enhancements/QoL/OcarinaTimeTravel.cpp

@@ -1,10 +1,13 @@
 #include "soh/ShipInit.hpp"
+#include "soh/Enhancements/enhancementTypes.h"
+#include "soh/Enhancements/SwitchAge.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+
+extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-#include "soh/Enhancements/enhancementTypes.h"
-#include "soh/Enhancements/SwitchAge.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+}
 
 extern "C" PlayState* gPlayState;
 

soh/soh/Enhancements/QoL/OpenAllHours.cpp

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

soh/soh/Enhancements/QoL/PauseWarp.cpp

@@ -1,15 +1,12 @@
-#include <string>
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
 #include "macros.h"
 #include "variables.h"
-
 extern PlayState* gPlayState;
-
 u8 Randomizer_GetSettingValue(RandomizerSettingKey);
 }
 

soh/soh/Enhancements/QoL/RebottleBlueFire.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/QoL/ResetNaviTimer.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/QoL/ReworkedTargeting.cpp

@@ -1,11 +1,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "soh/OTRGlobals.h"
 
 extern "C" {
 #include "z64.h"
 #include "macros.h"
-#include "functions.h"
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/QoL/SkipWarpAnimation.cpp

@@ -1,12 +1,10 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "functions.h"
-#include "macros.h"
 #include "variables.h"
 #include "z64save.h"
-
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/ResetGameplayFrames.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Restorations/BottleAdventure.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Restorations/GetItemManipulation.cpp

@@ -1,13 +1,10 @@
+#include <libultraship/bridge/consolevariablebridge.h>
+
 #include "GetItemManipulation.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/Enhancements/item-tables/ItemTableManager.h"
-#include "soh/OTRGlobals.h"
-#include "soh/ShipInit.hpp"
 
 extern "C" {
 #include "z64.h"
-#include "macros.h"
-#include "variables.h"
 extern PlayState* gPlayState;
 GetItemID RetrieveGetItemIDFromItemID(ItemID itemID);
 }

soh/soh/Enhancements/Restorations/GraveHoleJumps.cpp

@@ -1,11 +1,12 @@
+#include <ship/Context.h>
+#include <ship/resource/ResourceManager.h>
+
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
-#include "functions.h"
+#include "soh/cvar_prefixes.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

soh/soh/Enhancements/Restorations/PauseBufferInputs.cpp

@@ -1,11 +1,7 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
+#include "soh/Enhancements/gameconsole.h"
 #include "soh/ShipInit.hpp"
 
-extern "C" {
-#include "variables.h"
-#include "overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h"
-}
-
 #define CVAR_BUFFER_NAME CVAR_ENHANCEMENT("PauseBufferWindow")
 #define CVAR_BUFFER_DEFAULT 0
 #define CVAR_BUFFER_VALUE CVarGetInteger(CVAR_BUFFER_NAME, CVAR_BUFFER_DEFAULT)

soh/soh/Enhancements/Restorations/WideShutterDoorRanges.cpp

@@ -1,5 +1,6 @@
 #include <libultraship/bridge/consolevariablebridge.h>
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/SpeedModifiers.cpp

@@ -5,7 +5,6 @@
 
 extern "C" {
 #include "z64.h"
-#include "functions.h"
 #include "macros.h"
 #include "variables.h"
 extern PlayState* gPlayState;

soh/soh/Enhancements/SwitchAge.cpp

@@ -5,8 +5,6 @@ extern "C" {
 #include <z64.h>
 #include "macros.h"
 #include "variables.h"
-#include "functions.h"
-
 extern SaveContext gSaveContext;
 extern PlayState* gPlayState;
 }

soh/soh/Enhancements/TimeDisplay/TimeDisplay.cpp

@@ -1,19 +1,15 @@
-#include "TimeDisplay.h"
-#include "soh/Enhancements/gameplaystats.h"
-#include <global.h>
-
-#include "assets/textures/parameter_static/parameter_static.h"
-#include "assets/soh_assets.h"
-#include "soh/SohGui/ImGuiUtils.h"
-
 #include <fast/Fast3dGui.h>
 #include <libultraship/bridge/consolevariablebridge.h>
 #include <ship/Context.h>
-#include <spdlog/common.h>
+
+#include "TimeDisplay.h"
+#include "soh/Enhancements/gameplaystats.h"
+#include "soh/SohGui/ImGuiUtils.h"
 
 extern "C" {
+#include "assets/textures/parameter_static/parameter_static.h"
+#include "assets/soh_assets.h"
 #include "macros.h"
-#include "functions.h"
 #include "variables.h"
 extern PlayState* gPlayState;
 uint64_t GetUnixTimestamp();

soh/soh/Enhancements/TimeSavers/DampeAllNight.cpp

@@ -1,5 +1,4 @@
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
-#include "soh/OTRGlobals.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/TimeSavers/FasterHeavyBlockLift.cpp

@@ -5,7 +5,6 @@ extern "C" {
 #include "z64.h"
 #include "z64save.h"
 #include "macros.h"
-#include "variables.h"
 #include "functions.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;

soh/soh/Enhancements/TimeSavers/FasterRupeeAccumulator.cpp

@@ -6,7 +6,6 @@ extern "C" {
 #include "z64save.h"
 #include "macros.h"
 #include "variables.h"
-#include "functions.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;
 }

soh/soh/Enhancements/TimeSavers/ImprovedRoll.cpp

@@ -1,8 +1,9 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
-#include "global.h"
 
 extern "C" {
+#include "functions.h"
+#include "macros.h"
 void Player_SetupRoll(Player* player, PlayState* play);
 }
 

soh/soh/Enhancements/TimeSavers/MarketSneak.cpp

@@ -1,4 +1,3 @@
-#include <soh/OTRGlobals.h>
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
@@ -10,10 +9,8 @@ extern "C" {
 #include <variables.h>
 #include "overlays/actors/ovl_En_Heishi4/z_en_heishi4.h"
 extern PlayState* gPlayState;
-
 // the guard's idle action func, restored once the sneak prompt is answered
 void func_80A56614(EnHeishi4* heishi, PlayState* play);
-
 u8 Randomizer_GetSettingValue(RandomizerSettingKey randoSettingKey);
 }
 

soh/soh/Enhancements/TimeSavers/SkipCutscene/SkipIntro.cpp

@@ -5,7 +5,6 @@
 extern "C" {
 #include "macros.h"
 #include "z64save.h"
-#include "functions.h"
 #include "soh/Enhancements/randomizer/randomizer_entrance.h"
 extern PlayState* gPlayState;
 extern SaveContext gSaveContext;

soh/soh/Enhancements/TimeSavers/SkipCutscene/Story/Twinrova.cpp

@@ -1,12 +1,9 @@
 #include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {
-#include "variables.h"
 #include "seqcmd.h"
 #include "src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h"
-#include "assets/objects/object_tw/object_tw.h"
 extern BossTw* sTwinrovaPtr;
 extern void BossTw_SetupFlyTo(BossTw*, PlayState*);
 extern void BossTw_SetupWait(BossTw*, PlayState*);

soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 
 extern "C" {

soh/soh/Enhancements/Warping.cpp

@@ -1,16 +1,19 @@
 #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"
+#include "soh/Enhancements/gameconsole.h"
 
 extern "C" {
+#include "functions.h"
+#include "macros.h"
+#include "variables.h"
 #include "z64.h"
-#include "global.h"
 #include "soh/Enhancements/enhancementTypes.h"
 void Sram_InitDebugSave(void);
 void Select_LoadGame(SelectContext* selectContext, s32 entranceIndex);

soh/soh/Enhancements/audio/AudioEditor.cpp

@@ -1,14 +1,11 @@
-#include "AudioEditor.h"
-#include "sequence.h"
-
 #include <map>
 #include <set>
 #include <string>
-#include <functions.h>
+
+#include "AudioEditor.h"
 #include "soh/ShipUtils.h"
 #include "soh/OTRGlobals.h"
 #include "soh/cvar_prefixes.h"
-#include <ship/utils/StringHelper.h>
 #include "soh/SohGui/SohMenu.h"
 #include "soh/SohGui/SohGui.hpp"
 #include "AudioCollection.h"
@@ -18,6 +15,8 @@
 #include "soh/Enhancements/randomizer/SeedContext.h"
 
 extern "C" {
+#include "sequence.h"
+#include <functions.h>
 #include "z64save.h"
 extern SaveContext gSaveContext;
 }

soh/soh/Enhancements/audio/AudioHooks.cpp

@@ -1,13 +1,12 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include <ship/window/gui/IconsFontAwesome4.h>
+
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "AudioCollection.h"
 #include <soh/Notification/Notification.h>
-#include <soh/SohGui/ImGuiUtils.h>
-#include <ship/window/gui/IconsFontAwesome4.h>
 
 extern "C" {
 #include "variables.h"
-
 extern PlayState* gPlayState;
 }
 

soh/soh/Enhancements/audio/EnemyBGMDisable.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"
 

soh/soh/Enhancements/audio/LeeverEnemyBGM.cpp

@@ -1,4 +1,4 @@
-#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/Enhancements/game-interactor/GameInteractor.h"
 #include "soh/ShipInit.hpp"
 #include "soh/cvar_prefixes.h"