diff --git a/src/add-ons/kernel/debugger/disasm/x86/Jamfile b/src/add-ons/kernel/debugger/disasm/x86/Jamfile
index 545241e99c..7cd107ce0a 100644
--- a/src/add-ons/kernel/debugger/disasm/x86/Jamfile
+++ b/src/add-ons/kernel/debugger/disasm/x86/Jamfile
@@ -3,6 +3,7 @@ SubDir HAIKU_TOP src add-ons kernel debugger disasm $(TARGET_ARCH) ;
 SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) ] ;
 UseHeaders [ LibraryHeaders udis86 ] ;
 UseHeaders [ LibraryHeaders [ FDirName udis86 libudis86 ] ] ;
+UsePrivateKernelHeaders ;
 
 DEFINES += __UD_STANDALONE__ ;
 DEFINES += assert=disasm_arch_assert ;
diff --git a/src/add-ons/kernel/debugger/disasm/x86/disasm_arch.cpp b/src/add-ons/kernel/debugger/disasm/x86/disasm_arch.cpp
index 377cf3f9b9..902ce7d50c 100644
--- a/src/add-ons/kernel/debugger/disasm/x86/disasm_arch.cpp
+++ b/src/add-ons/kernel/debugger/disasm/x86/disasm_arch.cpp
@@ -6,6 +6,8 @@
 #include <OS.h>
 #include <KernelExport.h>
 
+#include <debug.h>
+
 #include "disasm_arch.h"
 #include "udis86.h"
 
@@ -20,7 +22,8 @@ static int
 read_next_byte(struct ud*)
 {
 	uint8_t buffer;
-	if (user_memcpy(&buffer, (void*)sCurrentReadAddress, 1) != B_OK) {
+	if (debug_memcpy(B_CURRENT_TEAM, &buffer, (void*)sCurrentReadAddress, 1)
+			!= B_OK) {
 		kprintf("<read fault>\n");
 		return UD_EOI;
 	}