diff --git a/headers/libs/x86emu/x86emu/x86emui.h b/headers/libs/x86emu/x86emu/x86emui.h
index 53f9fe4803..f11dc102ff 100644
--- a/headers/libs/x86emu/x86emu/x86emui.h
+++ b/headers/libs/x86emu/x86emu/x86emui.h
@@ -41,11 +41,6 @@
 #ifndef __X86EMU_X86EMUI_H
 #define __X86EMU_X86EMUI_H
 
-// Haiku workaround - don't want to compile all of the debugging code even
-// when doing a debug build, it's unnecessary unless you're trying to debug
-// x86emu itself.
-#undef DEBUG
-
 /* If we are compiling in C++ mode, we can compile some functions as
  * inline to increase performance (however the code size increases quite
  * dramatically in this case).
diff --git a/src/add-ons/kernel/generic/bios/Jamfile b/src/add-ons/kernel/generic/bios/Jamfile
index cab1336c9c..6c05c30057 100644
--- a/src/add-ons/kernel/generic/bios/Jamfile
+++ b/src/add-ons/kernel/generic/bios/Jamfile
@@ -1,5 +1,9 @@
 SubDir HAIKU_TOP src add-ons kernel generic bios ;
 
+# Don't want to compile all of the debugging code even when doing a debug build,
+# it's unnecessary unless you're trying to debug x86emu itself.
+DEBUG = 0 ;
+
 UseHeaders [ LibraryHeaders x86emu ] ;
 UsePrivateKernelHeaders ;