diff --git a/src/backend/x64/a32_emit_x64.cpp b/src/backend/x64/a32_emit_x64.cpp
index df37fdbb..1b877652 100644
--- a/src/backend/x64/a32_emit_x64.cpp
+++ b/src/backend/x64/a32_emit_x64.cpp
@@ -5,7 +5,6 @@
  */
 
 #include <unordered_map>
-#include <unordered_set>
 #include <utility>
 
 #include <fmt/format.h>
diff --git a/src/backend/x64/a32_emit_x64.h b/src/backend/x64/a32_emit_x64.h
index 8e157dcd..24fc39a4 100644
--- a/src/backend/x64/a32_emit_x64.h
+++ b/src/backend/x64/a32_emit_x64.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <array>
-#include <optional>
 
 #include <dynarmic/A32/a32.h>
 #include <dynarmic/A32/config.h>
diff --git a/src/backend/x64/a32_interface.cpp b/src/backend/x64/a32_interface.cpp
index 70dc7b59..196219f5 100644
--- a/src/backend/x64/a32_interface.cpp
+++ b/src/backend/x64/a32_interface.cpp
@@ -9,6 +9,9 @@
 #include <boost/icl/interval_set.hpp>
 #include <fmt/format.h>
 
+#include <dynarmic/A32/a32.h>
+#include <dynarmic/A32/context.h>
+
 #include "backend/x64/a32_emit_x64.h"
 #include "backend/x64/a32_jitstate.h"
 #include "backend/x64/block_of_code.h"
@@ -19,8 +22,6 @@
 #include "common/common_types.h"
 #include "common/llvm_disassemble.h"
 #include "common/scope_exit.h"
-#include "dynarmic/A32/a32.h"
-#include "dynarmic/A32/context.h"
 #include "frontend/A32/translate/translate.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/location_descriptor.h"
diff --git a/src/backend/x64/a64_emit_x64.cpp b/src/backend/x64/a64_emit_x64.cpp
index edff66b5..ad90dd64 100644
--- a/src/backend/x64/a64_emit_x64.cpp
+++ b/src/backend/x64/a64_emit_x64.cpp
@@ -21,7 +21,6 @@
 #include "common/bit_util.h"
 #include "common/common_types.h"
 #include "common/scope_exit.h"
-#include "common/variant_util.h"
 #include "frontend/A64/location_descriptor.h"
 #include "frontend/A64/types.h"
 #include "frontend/ir/basic_block.h"
diff --git a/src/backend/x64/block_of_code.cpp b/src/backend/x64/block_of_code.cpp
index fc59d464..55c0f204 100644
--- a/src/backend/x64/block_of_code.cpp
+++ b/src/backend/x64/block_of_code.cpp
@@ -6,7 +6,6 @@
 
 #include <array>
 #include <cstring>
-#include <limits>
 
 #include <xbyak.h>
 
diff --git a/src/backend/x64/block_range_information.h b/src/backend/x64/block_range_information.h
index 5e27423f..25d88785 100644
--- a/src/backend/x64/block_range_information.h
+++ b/src/backend/x64/block_range_information.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <set>
 #include <unordered_set>
 
 #include <boost/icl/interval_map.hpp>
diff --git a/src/backend/x64/constant_pool.h b/src/backend/x64/constant_pool.h
index 95372692..2bb29c0f 100644
--- a/src/backend/x64/constant_pool.h
+++ b/src/backend/x64/constant_pool.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <map>
+#include <tuple>
 
 #include <xbyak.h>
 
diff --git a/src/backend/x64/devirtualize.h b/src/backend/x64/devirtualize.h
index 8be6197b..11d9c46a 100644
--- a/src/backend/x64/devirtualize.h
+++ b/src/backend/x64/devirtualize.h
@@ -7,10 +7,9 @@
 #pragma once
 
 #include <cstring>
-#include <memory>
+#include <utility>
 
 #include "backend/x64/callback.h"
-#include "common/assert.h"
 #include "common/cast_util.h"
 #include "common/common_types.h"
 #include "common/mp/function_info.h"
