diff --git a/src/dynarmic/backend/arm64/a64_address_space.cpp b/src/dynarmic/backend/arm64/a64_address_space.cpp
index af439c5a..06966695 100644
--- a/src/dynarmic/backend/arm64/a64_address_space.cpp
+++ b/src/dynarmic/backend/arm64/a64_address_space.cpp
@@ -11,7 +11,6 @@
 #include "dynarmic/backend/arm64/emit_arm64.h"
 #include "dynarmic/backend/arm64/stack_layout.h"
 #include "dynarmic/common/cast_util.h"
-#include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/frontend/A64/a64_location_descriptor.h"
 #include "dynarmic/frontend/A64/translate/a64_translate.h"
 #include "dynarmic/interface/A64/config.h"
diff --git a/src/dynarmic/backend/arm64/address_space.cpp b/src/dynarmic/backend/arm64/address_space.cpp
index 766203a1..d42380cb 100644
--- a/src/dynarmic/backend/arm64/address_space.cpp
+++ b/src/dynarmic/backend/arm64/address_space.cpp
@@ -12,7 +12,6 @@
 #include "dynarmic/common/cast_util.h"
 #include "dynarmic/common/fp/fpcr.h"
 #include "dynarmic/interface/exclusive_monitor.h"
-#include "dynarmic/ir/opt/passes.h"
 
 namespace Dynarmic::Backend::Arm64 {
 
diff --git a/src/dynarmic/backend/arm64/emit_arm64.cpp b/src/dynarmic/backend/arm64/emit_arm64.cpp
index 39e0f73a..e5ad165c 100644
--- a/src/dynarmic/backend/arm64/emit_arm64.cpp
+++ b/src/dynarmic/backend/arm64/emit_arm64.cpp
@@ -5,7 +5,6 @@
 
 #include "dynarmic/backend/arm64/emit_arm64.h"
 
-#include <fmt/ostream.h>
 #include <oaknut/oaknut.hpp>
 
 #include "dynarmic/backend/arm64/abi.h"
diff --git a/src/dynarmic/backend/arm64/emit_arm64_a32.cpp b/src/dynarmic/backend/arm64/emit_arm64_a32.cpp
index 45bf9315..62eb9c1a 100644
--- a/src/dynarmic/backend/arm64/emit_arm64_a32.cpp
+++ b/src/dynarmic/backend/arm64/emit_arm64_a32.cpp
@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: 0BSD
  */
 
-#include <fmt/ostream.h>
 #include <mcl/bit/bit_field.hpp>
 #include <oaknut/oaknut.hpp>
 
diff --git a/src/dynarmic/backend/arm64/emit_arm64_memory.cpp b/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
index 4a4da82b..544676f2 100644
--- a/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
+++ b/src/dynarmic/backend/arm64/emit_arm64_memory.cpp
@@ -17,7 +17,6 @@
 #include "dynarmic/backend/arm64/fastmem.h"
 #include "dynarmic/backend/arm64/fpsr_manager.h"
 #include "dynarmic/backend/arm64/reg_alloc.h"
-#include "dynarmic/interface/halt_reason.h"
 #include "dynarmic/ir/acc_type.h"
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/microinstruction.h"
diff --git a/src/dynarmic/common/fp/fused.cpp b/src/dynarmic/common/fp/fused.cpp
index 883de651..5c32b05e 100644
--- a/src/dynarmic/common/fp/fused.cpp
+++ b/src/dynarmic/common/fp/fused.cpp
@@ -7,7 +7,6 @@
 
 #include <mcl/bit/bit_count.hpp>
 
-#include "dynarmic/common/fp/mantissa_util.h"
 #include "dynarmic/common/fp/unpacked.h"
 #include "dynarmic/common/u128.h"
 
diff --git a/src/dynarmic/common/u128.cpp b/src/dynarmic/common/u128.cpp
index a19269e8..dd78ac97 100644
--- a/src/dynarmic/common/u128.cpp
+++ b/src/dynarmic/common/u128.cpp
@@ -5,7 +5,6 @@
 
 #include "dynarmic/common/u128.h"
 
-#include <mcl/bitsizeof.hpp>
 #include <mcl/stdint.hpp>
 
 namespace Dynarmic {
diff --git a/src/dynarmic/ir/basic_block.cpp b/src/dynarmic/ir/basic_block.cpp
index da7f837b..a466c2f6 100644
--- a/src/dynarmic/ir/basic_block.cpp
+++ b/src/dynarmic/ir/basic_block.cpp
@@ -11,7 +11,6 @@
 #include <string>
 
 #include <fmt/format.h>
-#include <fmt/ostream.h>
 #include <mcl/assert.hpp>
 
 #include "dynarmic/common/memory_pool.h"
diff --git a/src/dynarmic/ir/opcodes.cpp b/src/dynarmic/ir/opcodes.cpp
index e80915f9..88a52d4f 100644
--- a/src/dynarmic/ir/opcodes.cpp
+++ b/src/dynarmic/ir/opcodes.cpp
@@ -6,13 +6,8 @@
 #include "dynarmic/ir/opcodes.h"
 
 #include <array>
-#include <ostream>
-#include <string>
 #include <vector>
 
-#include <fmt/format.h>
-#include <fmt/ostream.h>
-
 #include "dynarmic/ir/type.h"
 
 namespace Dynarmic::IR {
diff --git a/src/dynarmic/ir/opt/identity_removal_pass.cpp b/src/dynarmic/ir/opt/identity_removal_pass.cpp
index 57d198b7..e87fcc33 100644
--- a/src/dynarmic/ir/opt/identity_removal_pass.cpp
+++ b/src/dynarmic/ir/opt/identity_removal_pass.cpp
@@ -5,8 +5,6 @@
 
 #include <vector>
 
-#include <mcl/iterator/reverse.hpp>
-
 #include "dynarmic/ir/basic_block.h"
 #include "dynarmic/ir/opcodes.h"
 #include "dynarmic/ir/opt/passes.h"