Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 7aa9430447f0291e544450fa9f31d4ba06a73c7f)
+++ boot/arch/amd64/Makefile.inc	(revision f3365b67084d5db2c6cecdb7058c3a0a0c949b40)
@@ -39,6 +39,6 @@
 	audio/sb16 \
 	char/i8042 \
-	char/ps2mouse \
-	char/xtkbd
+	hid/ps2mouse \
+	hid/xtkbd
 
 RD_DRVS_NON_ESSENTIAL += \
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision 7aa9430447f0291e544450fa9f31d4ba06a73c7f)
+++ boot/arch/arm32/Makefile.inc	(revision f3365b67084d5db2c6cecdb7058c3a0a0c949b40)
@@ -74,6 +74,6 @@
 	RD_DRVS_ESSENTIAL += \
 		char/pl050 \
-		char/atkbd \
-		char/ps2mouse \
+		hid/atkbd \
+		hid/ps2mouse \
 		intctl/icp-ic \
 		platform/icp
Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision 7aa9430447f0291e544450fa9f31d4ba06a73c7f)
+++ boot/arch/ia64/Makefile.inc	(revision f3365b67084d5db2c6cecdb7058c3a0a0c949b40)
@@ -72,5 +72,5 @@
 	bus/isa \
 	char/i8042 \
-	char/xtkbd
+	hid/xtkbd
 
 RD_DRVS_NON_ESSENTIAL += \
Index: boot/arch/mips32/Makefile.inc
===================================================================
--- boot/arch/mips32/Makefile.inc	(revision 7aa9430447f0291e544450fa9f31d4ba06a73c7f)
+++ boot/arch/mips32/Makefile.inc	(revision f3365b67084d5db2c6cecdb7058c3a0a0c949b40)
@@ -58,6 +58,6 @@
 		bus/isa \
 		char/i8042 \
-		char/ps2mouse \
-		char/xtkbd
+		hid/ps2mouse \
+		hid/xtkbd
 
 	RD_DRV_CFG += \