diff --git a/src/backend/x64/emit_x64.h b/src/backend/x64/emit_x64.h
index eb52418c..471fdd85 100644
--- a/src/backend/x64/emit_x64.h
+++ b/src/backend/x64/emit_x64.h
@@ -19,7 +19,6 @@
 #include "backend/x64/reg_alloc.h"
 #include "common/bit_util.h"
 #include "common/fp/fpcr.h"
-#include "common/fp/rounding_mode.h"
 #include "frontend/ir/location_descriptor.h"
 #include "frontend/ir/terminal.h"
 
diff --git a/src/backend/x64/emit_x64_aes.cpp b/src/backend/x64/emit_x64_aes.cpp
index b13f0791..ee611de9 100644
--- a/src/backend/x64/emit_x64_aes.cpp
+++ b/src/backend/x64/emit_x64_aes.cpp
@@ -10,7 +10,6 @@
 #include "common/common_types.h"
 #include "common/crypto/aes.h"
 #include "frontend/ir/microinstruction.h"
-#include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend/x64/emit_x64_crc32.cpp b/src/backend/x64/emit_x64_crc32.cpp
index 91c0239d..1e30359b 100644
--- a/src/backend/x64/emit_x64_crc32.cpp
+++ b/src/backend/x64/emit_x64_crc32.cpp
@@ -9,10 +9,8 @@
 
 #include "backend/x64/block_of_code.h"
 #include "backend/x64/emit_x64.h"
-#include "common/common_types.h"
 #include "common/crypto/crc32.h"
 #include "frontend/ir/microinstruction.h"
-#include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend/x64/emit_x64_floating_point.cpp b/src/backend/x64/emit_x64_floating_point.cpp
index 9496f9a3..7062cf49 100644
--- a/src/backend/x64/emit_x64_floating_point.cpp
+++ b/src/backend/x64/emit_x64_floating_point.cpp
@@ -18,7 +18,6 @@
 #include "common/fp/info.h"
 #include "common/fp/op.h"
 #include "common/fp/rounding_mode.h"
-#include "common/fp/util.h"
 #include "common/mp/cartesian_product.h"
 #include "common/mp/integer.h"
 #include "common/mp/list.h"
@@ -28,7 +27,6 @@
 #include "common/mp/vllift.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
-#include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend/x64/emit_x64_packed.cpp b/src/backend/x64/emit_x64_packed.cpp
index 74ff1ef5..32847496 100644
--- a/src/backend/x64/emit_x64_packed.cpp
+++ b/src/backend/x64/emit_x64_packed.cpp
@@ -6,9 +6,6 @@
 
 #include "backend/x64/block_of_code.h"
 #include "backend/x64/emit_x64.h"
-#include "common/assert.h"
-#include "common/common_types.h"
-#include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
 #include "frontend/ir/opcodes.h"
 
diff --git a/src/backend/x64/emit_x64_sm4.cpp b/src/backend/x64/emit_x64_sm4.cpp
index ada988b4..e5ed798d 100644
--- a/src/backend/x64/emit_x64_sm4.cpp
+++ b/src/backend/x64/emit_x64_sm4.cpp
@@ -6,10 +6,8 @@
 
 #include "backend/x64/block_of_code.h"
 #include "backend/x64/emit_x64.h"
-#include "common/common_types.h"
 #include "common/crypto/sm4.h"
 #include "frontend/ir/microinstruction.h"
-#include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendX64 {
 
diff --git a/src/backend/x64/emit_x64_vector.cpp b/src/backend/x64/emit_x64_vector.cpp
index c52635ed..4eceefbd 100644
--- a/src/backend/x64/emit_x64_vector.cpp
+++ b/src/backend/x64/emit_x64_vector.cpp
@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <bitset>
 #include <cstdlib>
-#include <functional>
 #include <type_traits>
 
 #include "backend/x64/abi.h"
