6 files changed, 7 insertions, 10 deletions
diff --git a/src/libtools/sdl1rwops.c b/src/libtools/sdl1rwops.c
index baf6897b..b9ccbd3b 100644
--- a/src/libtools/sdl1rwops.c
+++ b/src/libtools/sdl1rwops.c
@@ -11,7 +11,6 @@
 #include "sdl1align32.h"
 #endif
 #include "box64context.h"
-#include "x64run.h"
 #include "x64emu.h"
 #include "emu/x64emu_private.h"
 #include "librarian/library_private.h"
diff --git a/src/libtools/sdl2rwops.c b/src/libtools/sdl2rwops.c
index 41d7b2e8..350ade31 100644
--- a/src/libtools/sdl2rwops.c
+++ b/src/libtools/sdl2rwops.c
@@ -11,7 +11,6 @@
 #include "sdl2align32.h"
 #endif
 #include "box64context.h"
-#include "x64run.h"
 #include "x64emu.h"
 #include "emu/x64emu_private.h"
 #include "librarian/library_private.h"
diff --git a/src/libtools/signal32.c b/src/libtools/signal32.c
index 9a47263a..b8f8b37d 100644
--- a/src/libtools/signal32.c
+++ b/src/libtools/signal32.c
@@ -25,9 +25,8 @@
 #include "emu/x64run_private.h"
 #include "signals.h"
 #include "box64stack.h"
-#include "dynarec.h"
+#include "box64cpu.h"
 #include "callback.h"
-#include "x64run.h"
 #include "elfloader.h"
 #include "threads.h"
 #include "emu/x87emu_private.h"
diff --git a/src/libtools/signals.c b/src/libtools/signals.c
index f2ed092f..5190515e 100644
--- a/src/libtools/signals.c
+++ b/src/libtools/signals.c
@@ -25,9 +25,8 @@
 #include "emu/x64run_private.h"
 #include "signals.h"
 #include "box64stack.h"
-#include "dynarec.h"
+#include "box64cpu.h"
 #include "callback.h"
-#include "x64run.h"
 #include "elfloader.h"
 #include "threads.h"
 #include "emu/x87emu_private.h"
diff --git a/src/libtools/threads.c b/src/libtools/threads.c
index 40ec2c62..2454f929 100644
--- a/src/libtools/threads.c
+++ b/src/libtools/threads.c
@@ -15,15 +15,16 @@
 #include "box64context.h"
 #include "threads.h"
 #include "emu/x64emu_private.h"
-#include "x64run.h"
 #include "x64emu.h"
 #include "box64stack.h"
+#include "box64cpu.h"
+#include "box64cpu.h"
+#include "box64cpu_util.h"
 #include "callback.h"
 #include "custommem.h"
 #include "khash.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec.h"
 #include "bridge.h"
 #include "myalign.h"
 #ifdef DYNAREC
diff --git a/src/libtools/threads32.c b/src/libtools/threads32.c
index f1db7a35..87187b24 100755
--- a/src/libtools/threads32.c
+++ b/src/libtools/threads32.c
@@ -16,15 +16,15 @@
 #include "threads.h"
 #include "emu/x64emu_private.h"
 #include "tools/bridge_private.h"
-#include "x64run.h"
 #include "x64emu.h"
 #include "box64stack.h"
+#include "box64cpu.h"
+#include "box64cpu_util.h"
 #include "callback.h"
 #include "custommem.h"
 #include "khash.h"
 #include "emu/x64run_private.h"
 #include "x64trace.h"
-#include "dynarec.h"
 #include "bridge.h"
 #ifdef DYNAREC
 #include "dynablock.h"