diff --git a/FEXCore/Source/CMakeLists.txt b/FEXCore/Source/CMakeLists.txt
index ae94d50de..3ff663ca1 100644
--- a/FEXCore/Source/CMakeLists.txt
+++ b/FEXCore/Source/CMakeLists.txt
@@ -18,6 +18,7 @@ set (SRCS
   Common/JitSymbols.cpp
   Interface/Context/Context.cpp
   Interface/Core/LookupCache.cpp
+  Interface/Core/CodeCache.cpp
   Interface/Core/Core.cpp
   Interface/Core/CPUBackend.cpp
   Interface/Core/Addressing.cpp
@@ -57,7 +58,6 @@ set (SRCS
   Interface/Core/X86Tables/VEXTables.cpp
   Interface/Core/X86Tables/X87Tables.cpp
   Interface/GDBJIT/GDBJIT.cpp
-  Interface/IR/AOTIR.cpp
   Interface/IR/IRDumper.cpp
   Interface/IR/IREmitter.cpp
   Interface/IR/PassManager.cpp
diff --git a/FEXCore/Source/Interface/Context/Context.h b/FEXCore/Source/Interface/Context/Context.h
index 88c1e4089..e4e5f3689 100644
--- a/FEXCore/Source/Interface/Context/Context.h
+++ b/FEXCore/Source/Interface/Context/Context.h
@@ -6,7 +6,7 @@
 #include "Interface/Core/CPUID.h"
 #include "Interface/Core/X86HelperGen.h"
 #include "Interface/Core/Dispatcher/Dispatcher.h"
-#include "Interface/IR/AOTIR.h"
+#include <Interface/Core/JIT/DebugData.h>
 #include <Interface/IR/IntrusiveIRList.h>
 #include <FEXCore/Config/Config.h>
 #include <FEXCore/Core/Context.h>
diff --git a/FEXCore/Source/Interface/Core/CodeCache.cpp b/FEXCore/Source/Interface/Core/CodeCache.cpp
index 1426d186c..867ce6e15 100644
--- a/FEXCore/Source/Interface/Core/CodeCache.cpp
+++ b/FEXCore/Source/Interface/Core/CodeCache.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 #include "FEXHeaderUtils/Filesystem.h"
 #include "Interface/Context/Context.h"
-#include "Interface/IR/AOTIR.h"
+#include "Interface/Core/JIT/DebugData.h"
 
 #include <FEXCore/Utils/Allocator.h>
 #include <FEXCore/HLE/SyscallHandler.h>
diff --git a/FEXCore/Source/Interface/IR/AOTIR.h b/FEXCore/Source/Interface/Core/JIT/DebugData.h
similarity index 100%
rename from FEXCore/Source/Interface/IR/AOTIR.h
rename to FEXCore/Source/Interface/Core/JIT/DebugData.h
diff --git a/FEXCore/Source/Interface/GDBJIT/GDBJIT.h b/FEXCore/Source/Interface/GDBJIT/GDBJIT.h
index 101224577..11fdc3952 100644
--- a/FEXCore/Source/Interface/GDBJIT/GDBJIT.h
+++ b/FEXCore/Source/Interface/GDBJIT/GDBJIT.h
@@ -1,9 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-
-#include <Interface/IR/AOTIR.h>
+#include <Interface/Core/JIT/DebugData.h>
 
 namespace FEXCore {
 void GDBJITRegister(FEXCore::IR::AOTIRCacheEntry* Entry, uintptr_t VAFileStart, uint64_t GuestRIP, uintptr_t HostEntry,
                     FEXCore::Core::DebugData* DebugData);
-}
\ No newline at end of file
+}