From 2f32abb51191f01bea178c854173b0d99105463c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20Dub=C3=A9?= <serprex@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:18:21 +0000
Subject: [PATCH] Console include cleanup (#6413)

Looking into fixing warnings about commands already being bound,
LUS initializes a console window which we ignore,
but it registers global command handlers,
SohConsoleWindow does this again, but that's also where mInputBuffer/mFilterBuffer get set

Proper fix would be removing SohConsoleWindow, but it exists to have mono font
---
 soh/soh/Enhancements/debugger/SohConsoleWindow.cpp | 8 --------
 soh/soh/Enhancements/debugger/SohConsoleWindow.h   | 2 --
 soh/soh/Enhancements/debugger/debugSaveEditor.h    | 1 -
 soh/soh/SohGui/SohGui.cpp                          | 7 -------
 4 files changed, 18 deletions(-)

diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp b/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp
index 19be376ed..a47d60812 100644
--- a/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.cpp
@@ -3,14 +3,6 @@
 #include "soh/SohGui/UIWidgets.hpp"
 #include "soh/SohGui/SohGui.hpp"
 
-void SohConsoleWindow::InitElement() {
-    ConsoleWindow::InitElement();
-}
-
-void SohConsoleWindow::UpdateElement() {
-    ConsoleWindow::UpdateElement();
-}
-
 void SohConsoleWindow::DrawElement() {
     ImGui::BeginDisabled(CVarGetInteger(CVAR_SETTING("DisableChanges"), 0));
     UIWidgets::PushStyleInput(THEME_COLOR);
diff --git a/soh/soh/Enhancements/debugger/SohConsoleWindow.h b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
index b84399ad6..9ae390d14 100644
--- a/soh/soh/Enhancements/debugger/SohConsoleWindow.h
+++ b/soh/soh/Enhancements/debugger/SohConsoleWindow.h
@@ -9,8 +9,6 @@ class SohConsoleWindow : public Ship::ConsoleWindow {
     using ConsoleWindow::ConsoleWindow;
 
   protected:
-    void InitElement() override;
-    void UpdateElement() override;
     void DrawElement() override;
 };
 
diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.h b/soh/soh/Enhancements/debugger/debugSaveEditor.h
index 2d3c87ba6..6e692963f 100644
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.h
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <array>
 #include <map>
 #include <string>
 #include <vector>
diff --git a/soh/soh/SohGui/SohGui.cpp b/soh/soh/SohGui/SohGui.cpp
index 625c13117..04c47b4b7 100644
--- a/soh/soh/SohGui/SohGui.cpp
+++ b/soh/soh/SohGui/SohGui.cpp
@@ -20,14 +20,7 @@
 #include <port/switch/SwitchImpl.h>
 #endif
 #include "include/global.h"
-#include "include/z64audio.h"
-#include "soh/SaveManager.h"
-#include "soh/OTRGlobals.h"
-#include "soh/Enhancements/Presets/Presets.h"
-#include "soh/resource/type/Skeleton.h"
 
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/Enhancements/cosmetics/authenticGfxPatches.h"
 #include "soh/Enhancements/debugger/MessageViewer.h"
 #include "soh/Notification/Notification.h"
 #include "soh/Enhancements/TimeDisplay/TimeDisplay.h"