Index: boot/arch/amd64/Makefile.inc
===================================================================
--- boot/arch/amd64/Makefile.inc	(revision 0c334805ad74c3439442559452102d19c29db11d)
+++ boot/arch/amd64/Makefile.inc	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
@@ -51,8 +51,8 @@
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
-	bus/usb/usbhid \
-	bus/usb/usbmast \
 	bus/usb/usbmid \
-	bus/usb/vhc
+	bus/usb/vhc \
+	block/usbmast \
+	hid/usbhid
 
 RD_DRV_CFG += \
Index: boot/arch/arm32/Makefile.inc
===================================================================
--- boot/arch/arm32/Makefile.inc	(revision 0c334805ad74c3439442559452102d19c29db11d)
+++ boot/arch/arm32/Makefile.inc	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
@@ -85,7 +85,7 @@
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
-	bus/usb/usbhid \
-	bus/usb/usbmast \
-	bus/usb/usbmid
+	bus/usb/usbmid \
+	block/usbmast \
+	hid/usbhid
 
 SOURCES = \
Index: boot/arch/ia64/Makefile.inc
===================================================================
--- boot/arch/ia64/Makefile.inc	(revision 0c334805ad74c3439442559452102d19c29db11d)
+++ boot/arch/ia64/Makefile.inc	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
@@ -82,8 +82,8 @@
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
-	bus/usb/usbhid \
-	bus/usb/usbmast \
 	bus/usb/usbmid \
-	bus/usb/vhc
+	bus/usb/vhc \
+	block/usbmast \
+	hid/usbhid
 
 RD_DRV_CFG += \
Index: boot/arch/ppc32/Makefile.inc
===================================================================
--- boot/arch/ppc32/Makefile.inc	(revision 0c334805ad74c3439442559452102d19c29db11d)
+++ boot/arch/ppc32/Makefile.inc	(revision 493f1beab3cdc0d5615bc4f2b6e5946e6bf3270e)
@@ -49,8 +49,8 @@
 	bus/usb/usbflbk \
 	bus/usb/usbhub \
-	bus/usb/usbhid \
-	bus/usb/usbmast \
 	bus/usb/usbmid \
-	bus/usb/vhc
+	bus/usb/vhc \
+	block/usbmast \
+	hid/usbhid
 
 SOURCES = \