diff --git a/Makefile b/Makefile
index 512036e..25de022 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ dump2rom: src/tools/dump2rom.o
 checkrom: src/tools/checkrom.o src/romio.o
 	$(CC) $(CFLAGS) $(LIBS) $^ -o $@
 
-x48ng: src/main.o src/hp48emu_actions.o src/debugger.o src/hp48_device.o src/disasm.o src/hp48_emulate.o src/errors.o src/hp48_init.o src/hp48emu_memory.o src/hp48emu_register.o src/resources.o src/romio.o src/debugger_rpl.o src/hp48_serial.o src/timer.o src/x48.o src/resources.o
+x48ng: src/main.o src/hp48emu_actions.o src/debugger.o src/hp48_device.o src/debugger_disasm.o src/hp48_emulate.o src/errors.o src/hp48_init.o src/hp48emu_memory.o src/hp48emu_register.o src/resources.o src/romio.o src/debugger_rpl.o src/hp48_serial.o src/timer.o src/x48.o src/resources.o
 	$(CC) $(CFLAGS) $(LIBS) $^ -o $@
 
 # Cleaning
diff --git a/src/debugger.c b/src/debugger.c
index a6e8a05..f137dd2 100644
--- a/src/debugger.c
+++ b/src/debugger.c
@@ -9,7 +9,7 @@
 #include <X11/Xlib.h>
 
 #include "debugger.h"
-#include "disasm.h"
+#include "debugger_disasm.h"
 #include "hp48.h"
 #include "resources.h"
 #include "romio.h"
diff --git a/src/disasm.c b/src/debugger_disasm.c
similarity index 99%
rename from src/disasm.c
rename to src/debugger_disasm.c
index 8602d24..d802312 100644
--- a/src/disasm.c
+++ b/src/debugger_disasm.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "disasm.h"
+#include "debugger_disasm.h"
 #include "hp48.h"
 
 #define TAB_SKIP 8
diff --git a/src/disasm.h b/src/debugger_disasm.h
similarity index 100%
rename from src/disasm.h
rename to src/debugger_disasm.h
diff --git a/src/debugger_rpl.c b/src/debugger_rpl.c
index 6621cd3..1130efb 100644
--- a/src/debugger_rpl.c
+++ b/src/debugger_rpl.c
@@ -4,7 +4,7 @@
 #include <unistd.h>
 
 #include "debugger.h"
-#include "disasm.h"
+#include "debugger_disasm.h"
 #include "hp48.h"
 #include "hp48emu.h"
 #include "romio.h"
diff --git a/src/resources.c b/src/resources.c
index 90a7171..4f28a7e 100644
--- a/src/resources.c
+++ b/src/resources.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 
 #include "resources.h"
-#include "disasm.h"
+#include "debugger_disasm.h"             /* `disassembler_mode` & `CLASS_MNEMONICS` */
 #include "errors.h"
 
 int verbose;