diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
index 85ff78ffa192..c7bb645391e0 100644
--- a/sys/modules/aue/Makefile
+++ b/sys/modules/aue/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	if_aue
 SRCS=	if_aue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile
index ed4c5ef76bbe..fa00d095fbac 100644
--- a/sys/modules/axe/Makefile
+++ b/sys/modules/axe/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	if_axe
 SRCS=	if_axe.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
index 78dbd5eb934b..939e714aacfd 100644
--- a/sys/modules/cue/Makefile
+++ b/sys/modules/cue/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	if_cue
 SRCS=	if_cue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile
index 9d3293214a81..ec7b392addec 100644
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../dev/ep
 
 KMOD=	if_ep
-SRCS=	if_ep.c if_ep_pccard.c
+SRCS=	if_ep.c if_ep_pccard.c pccarddevs.h
 SRCS+=	if_ep_isa.c
 #SRCS+=	if_ep_eisa.c
 #SRCS+=	if_ep_mca.c
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
index 42c891013574..8569f16f5b41 100644
--- a/sys/modules/kue/Makefile
+++ b/sys/modules/kue/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	if_kue
 SRCS=	if_kue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile
index 92456e573907..7e6175248335 100644
--- a/sys/modules/rue/Makefile
+++ b/sys/modules/rue/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	if_rue
 SRCS=	if_rue.c opt_bdg.h opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
index 379f30b21778..dbb9a0a759dc 100644
--- a/sys/modules/ubsa/Makefile
+++ b/sys/modules/ubsa/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	ubsa
-SRCS=	ubsa.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	ubsa.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile
index 2c7d8c37ec20..66f2a8797087 100644
--- a/sys/modules/ubser/Makefile
+++ b/sys/modules/ubser/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	ubser
-SRCS=	ubser.c ubser.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	ubser.c ubser.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile
index 529613824e2d..a30cf4f2e272 100644
--- a/sys/modules/ucom/Makefile
+++ b/sys/modules/ucom/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	ucom
-SRCS=	ucom.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	ucom.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/udav/Makefile b/sys/modules/udav/Makefile
index 17cffec76e72..02a9d721f9b9 100644
--- a/sys/modules/udav/Makefile
+++ b/sys/modules/udav/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 KMOD=	if_udav
 SRCS=	if_udav.c opt_bdg.h opt_usb.h device_if.h bus_if.h opt_inet.h
-SRCS+=	miibus_if.h
+SRCS+=	miibus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index 8ddbb5dab9da..574aa6b8d09a 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -7,6 +7,6 @@ MAINTAINER=	n_hibma@freebsd.org
 KMOD=	udbp
 SRCS=	bus_if.h device_if.h \
 	opt_usb.h \
-	udbp.c
+	udbp.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ufm/Makefile b/sys/modules/ufm/Makefile
index 22b8d1ee5814..28bbc90e3a09 100644
--- a/sys/modules/ufm/Makefile
+++ b/sys/modules/ufm/Makefile
@@ -2,6 +2,6 @@
 
 .PATH:	${.CURDIR}/../../dev/usb
 KMOD=	ufm
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ufm.c dsbr100io.h
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ufm.c dsbr100io.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
index 0e4f7293806b..aaa4430ee79d 100644
--- a/sys/modules/uftdi/Makefile
+++ b/sys/modules/uftdi/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	uftdi
-SRCS=	uftdi.c uftdireg.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	uftdi.c uftdireg.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index 777b04b10163..e4679acbd0ba 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ugen
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index 7475f82da703..58127bfa2b6a 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	uhid
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index 9c80cb67397b..fe0091196840 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -7,7 +7,7 @@ MAINTAINER=	n_hibma@freebsd.org
 KMOD=	ukbd
 SRCS=	bus_if.h device_if.h vnode_if.h \
 	opt_usb.h opt_kbd.h opt_ukbd.h \
-	ukbd.c
+	ukbd.c usbdevs.h
 
 opt_kbd.h:
 	echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET}
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index aa0f091400c8..2b57a985ff2c 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ulpt
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 94922ac0a178..b0412ff920fe 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -7,6 +7,6 @@ MAINTAINER=	n_hibma@freebsd.org
 KMOD=	umass
 SRCS=	bus_if.h device_if.h \
 	opt_usb.h opt_cam.h opt_scsi.h \
-	umass.c
+	umass.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
index f2e88fa0a209..0ca9dc498378 100644
--- a/sys/modules/umct/Makefile
+++ b/sys/modules/umct/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	umct
-SRCS=	umct.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	umct.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index e3c395f2b054..777d3a2ee12b 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	umodem
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index f5163312e788..f0659441a588 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ums
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h ums.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uplcom/Makefile b/sys/modules/uplcom/Makefile
index 7ed3350f7445..774e47a87168 100644
--- a/sys/modules/uplcom/Makefile
+++ b/sys/modules/uplcom/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	uplcom
 SRCS=	uplcom.c ucomvar.h opt_usb.h opt_uplcom.h \
-	device_if.h bus_if.h vnode_if.h
+	device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 93c6fc7acca2..53526f53671d 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	urio
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h urio.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h urio.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 9865f4a9dbf0..26d558d3b6ae 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -20,7 +20,7 @@ SRCS=	bus_if.h device_if.h usb_if.h usb_if.c \
 	usbdevs.h usbdevs_data.h \
 	usbdi.c usbdi.h usbdivar.h \
 	usbdi_util.c usbdi_util.h \
-	usb_ethersubr.c
+	usb_ethersubr.c usbdevs.h
 	
 SRCS+=	uhci_pci.c uhci.c uhcireg.h uhcivar.h
 SRCS+=	ohci_pci.c ohci.c ohcireg.h ohcivar.h
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 314078764a0b..96bd07168546 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -5,6 +5,6 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	 uscanner
-SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c
+SRCS=	bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile
index 8e2fb28e614b..1d7dedb6317e 100644
--- a/sys/modules/uvisor/Makefile
+++ b/sys/modules/uvisor/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	uvisor
-SRCS=	uvisor.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h
+SRCS=	uvisor.c ucomvar.h opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile
index 672eaeba9384..4753e9bc4b64 100644
--- a/sys/modules/uvscom/Makefile
+++ b/sys/modules/uvscom/Makefile
@@ -5,6 +5,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	uvscom
 SRCS=	uvscom.c ucomvar.h opt_usb.h opt_uvscom.h \
-	device_if.h bus_if.h vnode_if.h
+	device_if.h bus_if.h vnode_if.h usbdevs.h
 
 .include <bsd.kmod.mk>