From a7989eb79fd9b309a5acd6b4d3a1b01df5d07d60 Mon Sep 17 00:00:00 2001
From: Lioncache <mai.iam2048@gmail.com>
Date: Mon, 8 Sep 2025 22:28:14 -0400
Subject: [PATCH] FEXCore/Allocator: Remove unused headers

Reveals some more indirect inclusions.
---
 FEXCore/Source/Interface/Core/JIT/JITClass.h        |  1 +
 FEXCore/Source/Interface/IR/IR.h                    |  2 ++
 FEXCore/Source/Utils/Allocator.cpp                  | 10 +++++-----
 FEXCore/Source/Utils/Allocator/HostAllocator.h      |  6 ++++--
 FEXCore/include/FEXCore/Utils/Allocator.h           |  2 --
 FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h |  5 ++++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/FEXCore/Source/Interface/Core/JIT/JITClass.h b/FEXCore/Source/Interface/Core/JIT/JITClass.h
index 12256599d..f1febd048 100644
--- a/FEXCore/Source/Interface/Core/JIT/JITClass.h
+++ b/FEXCore/Source/Interface/Core/JIT/JITClass.h
@@ -24,6 +24,7 @@ $end_info$
 
 #include <array>
 #include <cstdint>
+#include <functional>
 #include <utility>
 #include <variant>
 
diff --git a/FEXCore/Source/Interface/IR/IR.h b/FEXCore/Source/Interface/IR/IR.h
index 0670b2b2b..568231cc6 100644
--- a/FEXCore/Source/Interface/IR/IR.h
+++ b/FEXCore/Source/Interface/IR/IR.h
@@ -7,6 +7,8 @@
 #include <FEXCore/fextl/memory.h>
 #include <FEXCore/fextl/sstream.h>
 
+#include <array>
+
 namespace FEXCore::IR {
 
 class OrderedNode;
diff --git a/FEXCore/Source/Utils/Allocator.cpp b/FEXCore/Source/Utils/Allocator.cpp
index 85c9e45db..062cdd444 100644
--- a/FEXCore/Source/Utils/Allocator.cpp
+++ b/FEXCore/Source/Utils/Allocator.cpp
@@ -3,15 +3,20 @@
 #include <FEXCore/Utils/Allocator.h>
 #include <FEXCore/Utils/CompilerDefs.h>
 #include <FEXCore/Utils/LogManager.h>
+#include <FEXCore/Utils/MathUtils.h>
 #include <FEXCore/Utils/TypeDefines.h>
 #include <FEXCore/fextl/fmt.h>
+#include <FEXCore/fextl/memory.h>
 #include <FEXCore/fextl/memory_resource.h>
 #include <FEXHeaderUtils/Syscalls.h>
 
 #include <algorithm>
 #include <array>
 #include <cctype>
+#include <cerrno>
 #include <charconv>
+#include <cstddef>
+#include <cstdint>
 #include <cstdio>
 #include <fcntl.h>
 #ifndef _WIN32
@@ -19,11 +24,6 @@
 #include <sys/user.h>
 #endif
 
-#include <errno.h>
-#include <memory>
-#include <stddef.h>
-#include <stdint.h>
-
 namespace fextl::pmr {
 static fextl::pmr::default_resource FEXDefaultResource;
 std::pmr::memory_resource* get_default_resource() {
diff --git a/FEXCore/Source/Utils/Allocator/HostAllocator.h b/FEXCore/Source/Utils/Allocator/HostAllocator.h
index a3e464892..f6ee50ff6 100644
--- a/FEXCore/Source/Utils/Allocator/HostAllocator.h
+++ b/FEXCore/Source/Utils/Allocator/HostAllocator.h
@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: MIT
 #pragma once
-#include <FEXCore/fextl/allocator.h>
+
 #include <FEXCore/fextl/memory.h>
 #include <FEXCore/fextl/vector.h>
-#include <FEXCore/Utils/Allocator.h>
 
 #include <cstddef>
 #include <sys/types.h>
 
+namespace FEXCore::Allocator {
+struct MemoryRegion;
+}
 namespace FEXCore::Core {
 struct InternalThreadState;
 }
diff --git a/FEXCore/include/FEXCore/Utils/Allocator.h b/FEXCore/include/FEXCore/Utils/Allocator.h
index 524288242..fedf45257 100644
--- a/FEXCore/include/FEXCore/Utils/Allocator.h
+++ b/FEXCore/include/FEXCore/Utils/Allocator.h
@@ -5,8 +5,6 @@
 #include <FEXCore/fextl/vector.h>
 
 #include <cstdint>
-#include <functional>
-#include <optional>
 #include <sys/types.h>
 
 namespace FEXCore::Core {
diff --git a/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h b/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h
index 33f91f41d..390526375 100644
--- a/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h
+++ b/FEXCore/include/FEXCore/Utils/ThreadPoolAllocator.h
@@ -1,14 +1,17 @@
 // SPDX-License-Identifier: MIT
 #pragma once
 
-#include <atomic>
 #include <FEXCore/Utils/Allocator.h>
 #include <FEXCore/Utils/LogManager.h>
 #include <FEXCore/fextl/list.h>
 
+#include <atomic>
 #include <chrono>
 #include <cstddef>
+#include <cstdint>
 #include <mutex>
+#include <optional>
+#include <type_traits>
 
 namespace FEXCore::Utils {
 /**