diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile
index f77900bbd499..bd0286420c63 100644
--- a/sys/modules/bktr/bktr/Makefile
+++ b/sys/modules/bktr/bktr/Makefile
@@ -7,7 +7,7 @@
 KMOD=	bktr 
 SRCS=	bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c msp34xx.c \
 	opt_devfs.h opt_bktr.h bus_if.h device_if.h \
-	pci_if.h vnode_if.h
+	pci_if.h
 
 opt_bktr.h:
 	echo "#define BKTR_FREEBSD_MODULE 1" > opt_bktr.h
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 871cc5db8b99..95f81f9de80e 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_ppp
 SRCS=	if_ppp.c ppp_tty.c slcompress.c \
-	opt_inet.h opt_ipx.h opt_mac.h opt_ppp.h vnode_if.h
+	opt_inet.h opt_ipx.h opt_mac.h opt_ppp.h
 
 PPP_BSDCOMP?=	1	# 0/1
 PPP_DEFLATE?=	1	# 0/1
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 1c804e12c02f..e94f835dd5ac 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tun
-SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h \
-	vnode_if.h
+SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h
 
 opt_atalk.h:
 	echo "#define NETATALK 1" > ${.TARGET}
diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile
index 9cafd330e7b6..f4441df8f01b 100644
--- a/sys/modules/snp/Makefile
+++ b/sys/modules/snp/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../dev/snp
 
 KMOD=	snp
-SRCS=	snp.c vnode_if.h
+SRCS=	snp.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile
index af5604af6b06..ff92551bb61e 100644
--- a/sys/modules/sound/driver/uaudio/Makefile
+++ b/sys/modules/sound/driver/uaudio/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../../../dev/sound/usb
 
 KMOD=	snd_uaudio
-SRCS=	device_if.h bus_if.h opt_usb.h vnode_if.h
+SRCS=	device_if.h bus_if.h opt_usb.h
 SRCS+=	uaudio.c uaudio_pcm.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 84b026c1479a..9f73f35956b9 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../pci
 
 KMOD=	if_ti
-SRCS=	if_ti.c opt_bdg.h device_if.h bus_if.h pci_if.h opt_ti.h opt_zero.h \
+SRCS=	if_ti.c opt_bdg.h bus_if.h pci_if.h opt_ti.h opt_zero.h \
 	vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
index dbb9a0a759dc..1d7eb766fef2 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 usbdevs.h
+SRCS=	ubsa.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile
index 66f2a8797087..41a0bc3f01d2 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 usbdevs.h
+SRCS=	ubser.c ubser.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ucom/Makefile b/sys/modules/ucom/Makefile
index a30cf4f2e272..bbd5c21dbf21 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 usbdevs.h
+SRCS=	ucom.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile
index 7d7fc8842419..d5849a93f520 100644
--- a/sys/modules/ucycom/Makefile
+++ b/sys/modules/ucycom/Makefile
@@ -4,6 +4,6 @@ S=	${.CURDIR}/../..
 .PATH: $S/dev/usb
 
 KMOD=	ucycom
-SRCS=	ucycom.c opt_usb.h device_if.h bus_if.h vnode_if.h usbdevs.h
+SRCS=	ucycom.c opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
index aaa4430ee79d..65cb10782f5a 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 usbdevs.h
+SRCS=	uftdi.c uftdireg.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index e4679acbd0ba..22c833459f22 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 usbdevs.h
+SRCS=	bus_if.h device_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 58127bfa2b6a..d5ab0131fe10 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 usbdevs.h
+SRCS=	bus_if.h device_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 fe0091196840..cd2e02e264db 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -5,9 +5,7 @@ MAINTAINER=	n_hibma@freebsd.org
 .PATH: ${.CURDIR}/../../dev/usb
 
 KMOD=	ukbd
-SRCS=	bus_if.h device_if.h vnode_if.h \
-	opt_usb.h opt_kbd.h opt_ukbd.h \
-	ukbd.c usbdevs.h
+SRCS=	bus_if.h device_if.h opt_usb.h opt_kbd.h opt_ukbd.h usbdevs.h ukbd.c
 
 opt_kbd.h:
 	echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET}
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 2b57a985ff2c..46becf8c4023 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 usbdevs.h
+SRCS=	bus_if.h device_if.h opt_usb.h ulpt.c usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
index 0ca9dc498378..ccd775f4ba6f 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 usbdevs.h
+SRCS=	umct.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index 777d3a2ee12b..7258d4f5e386 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 usbdevs.h
+SRCS=	bus_if.h device_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 f0659441a588..351f08142dd5 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 usbdevs.h
+SRCS=	bus_if.h device_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 774e47a87168..36115ccca436 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 usbdevs.h
+	device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index 53526f53671d..0221c5d1a103 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 usbdevs.h
+SRCS=	bus_if.h device_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 d4ab9d32ef8b..d126db81a86f 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -8,7 +8,6 @@ S=	${.CURDIR}/../..
 
 KMOD=	usb
 SRCS=	bus_if.h device_if.h usb_if.h usb_if.c \
-	vnode_if.h \
 	opt_usb.h \
 	hid.c hid.h usbhid.h \
 	uhub.c \
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 96bd07168546..995fc71726a7 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 usbdevs.h
+SRCS=	bus_if.h device_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 1d7dedb6317e..feb74df9acb4 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 usbdevs.h
+SRCS=	uvisor.c ucomvar.h opt_usb.h device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/uvscom/Makefile b/sys/modules/uvscom/Makefile
index 4753e9bc4b64..ceb1959df1f2 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 usbdevs.h
+	device_if.h bus_if.h usbdevs.h
 
 .include <bsd.kmod.mk>