diff --git a/src/backend/x64/emit_x64_vector_floating_point.cpp b/src/backend/x64/emit_x64_vector_floating_point.cpp
index 6408a5dd..41489bc0 100644
--- a/src/backend/x64/emit_x64_vector_floating_point.cpp
+++ b/src/backend/x64/emit_x64_vector_floating_point.cpp
@@ -14,7 +14,6 @@
 #include "backend/x64/block_of_code.h"
 #include "backend/x64/emit_x64.h"
 #include "common/assert.h"
-#include "common/bit_util.h"
 #include "common/fp/fpcr.h"
 #include "common/fp/info.h"
 #include "common/fp/op.h"
diff --git a/src/backend/x64/jitstate_info.h b/src/backend/x64/jitstate_info.h
index 7725bf85..95f0d290 100644
--- a/src/backend/x64/jitstate_info.h
+++ b/src/backend/x64/jitstate_info.h
@@ -8,8 +8,6 @@
 
 #include <cstddef>
 
-#include "common/common_types.h"
-
 namespace Dynarmic::BackendX64 {
 
 struct JitStateInfo {
diff --git a/src/backend/x64/perf_map.h b/src/backend/x64/perf_map.h
index dbdd499d..9caaf5e3 100644
--- a/src/backend/x64/perf_map.h
+++ b/src/backend/x64/perf_map.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <cstddef>
-#include <string>
 #include <string_view>
 
 #include "common/cast_util.h"
diff --git a/src/common/fp/fpsr.h b/src/common/fp/fpsr.h
index a2064e14..c610ab82 100644
--- a/src/common/fp/fpsr.h
+++ b/src/common/fp/fpsr.h
@@ -6,8 +6,6 @@
 
 #pragma once
 
-#include <optional>
-
 #include "common/bit_util.h"
 #include "common/common_types.h"
 
diff --git a/src/common/fp/op/FPConvert.cpp b/src/common/fp/op/FPConvert.cpp
index 64e88075..94413b34 100644
--- a/src/common/fp/op/FPConvert.cpp
+++ b/src/common/fp/op/FPConvert.cpp
@@ -4,15 +4,12 @@
  * General Public License version 2 or any later version.
  */
 
-#include <tuple>
-
 #include "common/common_types.h"
 #include "common/fp/fpcr.h"
 #include "common/fp/fpsr.h"
 #include "common/fp/info.h"
-#include "common/fp/op/FPRecipEstimate.h"
+#include "common/fp/op/FPConvert.h"
 #include "common/fp/process_exception.h"
-#include "common/fp/process_nan.h"
 #include "common/fp/unpacked.h"
 
 namespace Dynarmic::FP {
diff --git a/src/common/fp/op/FPRecipExponent.cpp b/src/common/fp/op/FPRecipExponent.cpp
index e6f04ae6..ad659bb8 100644
--- a/src/common/fp/op/FPRecipExponent.cpp
+++ b/src/common/fp/op/FPRecipExponent.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <tuple>
-
 #include "common/common_types.h"
 #include "common/bit_util.h"
 #include "common/fp/fpcr.h"
diff --git a/src/common/fp/util.h b/src/common/fp/util.h
index 3d682c22..bfed6712 100644
--- a/src/common/fp/util.h
+++ b/src/common/fp/util.h
@@ -8,7 +8,6 @@
 
 #include <optional>
 
-#include "common/common_types.h"
 #include "common/fp/fpcr.h"
 #include "common/fp/info.h"
 
diff --git a/src/common/u128.cpp b/src/common/u128.cpp
index 4837c87f..12dd6791 100644
--- a/src/common/u128.cpp
+++ b/src/common/u128.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <array>
-
 #include "common/common_types.h"
 #include "common/u128.h"
 
diff --git a/src/common/u128.h b/src/common/u128.h
index 1aa8a76f..74959aa9 100644
--- a/src/common/u128.h
+++ b/src/common/u128.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <cstring>
 #include <tuple>
 #include <type_traits>
 
diff --git a/src/frontend/A32/translate/impl/translate_arm.h b/src/frontend/A32/translate/impl/translate_arm.h
index 53427173..fc0e4f9d 100644
--- a/src/frontend/A32/translate/impl/translate_arm.h
+++ b/src/frontend/A32/translate/impl/translate_arm.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "common/assert.h"
 #include "common/bit_util.h"
 #include "frontend/imm.h"
 #include "frontend/A32/ir_emitter.h"
diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h
index e89123f6..db053d3c 100644
--- a/src/frontend/A32/translate/impl/translate_thumb.h
+++ b/src/frontend/A32/translate/impl/translate_thumb.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "common/bit_util.h"
+#include "common/assert.h"
 #include "frontend/imm.h"
 #include "frontend/A32/ir_emitter.h"
 #include "frontend/A32/location_descriptor.h"
diff --git a/src/frontend/A32/translate/translate_thumb.cpp b/src/frontend/A32/translate/translate_thumb.cpp
index deeb5f76..4e121277 100644
--- a/src/frontend/A32/translate/translate_thumb.cpp
+++ b/src/frontend/A32/translate/translate_thumb.cpp
@@ -17,7 +17,6 @@
 #include "frontend/A32/location_descriptor.h"
 #include "frontend/A32/translate/impl/translate_thumb.h"
 #include "frontend/A32/translate/translate.h"
-#include "frontend/A32/types.h"
 
 namespace Dynarmic::A32 {
 namespace {
diff --git a/src/frontend/A64/decoder/a64.h b/src/frontend/A64/decoder/a64.h
index 2f17f8ee..4ed0c98f 100644
--- a/src/frontend/A64/decoder/a64.h
+++ b/src/frontend/A64/decoder/a64.h
@@ -10,6 +10,7 @@
 #include <functional>
 #include <optional>
 #include <set>
+#include <string>
 #include <vector>
 
 #include "common/bit_util.h"
diff --git a/src/frontend/A64/ir_emitter.h b/src/frontend/A64/ir_emitter.h
index ac56448d..00d50d5d 100644
--- a/src/frontend/A64/ir_emitter.h
+++ b/src/frontend/A64/ir_emitter.h
@@ -6,7 +6,6 @@
 
 #pragma once
 
-#include <initializer_list>
 #include <optional>
 
 #include <dynarmic/A64/config.h>
diff --git a/src/frontend/A64/translate/impl/floating_point_compare.cpp b/src/frontend/A64/translate/impl/floating_point_compare.cpp
index 888d681b..62578b43 100644
--- a/src/frontend/A64/translate/impl/floating_point_compare.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_compare.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp b/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp
index 0e81a7b0..c4b76a96 100644
--- a/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_conditional_compare.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp b/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp
index 0db56510..3e677faf 100644
--- a/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_conditional_select.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp b/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp
index 132db71a..d771c2f1 100644
--- a/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_conversion_fixed_point.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp b/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp
index be307576..22d4e314 100644
--- a/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_conversion_integer.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "common/fp/rounding_mode.h"
 #include "frontend/A64/translate/impl/impl.h"
 
diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp b/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp
index a2556966..8c9567c0 100644
--- a/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_data_processing_one_register.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp b/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp
index db23bf10..70db9503 100644
--- a/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_data_processing_three_register.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp b/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp
index bf68a009..8874914e 100644
--- a/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp
+++ b/src/frontend/A64/translate/impl/floating_point_data_processing_two_register.cpp
@@ -4,8 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <optional>
-
 #include "frontend/A64/translate/impl/impl.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp b/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp
index 2d1ba2b5..fa77cf32 100644
--- a/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp
+++ b/src/frontend/A64/translate/impl/load_store_multiple_structures.cpp
@@ -4,7 +4,6 @@
  * General Public License version 2 or any later version.
  */
 
-#include <tuple>
 #include <optional>
 
 #include "frontend/A64/translate/impl/impl.h"
diff --git a/src/frontend/A64/types.cpp b/src/frontend/A64/types.cpp
index bfffc42a..518effe6 100644
--- a/src/frontend/A64/types.cpp
+++ b/src/frontend/A64/types.cpp
@@ -9,7 +9,6 @@
 
 #include <fmt/format.h>
 
-#include "common/bit_util.h"
 #include "frontend/A64/types.h"
 
 namespace Dynarmic::A64 {
diff --git a/src/frontend/A64/types.h b/src/frontend/A64/types.h
index 8cf23929..fa7c2bbc 100644
--- a/src/frontend/A64/types.h
+++ b/src/frontend/A64/types.h
@@ -8,7 +8,6 @@
 
 #include <iosfwd>
 #include <string>
-#include <utility>
 
 #include "common/assert.h"
 #include "common/common_types.h"
diff --git a/src/frontend/ir/type.cpp b/src/frontend/ir/type.cpp
index 720f7d19..a36da196 100644
--- a/src/frontend/ir/type.cpp
+++ b/src/frontend/ir/type.cpp
@@ -8,9 +8,6 @@
 #include <ostream>
 #include <string>
 
-#include <fmt/format.h>
-#include <fmt/ostream.h>
-
 #include "frontend/ir/type.h"
 
 namespace Dynarmic::IR {
diff --git a/src/ir_opt/a64_callback_config_pass.cpp b/src/ir_opt/a64_callback_config_pass.cpp
index 247a3326..c73865ba 100644
--- a/src/ir_opt/a64_callback_config_pass.cpp
+++ b/src/ir_opt/a64_callback_config_pass.cpp
@@ -4,9 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include <array>
-
 #include <dynarmic/A64/config.h>
+
 #include "frontend/A64/ir_emitter.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/ir_opt/a64_get_set_elimination_pass.cpp b/src/ir_opt/a64_get_set_elimination_pass.cpp
index bf0db2f4..7efec1e7 100644
--- a/src/ir_opt/a64_get_set_elimination_pass.cpp
+++ b/src/ir_opt/a64_get_set_elimination_pass.cpp
@@ -6,11 +6,9 @@
 
 #include <array>
 
-#include "common/assert.h"
 #include "common/common_types.h"
 #include "frontend/A64/types.h"
 #include "frontend/ir/basic_block.h"
-#include "frontend/ir/ir_emitter.h"
 #include "frontend/ir/opcodes.h"
 #include "frontend/ir/value.h"
 #include "ir_opt/passes.h"
diff --git a/src/ir_opt/a64_merge_interpret_blocks.cpp b/src/ir_opt/a64_merge_interpret_blocks.cpp
index 98050134..27022a6e 100644
--- a/src/ir_opt/a64_merge_interpret_blocks.cpp
+++ b/src/ir_opt/a64_merge_interpret_blocks.cpp
@@ -4,12 +4,9 @@
  * General Public License version 2 or any later version.
  */
 
-#include <array>
-
 #include <boost/variant/get.hpp>
 #include <dynarmic/A64/config.h>
 
-#include "common/assert.h"
 #include "common/common_types.h"
 #include "frontend/A64/location_descriptor.h"
 #include "frontend/A64/translate/translate.h"
diff --git a/src/ir_opt/constant_propagation_pass.cpp b/src/ir_opt/constant_propagation_pass.cpp
index a86a3a16..f3a8b60d 100644
--- a/src/ir_opt/constant_propagation_pass.cpp
+++ b/src/ir_opt/constant_propagation_pass.cpp
@@ -4,9 +4,8 @@
  * General Public License version 2 or any later version.
  */
 
-#include <dynarmic/A32/config.h>
-
 #include "common/bit_util.h"
+#include "common/common_types.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/opcodes.h"
 #include "ir_opt/passes.h"
diff --git a/src/ir_opt/passes.h b/src/ir_opt/passes.h
index 3e5062bb..835f3aad 100644
--- a/src/ir_opt/passes.h
+++ b/src/ir_opt/passes.h
@@ -6,8 +6,14 @@
 
 #pragma once
 
-#include <dynarmic/A32/config.h>
-#include <dynarmic/A64/config.h>
+namespace Dynarmic::A32 {
+struct UserCallbacks;
+}
+
+namespace Dynarmic::A64 {
+struct UserCallbacks;
+struct UserConfig;
+}
 
 namespace Dynarmic::IR {
 class Block;