diff --git a/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile b/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile
index 5297de1ad7..9c6260be86 100644
--- a/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile
+++ b/src/add-ons/kernel/drivers/input/ps2_hid/Jamfile
@@ -4,14 +4,20 @@ UsePrivateHeaders input ;
 UsePrivateHeaders kernel ;
 
 if ! $(HAIKU_COMPATIBLE) {
-        SubDirCcFlags -DCOMPILE_FOR_R5 ;
-}
+SubDirCcFlags -DCOMPILE_FOR_R5 ;
 
 R5KernelAddon ps2_hid : kernel drivers bin :
 	common.c
 	keyboard.c
 	mouse.c
 ;
+} else {
+KernelAddon ps2_hid : kernel drivers bin :
+	common.c
+	keyboard.c
+	mouse.c
+;
+}
 
 # Link to kernel/drivers/dev/input/
 {
diff --git a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
index a2f552ed03..7b8f4acb15 100644
--- a/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
+++ b/src/add-ons/kernel/drivers/input/ps2_hid/keyboard.c
@@ -13,7 +13,11 @@
 // although the kb_mouse replacement driver never locks.
 
 #include "common.h"
+#ifdef COMPILE_FOR_R5
 #include "cbuf_adapter.h"
+#else
+#include "cbuf.h"
+#endif
 
 #include <string.h>
 //#include <lock.h>