--- src/tools/build/mk/OptionalObsoleteFiles.inc.origin	2007-04-06 04:13:30.000000000 +0200
+++ src/tools/build/mk/OptionalObsoleteFiles.inc	2007-06-22 05:08:58.000000000 +0200
@@ -1173,6 +1173,14 @@
 # to be filled in
 #.endif
 
-#.if ${MK_USB} == no
-# to be filled in
-#.endif
+.if ${MK_USB} == no
+OLD_FILES+=usr/bin/usbhidaction
+OLD_FILES+=usr/bin/usbhidctl
+OLD_FILES+=usr/sbin/usbdevs
+OLD_LIBS+=usr/lib/libusbhid.a
+OLD_LIBS+=usr/lib/libusbhid.so 
+OLD_LIBS+=usr/lib/libusbhid.so.2
+OLD_LIBS+=usr/lib/libusbhid.so.3
+OLD_LIBS+=usr/lib/libusbhid_p.a
+OLD_FILES+=usr/share/man/man3/libusbhid.3.gz
+.endif
--- src/sys/modules/Makefile.origin	2007-06-16 03:56:05.000000000 +0200
+++ src/sys/modules/Makefile	2007-06-22 05:05:41.000000000 +0200
@@ -30,10 +30,10 @@
 	ath_rate_amrr \
 	ath_rate_onoe \
 	${_ath_rate_sample} \
-	aue \
+	${_aue} \
 	${_auxio} \
 	${_awi} \
-	axe \
+	${_axe} \
 	bce \
 	bfe \
 	bge \
@@ -47,7 +47,7 @@
 	${_cbb} \
 	cd9660 \
 	cd9660_iconv \
-	cdce \
+	${_cdce} \
 	${_ce} \
 	${_ciss} \
 	${_cm} \
@@ -60,7 +60,7 @@
 	${_cryptodev} \
 	${_cs} \
 	${_ctau} \
-	cue \
+	${_cue} \
 	cxgb \
 	${_cx} \
 	dc \
@@ -134,7 +134,7 @@
 	${_ixgb} \
 	joy \
 	kbdmux \
-	kue \
+	${_kue} \
 	le \
 	lge \
 	libalias \
@@ -218,8 +218,8 @@
 	rl \
 	rp \
 	${_rr232x} \
-	rue \
-	rum \
+	${_rue} \
+	${_rum} \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
@@ -256,38 +256,38 @@
 	twe \
 	tx \
 	txp \
-	uark \
+	${_uark} \
 	uart \
-	ubsa \
+	${_ubsa} \
 	ubsec \
-	ubser \
-	ucom \
-	ucycom \
-	udav \
-	udbp \
+	${_ubser} \
+	${_ucom} \
+	${_ucycom} \
+	${_udav} \
+	${_udbp} \
 	udf \
 	udf_iconv \
-	ufm \
+	${_ufm} \
 	${_ufs} \
-	ufoma \
-	uftdi \
-	ugen \
-	uhid \
-	ukbd \
-	ulpt \
-	umass \
-	umct \
-	umodem \
-	ums \
+	${_ufoma} \
+	${_uftdi} \
+	${_ugen} \
+	${_uhid} \
+	${_ukbd} \
+	${_ulpt} \
+	${_umass} \
+	${_umct} \
+	${_umodem} \
+	${_ums} \
 	unionfs \
-	uplcom \
-	ural \
-	urio \
-	usb \
-	uscanner \
+	${_uplcom}\
+	${_ural} \
+	${_urio} \
+	${_usb} \
+	${_uscanner} \
 	utopia \
-	uvisor \
-	uvscom \
+	${_uvisor} \
+	${_uvscom} \
 	${_vesa} \
 	vge \
 	vkbd \
@@ -339,6 +339,42 @@
 _pflog=		pflog
 .endif
 
+.if ${MK_USB} != "no" || defined(ALL_MODULES)
+_aue=aue
+_axe=axe
+_cdce=cdce
+_cue=cue
+_kue=kue
+_rue=rue
+_rum=rum
+_uark=uark
+_ubsa=ubsa
+_ubser=ubser
+_ucom=ucom
+_ucycom=ucycom
+_udav=udav
+_udbp=udbp
+_ufm=ufm
+_ufoma=ufoma
+_uftdi=uftdi
+_ugen=ugen
+_uhid=uhid
+_uipaq=uipaq
+_ukbd=ukbd
+_ulpt=ulpt
+_umass=umass
+_umct=umct
+_umodem=umodem
+_ums=ums
+_uplcom=uplcom
+_ural=ural
+_urio=urio
+_usb=usb
+_uscanner=uscanner
+_uvisor=uvisor
+_uvscom=uvscom
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 # XXX some of these can move to the general case when de-i386'ed
 # XXX some of these can move now, but are untested on other architectures.