diff --git a/External/FEXCore/Source/Interface/Config/Config.cpp b/External/FEXCore/Source/Interface/Config/Config.cpp
index d8738fddf..167273c50 100644
--- a/External/FEXCore/Source/Interface/Config/Config.cpp
+++ b/External/FEXCore/Source/Interface/Config/Config.cpp
@@ -18,8 +18,6 @@
 #include <array>
 #include <assert.h>
 #include <cstdlib>
-#include <filesystem>
-#include <fstream>
 #include <functional>
 #include <linux/limits.h>
 #include <optional>
diff --git a/External/FEXCore/Source/Interface/Core/Core.cpp b/External/FEXCore/Source/Interface/Core/Core.cpp
index b5a3df6fd..8b312da97 100644
--- a/External/FEXCore/Source/Interface/Core/Core.cpp
+++ b/External/FEXCore/Source/Interface/Core/Core.cpp
@@ -59,9 +59,7 @@ $end_info$
 #include <chrono>
 #include <condition_variable>
 #include <fcntl.h>
-#include <filesystem>
 #include <functional>
-#include <fstream>
 #include <mutex>
 #include <queue>
 #include <shared_mutex>
diff --git a/External/FEXCore/Source/Interface/Core/GdbServer.cpp b/External/FEXCore/Source/Interface/Core/GdbServer.cpp
index 11ff2f80c..782389a21 100644
--- a/External/FEXCore/Source/Interface/Core/GdbServer.cpp
+++ b/External/FEXCore/Source/Interface/Core/GdbServer.cpp
@@ -39,7 +39,6 @@ $end_info$
 #include <elf.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <fstream>
 #include <fmt/format.h>
 #include <netdb.h>
 #include <signal.h>
diff --git a/External/FEXCore/Source/Interface/IR/AOTIR.cpp b/External/FEXCore/Source/Interface/IR/AOTIR.cpp
index 75938073f..a537501d9 100644
--- a/External/FEXCore/Source/Interface/IR/AOTIR.cpp
+++ b/External/FEXCore/Source/Interface/IR/AOTIR.cpp
@@ -14,8 +14,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <filesystem>
-#include <fstream>
 #include <mutex>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/External/FEXCore/Source/Interface/IR/AOTIR.h b/External/FEXCore/Source/Interface/IR/AOTIR.h
index 92dc4c9ae..4ab171437 100644
--- a/External/FEXCore/Source/Interface/IR/AOTIR.h
+++ b/External/FEXCore/Source/Interface/IR/AOTIR.h
@@ -10,7 +10,6 @@
 #include <atomic>
 #include <cstdint>
 #include <functional>
-#include <fstream>
 #include <memory>
 #include <shared_mutex>
 #include <FEXCore/HLE/SourcecodeResolver.h>
diff --git a/External/FEXCore/Source/Utils/AllocatorOverride.cpp b/External/FEXCore/Source/Utils/AllocatorOverride.cpp
index 4c7f4c190..aecfb2044 100644
--- a/External/FEXCore/Source/Utils/AllocatorOverride.cpp
+++ b/External/FEXCore/Source/Utils/AllocatorOverride.cpp
@@ -6,7 +6,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <fstream>
 #include <sstream>
 #include <unistd.h>
 
diff --git a/External/FEXCore/Source/Utils/Telemetry.cpp b/External/FEXCore/Source/Utils/Telemetry.cpp
index 015744052..46b628374 100644
--- a/External/FEXCore/Source/Utils/Telemetry.cpp
+++ b/External/FEXCore/Source/Utils/Telemetry.cpp
@@ -6,8 +6,6 @@
 #include <FEXHeaderUtils/Filesystem.h>
 
 #include <array>
-#include <filesystem>
-#include <fstream>
 #include <stddef.h>
 #include <string_view>
 #include <system_error>
