From d36c387c1f74e4ba77ed0ed9bcef39760d81e3bd Mon Sep 17 00:00:00 2001
From: Lioncache <mai.iam2048@gmail.com>
Date: Sat, 6 Sep 2025 22:26:55 -0400
Subject: [PATCH] Core/Thunks: Remove unused IR/forward declarations

Moves the IR include into one of the more specific headers, which avoids dumping the IR header into any core bits that use the interface.

Also uncovered a missing header guard.
---
 FEXCore/include/FEXCore/Core/Thunks.h | 16 ++--------------
 Source/Tools/LinuxEmulation/Thunks.h  |  3 +++
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/FEXCore/include/FEXCore/Core/Thunks.h b/FEXCore/include/FEXCore/Core/Thunks.h
index df97e6427..f0e417468 100644
--- a/FEXCore/include/FEXCore/Core/Thunks.h
+++ b/FEXCore/include/FEXCore/Core/Thunks.h
@@ -7,18 +7,6 @@ $end_info$
 
 #pragma once
 
-#include <FEXCore/fextl/memory.h>
-#include <FEXCore/fextl/vector.h>
-#include <FEXCore/IR/IR.h>
-
-namespace FEXCore::Context {
-class Context;
-}
-
-namespace FEXCore::Core {
-struct InternalThreadState;
-}
-
 namespace FEXCore::IR {
 struct SHA256Sum;
 }
@@ -28,7 +16,7 @@ typedef void ThunkedFunction(void* ArgsRv);
 
 class ThunkHandler {
 public:
+  virtual ~ThunkHandler() = default;
   virtual ThunkedFunction* LookupThunk(const IR::SHA256Sum& sha256) = 0;
-  virtual ~ThunkHandler() {}
 };
-}; // namespace FEXCore
+} // namespace FEXCore
diff --git a/Source/Tools/LinuxEmulation/Thunks.h b/Source/Tools/LinuxEmulation/Thunks.h
index 163c6e084..16a89ce70 100644
--- a/Source/Tools/LinuxEmulation/Thunks.h
+++ b/Source/Tools/LinuxEmulation/Thunks.h
@@ -1,6 +1,9 @@
 // SPDX-License-Identifier: MIT
+#pragma once
+
 #include <FEXCore/Core/Thunks.h>
 #include <FEXCore/fextl/memory.h>
+#include <FEXCore/IR/IR.h>
 
 #include <span>