diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index 9830002dd7..f095f5af1a 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -2,7 +2,7 @@ SubDir HAIKU_TOP src system kernel arch x86 ;
 
 SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR) system kernel ] ;
 	# for syscall_numbers.h
-SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers input ps2_hid ;
+SubDirHdrs $(HAIKU_TOP) src add-ons kernel bus_managers ps2 ;
 SubDirHdrs $(SUBDIR) $(DOTDOT) generic ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
diff --git a/src/system/kernel/arch/x86/arch_debug_console.c b/src/system/kernel/arch/x86/arch_debug_console.c
index 40e1b681c5..7773ca2e85 100644
--- a/src/system/kernel/arch/x86/arch_debug_console.c
+++ b/src/system/kernel/arch/x86/arch_debug_console.c
@@ -9,7 +9,7 @@
  */
 
 
-#include "ps2.h"
+#include "ps2_defs.h"
 
 #include <KernelExport.h>
 #include <driver_settings.h>
@@ -136,7 +136,7 @@ arch_debug_blue_screen_getchar(void)
 		spin(200);
 		key = in8(PS2_PORT_DATA);
 
-		if (status & PS2_STATUS_MOUSE_DATA) {
+		if (status & PS2_STATUS_AUX_DATA) {
 			// we read mouse data, ignore it
 			continue;
 		}