diff --git a/External/FEXCore/include/FEXCore/Utils/FileLoading.h b/External/FEXCore/include/FEXCore/Utils/FileLoading.h
index e80e1e7e2..7e1bc371f 100644
--- a/External/FEXCore/include/FEXCore/Utils/FileLoading.h
+++ b/External/FEXCore/include/FEXCore/Utils/FileLoading.h
@@ -3,8 +3,6 @@
 #include <FEXCore/fextl/vector.h>
 #include <FEXCore/Utils/CompilerDefs.h>
 
-#include <filesystem>
-#include <fstream>
 #include <span>
 
 namespace FEXCore::FileLoading {
diff --git a/Source/Common/FEXServerClient.cpp b/Source/Common/FEXServerClient.cpp
index 61441e9f5..b7e8592fe 100644
--- a/Source/Common/FEXServerClient.cpp
+++ b/Source/Common/FEXServerClient.cpp
@@ -10,7 +10,6 @@
 #include <FEXHeaderUtils/Filesystem.h>
 
 #include <fcntl.h>
-#include <filesystem>
 #include <linux/limits.h>
 #include <unistd.h>
 #include <sys/poll.h>
diff --git a/Source/Linux/Utils/ELFContainer.cpp b/Source/Linux/Utils/ELFContainer.cpp
index 7eb6c68bb..61a496655 100644
--- a/Source/Linux/Utils/ELFContainer.cpp
+++ b/Source/Linux/Utils/ELFContainer.cpp
@@ -15,8 +15,6 @@ $end_info$
 #include <cstring>
 #include <elf.h>
 #include <fcntl.h>
-#include <filesystem>
-#include <fstream>
 #include <memory>
 #include <system_error>
 #include <sys/stat.h>
diff --git a/Source/Linux/Utils/ELFParser.h b/Source/Linux/Utils/ELFParser.h
index acf75626f..d02a97b3f 100644
--- a/Source/Linux/Utils/ELFParser.h
+++ b/Source/Linux/Utils/ELFParser.h
@@ -4,7 +4,6 @@
 #include <FEXCore/fextl/vector.h>
 
 #include <elf.h>
-#include <fstream>
 #include <fcntl.h>
 #include <unistd.h>
 
diff --git a/Source/Tests/ELFCodeLoader.h b/Source/Tests/ELFCodeLoader.h
index 686d07264..36b1ff269 100644
--- a/Source/Tests/ELFCodeLoader.h
+++ b/Source/Tests/ELFCodeLoader.h
@@ -13,8 +13,6 @@
 #include <bitset>
 #include <cassert>
 #include <cstring>
-#include <filesystem>
-#include <fstream>
 #include <random>
 
 #include <FEXCore/Core/CodeLoader.h>
diff --git a/Source/Tests/HarnessHelpers.h b/Source/Tests/HarnessHelpers.h
index c6d85bc81..0e44e8abe 100644
--- a/Source/Tests/HarnessHelpers.h
+++ b/Source/Tests/HarnessHelpers.h
@@ -10,7 +10,6 @@
 #include <cassert>
 #include <cstring>
 #include <fcntl.h>
-#include <fstream>
 #include <sys/mman.h>
 #include <sys/user.h>
 
diff --git a/Source/Tests/IRLoader.cpp b/Source/Tests/IRLoader.cpp
index 7947426ec..5874eabed 100644
--- a/Source/Tests/IRLoader.cpp
+++ b/Source/Tests/IRLoader.cpp
@@ -29,7 +29,6 @@ $end_info$
 #include <stdio.h>
 #include <sys/mman.h>
 #include <vector>
-#include <fstream>
 
 #include "HarnessHelpers.h"
 
diff --git a/Source/Tests/LinuxSyscalls/x64/Memory.cpp b/Source/Tests/LinuxSyscalls/x64/Memory.cpp
index 44553c51a..06e3b4677 100644
--- a/Source/Tests/LinuxSyscalls/x64/Memory.cpp
+++ b/Source/Tests/LinuxSyscalls/x64/Memory.cpp
@@ -19,8 +19,6 @@ $end_info$
 #include <FEXCore/Core/Context.h>
 #include <FEXCore/Config/Config.h>
 #include <FEXCore/Utils/Allocator.h>
-#include <fstream>
-#include <filesystem>
 
 namespace FEX::HLE::x64 {