156 files changed, 22 insertions, 470 deletions

diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index e65734c..39d40ea 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -65,8 +65,8 @@ __FBSDID("$FreeBSD$");
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/compat/ndis/kern_windrv.c b/sys/compat/ndis/kern_windrv.c
index b42ff45..37bbbaf 100644
--- a/sys/compat/ndis/kern_windrv.c
+++ b/sys/compat/ndis/kern_windrv.c
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/segments.h>
 #endif
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index ac9d8da..029eebb 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -95,8 +95,8 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index 0c47c1b..305cfc5 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -56,11 +56,11 @@ __FBSDID("$FreeBSD$");
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
-#include <dev/usb/usb_quirks.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
+#include <legacy/dev/usb/usbdi_util.h>
+#include <legacy/dev/usb/usbdivar.h>
+#include <legacy/dev/usb/usb_quirks.h>
 #include "usbdevs.h"
 
 #include <compat/ndis/pe_var.h>
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 0005db4..d20308f 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -74,8 +74,8 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 7eb4cd6..d84550a 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$");
 
 #include <net80211/ieee80211_var.h>
 
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index c03c502..afadd8a 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -54,8 +54,8 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
 
 #include <compat/ndis/pe_var.h>
 #include <compat/ndis/cfg_var.h>
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index b206982..1de308d 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -52,10 +52,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/bus.h>
 #include <machine/bus.h>
-#include <dev/usb/usb.h>
-#include <dev/usb/usbdi.h>
-#include <dev/usb/usbdi_util.h>
-#include <dev/usb/usbdivar.h>
+#include <legacy/dev/usb/usb.h>
+#include <legacy/dev/usb/usbdi.h>
+#include <legacy/dev/usb/usbdi_util.h>
+#include <legacy/dev/usb/usbdivar.h>
 #include "usbdevs.h"
 
 #include <net80211/ieee80211_var.h>
diff --git a/sys/dev/usb/FILES b/sys/legacy/dev/usb/FILES
index 5a77cbd..5a77cbd 100644
--- a/sys/dev/usb/FILES
+++ b/sys/legacy/dev/usb/FILES
diff --git a/sys/dev/usb/dsbr100io.h b/sys/legacy/dev/usb/dsbr100io.h
index f1c8a97..f1c8a97 100644
--- a/sys/dev/usb/dsbr100io.h
+++ b/sys/legacy/dev/usb/dsbr100io.h
diff --git a/sys/dev/usb/ehci.c b/sys/legacy/dev/usb/ehci.c
index c159600..c159600 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/legacy/dev/usb/ehci.c
diff --git a/sys/dev/usb/ehci_ddb.c b/sys/legacy/dev/usb/ehci_ddb.c
index 3ebd130..3ebd130 100644
--- a/sys/dev/usb/ehci_ddb.c
+++ b/sys/legacy/dev/usb/ehci_ddb.c
diff --git a/sys/dev/usb/ehci_ixp4xx.c b/sys/legacy/dev/usb/ehci_ixp4xx.c
index bc800d3..bc800d3 100644
--- a/sys/dev/usb/ehci_ixp4xx.c
+++ b/sys/legacy/dev/usb/ehci_ixp4xx.c
diff --git a/sys/dev/usb/ehci_mbus.c b/sys/legacy/dev/usb/ehci_mbus.c
index 792c89d..792c89d 100644
--- a/sys/dev/usb/ehci_mbus.c
+++ b/sys/legacy/dev/usb/ehci_mbus.c
diff --git a/sys/dev/usb/ehci_pci.c b/sys/legacy/dev/usb/ehci_pci.c
index 819bc25..819bc25 100644
--- a/sys/dev/usb/ehci_pci.c
+++ b/sys/legacy/dev/usb/ehci_pci.c
diff --git a/sys/dev/usb/ehcireg.h b/sys/legacy/dev/usb/ehcireg.h
index 3c0f5e7..3c0f5e7 100644
--- a/sys/dev/usb/ehcireg.h
+++ b/sys/legacy/dev/usb/ehcireg.h
diff --git a/sys/dev/usb/ehcivar.h b/sys/legacy/dev/usb/ehcivar.h
index fdd19ba..fdd19ba 100644
--- a/sys/dev/usb/ehcivar.h
+++ b/sys/legacy/dev/usb/ehcivar.h
diff --git a/sys/dev/usb/hid.c b/sys/legacy/dev/usb/hid.c
index 70facb6..70facb6 100644
--- a/sys/dev/usb/hid.c
+++ b/sys/legacy/dev/usb/hid.c
diff --git a/sys/dev/usb/hid.h b/sys/legacy/dev/usb/hid.h
index a4ab7d2..a4ab7d2 100644
--- a/sys/dev/usb/hid.h
+++ b/sys/legacy/dev/usb/hid.h
diff --git a/sys/dev/usb/if_aue.c b/sys/legacy/dev/usb/if_aue.c
index 1c6d8a3..1c6d8a3 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/legacy/dev/usb/if_aue.c
diff --git a/sys/dev/usb/if_auereg.h b/sys/legacy/dev/usb/if_auereg.h
index 18cc0f4..18cc0f4 100644
--- a/sys/dev/usb/if_auereg.h
+++ b/sys/legacy/dev/usb/if_auereg.h
diff --git a/sys/dev/usb/if_axe.c b/sys/legacy/dev/usb/if_axe.c
index 65da32b..65da32b 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/legacy/dev/usb/if_axe.c
diff --git a/sys/dev/usb/if_axereg.h b/sys/legacy/dev/usb/if_axereg.h
index 4503b19..4503b19 100644
--- a/sys/dev/usb/if_axereg.h
+++ b/sys/legacy/dev/usb/if_axereg.h
diff --git a/sys/dev/usb/if_cdce.c b/sys/legacy/dev/usb/if_cdce.c
index d41a54f..d41a54f 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/legacy/dev/usb/if_cdce.c
diff --git a/sys/dev/usb/if_cdcereg.h b/sys/legacy/dev/usb/if_cdcereg.h
index e658eab..e658eab 100644
--- a/sys/dev/usb/if_cdcereg.h
+++ b/sys/legacy/dev/usb/if_cdcereg.h
diff --git a/sys/dev/usb/if_cue.c b/sys/legacy/dev/usb/if_cue.c
index cd3a543..cd3a543 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/legacy/dev/usb/if_cue.c
diff --git a/sys/dev/usb/if_cuereg.h b/sys/legacy/dev/usb/if_cuereg.h
index 4c81653..4c81653 100644
--- a/sys/dev/usb/if_cuereg.h
+++ b/sys/legacy/dev/usb/if_cuereg.h
diff --git a/sys/dev/usb/if_kue.c b/sys/legacy/dev/usb/if_kue.c
index f68eaa8..f68eaa8 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/legacy/dev/usb/if_kue.c
diff --git a/sys/dev/usb/if_kuereg.h b/sys/legacy/dev/usb/if_kuereg.h
index 595eaa7..595eaa7 100644
--- a/sys/dev/usb/if_kuereg.h
+++ b/sys/legacy/dev/usb/if_kuereg.h
diff --git a/sys/dev/usb/if_rue.c b/sys/legacy/dev/usb/if_rue.c
index 4449f7d..4449f7d 100644
--- a/sys/dev/usb/if_rue.c
+++ b/sys/legacy/dev/usb/if_rue.c
diff --git a/sys/dev/usb/if_ruereg.h b/sys/legacy/dev/usb/if_ruereg.h
index da6470f..da6470f 100644
--- a/sys/dev/usb/if_ruereg.h
+++ b/sys/legacy/dev/usb/if_ruereg.h
diff --git a/sys/dev/usb/if_rum.c b/sys/legacy/dev/usb/if_rum.c
index c0c7cb6..c0c7cb6 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/legacy/dev/usb/if_rum.c
diff --git a/sys/dev/usb/if_rumreg.h b/sys/legacy/dev/usb/if_rumreg.h
index 75a51bc..75a51bc 100644
--- a/sys/dev/usb/if_rumreg.h
+++ b/sys/legacy/dev/usb/if_rumreg.h
diff --git a/sys/dev/usb/if_rumvar.h b/sys/legacy/dev/usb/if_rumvar.h
index 59980c0..59980c0 100644
--- a/sys/dev/usb/if_rumvar.h
+++ b/sys/legacy/dev/usb/if_rumvar.h
diff --git a/sys/dev/usb/if_udav.c b/sys/legacy/dev/usb/if_udav.c
index e13170e..e13170e 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/legacy/dev/usb/if_udav.c
diff --git a/sys/dev/usb/if_udavreg.h b/sys/legacy/dev/usb/if_udavreg.h
index cb7da28..cb7da28 100644
--- a/sys/dev/usb/if_udavreg.h
+++ b/sys/legacy/dev/usb/if_udavreg.h
diff --git a/sys/dev/usb/if_upgt.c b/sys/legacy/dev/usb/if_upgt.c
index 9ab226f..9ab226f 100644
--- a/sys/dev/usb/if_upgt.c
+++ b/sys/legacy/dev/usb/if_upgt.c
diff --git a/sys/dev/usb/if_upgtvar.h b/sys/legacy/dev/usb/if_upgtvar.h
index 298fb63..298fb63 100644
--- a/sys/dev/usb/if_upgtvar.h
+++ b/sys/legacy/dev/usb/if_upgtvar.h
diff --git a/sys/dev/usb/if_ural.c b/sys/legacy/dev/usb/if_ural.c
index 4595761..4595761 100644
--- a/sys/dev/usb/if_ural.c
+++ b/sys/legacy/dev/usb/if_ural.c
diff --git a/sys/dev/usb/if_uralreg.h b/sys/legacy/dev/usb/if_uralreg.h
index 428089f..428089f 100644
--- a/sys/dev/usb/if_uralreg.h
+++ b/sys/legacy/dev/usb/if_uralreg.h
diff --git a/sys/dev/usb/if_uralvar.h b/sys/legacy/dev/usb/if_uralvar.h
index 39aef9e..39aef9e 100644
--- a/sys/dev/usb/if_uralvar.h
+++ b/sys/legacy/dev/usb/if_uralvar.h
diff --git a/sys/dev/usb/if_urtw.c b/sys/legacy/dev/usb/if_urtw.c
index d1a3a84..d1a3a84 100644
--- a/sys/dev/usb/if_urtw.c
+++ b/sys/legacy/dev/usb/if_urtw.c
diff --git a/sys/dev/usb/if_urtwreg.h b/sys/legacy/dev/usb/if_urtwreg.h
index 7a9baa3..7a9baa3 100644
--- a/sys/dev/usb/if_urtwreg.h
+++ b/sys/legacy/dev/usb/if_urtwreg.h
diff --git a/sys/dev/usb/if_urtwvar.h b/sys/legacy/dev/usb/if_urtwvar.h
index 77c09ef..77c09ef 100644
--- a/sys/dev/usb/if_urtwvar.h
+++ b/sys/legacy/dev/usb/if_urtwvar.h
diff --git a/sys/dev/usb/if_zyd.c b/sys/legacy/dev/usb/if_zyd.c
index 3a4abce..3a4abce 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/legacy/dev/usb/if_zyd.c
diff --git a/sys/dev/usb/if_zydfw.h b/sys/legacy/dev/usb/if_zydfw.h
index 46f5c2a..46f5c2a 100644
--- a/sys/dev/usb/if_zydfw.h
+++ b/sys/legacy/dev/usb/if_zydfw.h
diff --git a/sys/dev/usb/if_zydreg.h b/sys/legacy/dev/usb/if_zydreg.h
index feae22f..feae22f 100644
--- a/sys/dev/usb/if_zydreg.h
+++ b/sys/legacy/dev/usb/if_zydreg.h
diff --git a/sys/dev/usb/kue_fw.h b/sys/legacy/dev/usb/kue_fw.h
index 8934465..8934465 100644
--- a/sys/dev/usb/kue_fw.h
+++ b/sys/legacy/dev/usb/kue_fw.h
diff --git a/sys/dev/usb/ohci.c b/sys/legacy/dev/usb/ohci.c
index efa6e7e..efa6e7e 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/legacy/dev/usb/ohci.c
diff --git a/sys/dev/usb/ohci_pci.c b/sys/legacy/dev/usb/ohci_pci.c
index fadffb6..fadffb6 100644
--- a/sys/dev/usb/ohci_pci.c
+++ b/sys/legacy/dev/usb/ohci_pci.c
diff --git a/sys/dev/usb/ohcireg.h b/sys/legacy/dev/usb/ohcireg.h
index 429beb8..429beb8 100644
--- a/sys/dev/usb/ohcireg.h
+++ b/sys/legacy/dev/usb/ohcireg.h
diff --git a/sys/dev/usb/ohcivar.h b/sys/legacy/dev/usb/ohcivar.h
index 48f99e7..48f99e7 100644
--- a/sys/dev/usb/ohcivar.h
+++ b/sys/legacy/dev/usb/ohcivar.h
diff --git a/sys/dev/usb/rio500_usb.h b/sys/legacy/dev/usb/rio500_usb.h
index 5b53e2c..5b53e2c 100644
--- a/sys/dev/usb/rio500_usb.h
+++ b/sys/legacy/dev/usb/rio500_usb.h
diff --git a/sys/dev/usb/rt2573_ucode.h b/sys/legacy/dev/usb/rt2573_ucode.h
index f2040f3..f2040f3 100644
--- a/sys/dev/usb/rt2573_ucode.h
+++ b/sys/legacy/dev/usb/rt2573_ucode.h
diff --git a/sys/dev/usb/sl811hs.c b/sys/legacy/dev/usb/sl811hs.c
index 3620d5f..3620d5f 100644
--- a/sys/dev/usb/sl811hs.c
+++ b/sys/legacy/dev/usb/sl811hs.c
diff --git a/sys/dev/usb/sl811hsreg.h b/sys/legacy/dev/usb/sl811hsreg.h
index f9c0328..f9c0328 100644
--- a/sys/dev/usb/sl811hsreg.h
+++ b/sys/legacy/dev/usb/sl811hsreg.h
diff --git a/sys/dev/usb/sl811hsvar.h b/sys/legacy/dev/usb/sl811hsvar.h
index 6f5e6d6..6f5e6d6 100644
--- a/sys/dev/usb/sl811hsvar.h
+++ b/sys/legacy/dev/usb/sl811hsvar.h
diff --git a/sys/dev/usb/slhci_pccard.c b/sys/legacy/dev/usb/slhci_pccard.c
index 794b81d..794b81d 100644
--- a/sys/dev/usb/slhci_pccard.c
+++ b/sys/legacy/dev/usb/slhci_pccard.c
diff --git a/sys/dev/usb/u3g.c b/sys/legacy/dev/usb/u3g.c
index 8c6f67e..8c6f67e 100644
--- a/sys/dev/usb/u3g.c
+++ b/sys/legacy/dev/usb/u3g.c
diff --git a/sys/dev/usb/uark.c b/sys/legacy/dev/usb/uark.c
index af85819..af85819 100644
--- a/sys/dev/usb/uark.c
+++ b/sys/legacy/dev/usb/uark.c
diff --git a/sys/dev/usb/ubsa.c b/sys/legacy/dev/usb/ubsa.c
index b66cce8..b66cce8 100644
--- a/sys/dev/usb/ubsa.c
+++ b/sys/legacy/dev/usb/ubsa.c
diff --git a/sys/dev/usb/ubser.c b/sys/legacy/dev/usb/ubser.c
index 29994b9..29994b9 100644
--- a/sys/dev/usb/ubser.c
+++ b/sys/legacy/dev/usb/ubser.c
diff --git a/sys/dev/usb/ubser.h b/sys/legacy/dev/usb/ubser.h
index f256d4a..f256d4a 100644
--- a/sys/dev/usb/ubser.h
+++ b/sys/legacy/dev/usb/ubser.h
diff --git a/sys/dev/usb/uchcom.c b/sys/legacy/dev/usb/uchcom.c
index 85b2629..85b2629 100644
--- a/sys/dev/usb/uchcom.c
+++ b/sys/legacy/dev/usb/uchcom.c
diff --git a/sys/dev/usb/ucom.c b/sys/legacy/dev/usb/ucom.c
index ae263a0..ae263a0 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/legacy/dev/usb/ucom.c
diff --git a/sys/dev/usb/ucomvar.h b/sys/legacy/dev/usb/ucomvar.h
index 4433a1a..4433a1a 100644
--- a/sys/dev/usb/ucomvar.h
+++ b/sys/legacy/dev/usb/ucomvar.h
diff --git a/sys/dev/usb/ucycom.c b/sys/legacy/dev/usb/ucycom.c
index ecf115f..ecf115f 100644
--- a/sys/dev/usb/ucycom.c
+++ b/sys/legacy/dev/usb/ucycom.c
diff --git a/sys/dev/usb/udbp.c b/sys/legacy/dev/usb/udbp.c
index 523184f..523184f 100644
--- a/sys/dev/usb/udbp.c
+++ b/sys/legacy/dev/usb/udbp.c
diff --git a/sys/dev/usb/udbp.h b/sys/legacy/dev/usb/udbp.h
index 97ef945..97ef945 100644
--- a/sys/dev/usb/udbp.h
+++ b/sys/legacy/dev/usb/udbp.h
diff --git a/sys/dev/usb/ufm.c b/sys/legacy/dev/usb/ufm.c
index 2635827..2635827 100644
--- a/sys/dev/usb/ufm.c
+++ b/sys/legacy/dev/usb/ufm.c
diff --git a/sys/dev/usb/ufoma.c b/sys/legacy/dev/usb/ufoma.c
index e5704a7..e5704a7 100644
--- a/sys/dev/usb/ufoma.c
+++ b/sys/legacy/dev/usb/ufoma.c
diff --git a/sys/dev/usb/uftdi.c b/sys/legacy/dev/usb/uftdi.c
index c652977..c652977 100644
--- a/sys/dev/usb/uftdi.c
+++ b/sys/legacy/dev/usb/uftdi.c
diff --git a/sys/dev/usb/uftdireg.h b/sys/legacy/dev/usb/uftdireg.h
index 78c9349..78c9349 100644
--- a/sys/dev/usb/uftdireg.h
+++ b/sys/legacy/dev/usb/uftdireg.h
diff --git a/sys/dev/usb/ugen.c b/sys/legacy/dev/usb/ugen.c
index 4f03cfb..4f03cfb 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/legacy/dev/usb/ugen.c
diff --git a/sys/dev/usb/ugraphire_rdesc.h b/sys/legacy/dev/usb/ugraphire_rdesc.h
index 9c5a0c1..9c5a0c1 100644
--- a/sys/dev/usb/ugraphire_rdesc.h
+++ b/sys/legacy/dev/usb/ugraphire_rdesc.h
diff --git a/sys/dev/usb/uhci.c b/sys/legacy/dev/usb/uhci.c
index 4d4c61b..4d4c61b 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/legacy/dev/usb/uhci.c
diff --git a/sys/dev/usb/uhci_pci.c b/sys/legacy/dev/usb/uhci_pci.c
index 4ee19d6..4ee19d6 100644
--- a/sys/dev/usb/uhci_pci.c
+++ b/sys/legacy/dev/usb/uhci_pci.c
diff --git a/sys/dev/usb/uhcireg.h b/sys/legacy/dev/usb/uhcireg.h
index 512dd2d..512dd2d 100644
--- a/sys/dev/usb/uhcireg.h
+++ b/sys/legacy/dev/usb/uhcireg.h
diff --git a/sys/dev/usb/uhcivar.h b/sys/legacy/dev/usb/uhcivar.h
index 0df23f1..0df23f1 100644
--- a/sys/dev/usb/uhcivar.h
+++ b/sys/legacy/dev/usb/uhcivar.h
diff --git a/sys/dev/usb/uhid.c b/sys/legacy/dev/usb/uhid.c
index d821c01..d821c01 100644
--- a/sys/dev/usb/uhid.c
+++ b/sys/legacy/dev/usb/uhid.c
diff --git a/sys/dev/usb/uhub.c b/sys/legacy/dev/usb/uhub.c
index 86fbba2..86fbba2 100644
--- a/sys/dev/usb/uhub.c
+++ b/sys/legacy/dev/usb/uhub.c
diff --git a/sys/dev/usb/uipaq.c b/sys/legacy/dev/usb/uipaq.c
index a231a67..a231a67 100644
--- a/sys/dev/usb/uipaq.c
+++ b/sys/legacy/dev/usb/uipaq.c
diff --git a/sys/dev/usb/ukbd.c b/sys/legacy/dev/usb/ukbd.c
index 5a7c9fc..5a7c9fc 100644
--- a/sys/dev/usb/ukbd.c
+++ b/sys/legacy/dev/usb/ukbd.c
diff --git a/sys/dev/usb/ulpt.c b/sys/legacy/dev/usb/ulpt.c
index 99a1433..99a1433 100644
--- a/sys/dev/usb/ulpt.c
+++ b/sys/legacy/dev/usb/ulpt.c
diff --git a/sys/dev/usb/umass.c b/sys/legacy/dev/usb/umass.c
index b0b73cc..b0b73cc 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/legacy/dev/usb/umass.c
diff --git a/sys/dev/usb/umct.c b/sys/legacy/dev/usb/umct.c
index 63de146..63de146 100644
--- a/sys/dev/usb/umct.c
+++ b/sys/legacy/dev/usb/umct.c
diff --git a/sys/dev/usb/umodem.c b/sys/legacy/dev/usb/umodem.c
index f0cb17c..f0cb17c 100644
--- a/sys/dev/usb/umodem.c
+++ b/sys/legacy/dev/usb/umodem.c
diff --git a/sys/dev/usb/ums.c b/sys/legacy/dev/usb/ums.c
index 6484303..6484303 100644
--- a/sys/dev/usb/ums.c
+++ b/sys/legacy/dev/usb/ums.c
diff --git a/sys/dev/usb/uplcom.c b/sys/legacy/dev/usb/uplcom.c
index ab5ab93..ab5ab93 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/legacy/dev/usb/uplcom.c
diff --git a/sys/dev/usb/urio.c b/sys/legacy/dev/usb/urio.c
index 5f69918..5f69918 100644
--- a/sys/dev/usb/urio.c
+++ b/sys/legacy/dev/usb/urio.c
diff --git a/sys/dev/usb/usb.c b/sys/legacy/dev/usb/usb.c
index b1b7d44..b1b7d44 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/legacy/dev/usb/usb.c
diff --git a/sys/dev/usb/usb.h b/sys/legacy/dev/usb/usb.h
index 7e64cac..7e64cac 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/legacy/dev/usb/usb.h
diff --git a/sys/dev/usb/usb_ethersubr.c b/sys/legacy/dev/usb/usb_ethersubr.c
index d0a3b83..d0a3b83 100644
--- a/sys/dev/usb/usb_ethersubr.c
+++ b/sys/legacy/dev/usb/usb_ethersubr.c
diff --git a/sys/dev/usb/usb_ethersubr.h b/sys/legacy/dev/usb/usb_ethersubr.h
index f3d2e34..f3d2e34 100644
--- a/sys/dev/usb/usb_ethersubr.h
+++ b/sys/legacy/dev/usb/usb_ethersubr.h
diff --git a/sys/dev/usb/usb_if.m b/sys/legacy/dev/usb/usb_if.m
index b04c8a4..b04c8a4 100644
--- a/sys/dev/usb/usb_if.m
+++ b/sys/legacy/dev/usb/usb_if.m
diff --git a/sys/dev/usb/usb_mem.c b/sys/legacy/dev/usb/usb_mem.c
index bbb0bf6..bbb0bf6 100644
--- a/sys/dev/usb/usb_mem.c
+++ b/sys/legacy/dev/usb/usb_mem.c
diff --git a/sys/dev/usb/usb_mem.h b/sys/legacy/dev/usb/usb_mem.h
index b8f0a14..b8f0a14 100644
--- a/sys/dev/usb/usb_mem.h
+++ b/sys/legacy/dev/usb/usb_mem.h
diff --git a/sys/dev/usb/usb_port.h b/sys/legacy/dev/usb/usb_port.h
index fd92d7b..fd92d7b 100644
--- a/sys/dev/usb/usb_port.h
+++ b/sys/legacy/dev/usb/usb_port.h
diff --git a/sys/dev/usb/usb_quirks.c b/sys/legacy/dev/usb/usb_quirks.c
index 2771bb7..2771bb7 100644
--- a/sys/dev/usb/usb_quirks.c
+++ b/sys/legacy/dev/usb/usb_quirks.c
diff --git a/sys/dev/usb/usb_quirks.h b/sys/legacy/dev/usb/usb_quirks.h
index 16e2f3f..16e2f3f 100644
--- a/sys/dev/usb/usb_quirks.h
+++ b/sys/legacy/dev/usb/usb_quirks.h
diff --git a/sys/dev/usb/usb_subr.c b/sys/legacy/dev/usb/usb_subr.c
index 29d044c..29d044c 100644
--- a/sys/dev/usb/usb_subr.c
+++ b/sys/legacy/dev/usb/usb_subr.c
diff --git a/sys/dev/usb/usbcdc.h b/sys/legacy/dev/usb/usbcdc.h
index d684108..d684108 100644
--- a/sys/dev/usb/usbcdc.h
+++ b/sys/legacy/dev/usb/usbcdc.h
diff --git a/sys/dev/usb/usbdevs b/sys/legacy/dev/usb/usbdevs
index 0a3d85e..0a3d85e 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/legacy/dev/usb/usbdevs
diff --git a/sys/dev/usb/usbdi.c b/sys/legacy/dev/usb/usbdi.c
index a733bbf..a733bbf 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/legacy/dev/usb/usbdi.c
diff --git a/sys/dev/usb/usbdi.h b/sys/legacy/dev/usb/usbdi.h
index ef59039..ef59039 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/legacy/dev/usb/usbdi.h
diff --git a/sys/dev/usb/usbdi_util.c b/sys/legacy/dev/usb/usbdi_util.c
index 78ea571..78ea571 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/legacy/dev/usb/usbdi_util.c
diff --git a/sys/dev/usb/usbdi_util.h b/sys/legacy/dev/usb/usbdi_util.h
index b535f0c..b535f0c 100644
--- a/sys/dev/usb/usbdi_util.h
+++ b/sys/legacy/dev/usb/usbdi_util.h
diff --git a/sys/dev/usb/usbdivar.h b/sys/legacy/dev/usb/usbdivar.h
index 603d691..603d691 100644
--- a/sys/dev/usb/usbdivar.h
+++ b/sys/legacy/dev/usb/usbdivar.h
diff --git a/sys/dev/usb/usbhid.h b/sys/legacy/dev/usb/usbhid.h
index 8e0ecd5..8e0ecd5 100644
--- a/sys/dev/usb/usbhid.h
+++ b/sys/legacy/dev/usb/usbhid.h
diff --git a/sys/dev/usb/uscanner.c b/sys/legacy/dev/usb/uscanner.c
index bff3a48..bff3a48 100644
--- a/sys/dev/usb/uscanner.c
+++ b/sys/legacy/dev/usb/uscanner.c
diff --git a/sys/dev/usb/uslcom.c b/sys/legacy/dev/usb/uslcom.c
index edb13c5..edb13c5 100644
--- a/sys/dev/usb/uslcom.c
+++ b/sys/legacy/dev/usb/uslcom.c
diff --git a/sys/dev/usb/uvisor.c b/sys/legacy/dev/usb/uvisor.c
index 6c4470e..6c4470e 100644
--- a/sys/dev/usb/uvisor.c
+++ b/sys/legacy/dev/usb/uvisor.c
diff --git a/sys/dev/usb/uvscom.c b/sys/legacy/dev/usb/uvscom.c
index ac311f7..ac311f7 100644
--- a/sys/dev/usb/uvscom.c
+++ b/sys/legacy/dev/usb/uvscom.c
diff --git a/sys/dev/usb/uxb360gp_rdesc.h b/sys/legacy/dev/usb/uxb360gp_rdesc.h
index b5a43f9..b5a43f9 100644
--- a/sys/dev/usb/uxb360gp_rdesc.h
+++ b/sys/legacy/dev/usb/uxb360gp_rdesc.h
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index a8e1f2b..d10bbcb 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -30,9 +30,7 @@ SUBDIR=	${_3dfx} \
 	${_asr} \
 	ata \
 	ath \
-	aue \
 	${_auxio} \
-	axe \
 	bce \
 	bfe \
 	bge \
@@ -47,7 +45,6 @@ SUBDIR=	${_3dfx} \
 	${_cbb} \
 	cd9660 \
 	cd9660_iconv \
-	cdce \
 	${_ce} \
 	${_ciss} \
 	${_cm} \
@@ -63,7 +60,6 @@ SUBDIR=	${_3dfx} \
 	${_cryptodev} \
 	${_cs} \
 	${_ctau} \
-	cue \
 	cxgb \
 	${_cyclic} \
 	dc \
@@ -76,7 +72,6 @@ SUBDIR=	${_3dfx} \
 	${_dtrace} \
 	dummynet \
 	${_ed} \
-	ehci \
 	${_elink} \
 	${_em} \
 	en \
@@ -145,7 +140,6 @@ SUBDIR=	${_3dfx} \
 	${_k8temp} \
 	kbdmux \
 	krpc \
-	kue \
 	le \
 	lge \
 	libalias \
@@ -205,7 +199,6 @@ SUBDIR=	${_3dfx} \
 	${_nwfs} \
 	${_nxge} \
 	${_opensolaris} \
-	ohci \
 	${_padlock} \
 	patm \
 	${_pccard} \
@@ -232,8 +225,6 @@ SUBDIR=	${_3dfx} \
 	re \
 	reiserfs \
 	rl \
-	rue \
-	rum \
 	${_s3} \
 	${_safe} \
 	${_sbni} \
@@ -243,7 +234,6 @@ SUBDIR=	${_3dfx} \
 	sdhci \
 	sem \
 	sf \
-	slhci \
 	sis \
 	sk \
 	${_smbfs} \
@@ -271,43 +261,13 @@ SUBDIR=	${_3dfx} \
 	twe \
 	tx \
 	txp \
-	u3g \
-	uark \
 	uart \
-	ubsa \
 	ubsec \
-	ucom \
-	udav \
-	udbp \
 	udf \
 	udf_iconv \
-	ufm \
 	${_ufs} \
-	ufoma \
-	uftdi \
-	ugen \
-	uhci \
-	uhid \
-	uipaq \
-	ukbd \
-	ulpt \
-	umass \
-	umct \
-	umodem \
-	ums \
 	unionfs \
-	${_upgt} \
-	uplcom \
-	ural \
-	urio \
-	${_urtw} \
-	usb \
-	usb2 \
-	uscanner \
-	uslcom \
 	utopia \
-	uvisor \
-	uvscom \
 	${_vesa} \
 	vge \
 	vkbd \
@@ -331,7 +291,6 @@ SUBDIR=	${_3dfx} \
 	xl \
 	${_zfs} \
 	zlib \
-	zyd
 
 .if ${MACHINE_ARCH} != "powerpc"
 _syscons=	syscons
@@ -440,8 +399,6 @@ _stg=		stg
 _streams=	streams
 _svr4=		svr4
 _tmpfs=		tmpfs
-_upgt=		upgt
-_urtw=		urtw
 _wi=		wi
 _xe=		xe
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
@@ -572,8 +529,6 @@ _speaker=	speaker
 _sppp=		sppp
 _tmpfs=		tmpfs
 _twa=		twa
-_upgt=		upgt
-_urtw=		urtw
 _wi=		wi
 _wpi=		wpi
 _wpifw=		wpifw
@@ -624,7 +579,6 @@ _an=		an
 _bm=		bm
 _nvram=		powermac_nvram
 _smbfs=		smbfs
-_upgt=		upgt
 .endif
 
 .if ${MACHINE_ARCH} == "sparc64"
@@ -633,7 +587,6 @@ _em=		em
 _i2c=		i2c
 _igb=		igb
 _sound=		sound
-_upgt=		upgt
 .if ${MK_ZFS} != "no" || defined(ALL_MODULES)
 _zfs=		zfs
 .endif
diff --git a/sys/modules/aue/Makefile b/sys/modules/aue/Makefile
deleted file mode 100644
index c8b3890..0000000
--- a/sys/modules/aue/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_aue
-SRCS=	if_aue.c opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/axe/Makefile b/sys/modules/axe/Makefile
deleted file mode 100644
index 4d82d5a..0000000
--- a/sys/modules/axe/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_axe
-SRCS=	if_axe.c opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/cdce/Makefile b/sys/modules/cdce/Makefile
deleted file mode 100644
index 9942ded..0000000
--- a/sys/modules/cdce/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_cdce
-SRCS=	if_cdce.c opt_usb.h device_if.h bus_if.h
-SRCS+=	usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/cue/Makefile b/sys/modules/cue/Makefile
deleted file mode 100644
index ae31329..0000000
--- a/sys/modules/cue/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_cue
-SRCS=	if_cue.c opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ehci/Makefile b/sys/modules/ehci/Makefile
deleted file mode 100644
index 2acf37b..0000000
--- a/sys/modules/ehci/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-
-.PATH: $S/dev/usb $S/pci
-
-KMOD=	ehci
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h \
-	ehci_pci.c ehci.c ehcireg.h ehcivar.h \
-	pci_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/kue/Makefile b/sys/modules/kue/Makefile
deleted file mode 100644
index d5271d1..0000000
--- a/sys/modules/kue/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_kue
-SRCS=	if_kue.c opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ohci/Makefile b/sys/modules/ohci/Makefile
deleted file mode 100644
index 59fcf76..0000000
--- a/sys/modules/ohci/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-
-.PATH: $S/dev/usb $S/pci
-
-KMOD=	ohci
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h \
-	ohci_pci.c ohci.c ohcireg.h ohcivar.h \
-	pci_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rue/Makefile b/sys/modules/rue/Makefile
deleted file mode 100644
index 1837eff..0000000
--- a/sys/modules/rue/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	if_rue
-SRCS=	if_rue.c opt_usb.h device_if.h bus_if.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rum/Makefile b/sys/modules/rum/Makefile
deleted file mode 100644
index ae9b8cc..0000000
--- a/sys/modules/rum/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD    = if_rum
-SRCS    = if_rum.c opt_usb.h device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/slhci/Makefile b/sys/modules/slhci/Makefile
deleted file mode 100644
index 422cf77..0000000
--- a/sys/modules/slhci/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../dev/usb
-
-KMOD=	slhci
-SRCS=	sl811hs.c slhci_pccard.c
-
-SRCS+=	bus_if.h device_if.h card_if.h power_if.h \
-	usbdevs.h pccarddevs.h \
-	opt_slhci.h opt_usb.h \
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/u3g/Makefile b/sys/modules/u3g/Makefile
deleted file mode 100644
index b2e1ffd..0000000
--- a/sys/modules/u3g/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	u3g
-SRCS=	opt_usb.h opt_u3g.h \
-	device_if.h bus_if.h \
-	usbdevs.h \
-	ucomvar.h \
-	u3g.c 
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uark/Makefile b/sys/modules/uark/Makefile
deleted file mode 100644
index 703cc85..0000000
--- a/sys/modules/uark/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	uark
-SRCS=	uark.c opt_usb.h bus_if.h device_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ubsa/Makefile b/sys/modules/ubsa/Makefile
deleted file mode 100644
index 1d7eb76..0000000
--- a/sys/modules/ubsa/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	ubsa
-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/ucom/Makefile b/sys/modules/ucom/Makefile
deleted file mode 100644
index bbd5c21..0000000
--- a/sys/modules/ucom/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	ucom
-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/udav/Makefile b/sys/modules/udav/Makefile
deleted file mode 100644
index fd7acf9..0000000
--- a/sys/modules/udav/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-KMOD=	if_udav
-SRCS=	if_udav.c opt_usb.h device_if.h bus_if.h opt_inet.h
-SRCS+=	miibus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
deleted file mode 100644
index aeeac7c..0000000
--- a/sys/modules/udbp/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	udbp
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h opt_netgraph.h \
-	udbp.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ufm/Makefile b/sys/modules/ufm/Makefile
deleted file mode 100644
index 28bbc90..0000000
--- a/sys/modules/ufm/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-.PATH:	${.CURDIR}/../../dev/usb
-KMOD=	ufm
-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/ufoma/Makefile b/sys/modules/ufoma/Makefile
deleted file mode 100644
index e89819c..0000000
--- a/sys/modules/ufoma/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	ufoma
-SRCS=	bus_if.h device_if.h opt_usb.h ufoma.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uftdi/Makefile b/sys/modules/uftdi/Makefile
deleted file mode 100644
index 65cb107..0000000
--- a/sys/modules/uftdi/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uftdi
-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
deleted file mode 100644
index d024a3a..0000000
--- a/sys/modules/ugen/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	ugen
-SRCS=	bus_if.h device_if.h opt_usb.h ugen.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uhci/Makefile b/sys/modules/uhci/Makefile
deleted file mode 100644
index b7c7666..0000000
--- a/sys/modules/uhci/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-
-.PATH: $S/dev/usb $S/pci
-
-KMOD=	uhci
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h \
-	uhci_pci.c uhci.c uhcireg.h uhcivar.h \
-	pci_if.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
deleted file mode 100644
index 31c5a17..0000000
--- a/sys/modules/uhid/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	uhid
-SRCS=	bus_if.h device_if.h opt_usb.h uhid.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uipaq/Makefile b/sys/modules/uipaq/Makefile
deleted file mode 100644
index d8378fa..0000000
--- a/sys/modules/uipaq/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uipaq
-SRCS=	uipaq.c opt_usb.h device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
deleted file mode 100644
index 331e729..0000000
--- a/sys/modules/ukbd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	ukbd
-SRCS=	bus_if.h device_if.h opt_compat.h opt_usb.h opt_kbd.h opt_ukbd.h \
-	usbdevs.h ukbd.c
-
-.if !defined(KERNBUILDDIR)
-opt_compat.h:
-	echo "#define COMPAT_FREEBSD6 1" > ${.TARGET}
-
-opt_kbd.h:
-	echo "#define KBD_INSTALL_CDEV 1" > ${.TARGET}
-.endif
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
deleted file mode 100644
index c7d51c3..0000000
--- a/sys/modules/ulpt/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	ulpt
-SRCS=	bus_if.h device_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
deleted file mode 100644
index 4af29fe..0000000
--- a/sys/modules/umass/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	umass
-SRCS=	bus_if.h device_if.h \
-	opt_usb.h opt_cam.h opt_scsi.h \
-	umass.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/umct/Makefile b/sys/modules/umct/Makefile
deleted file mode 100644
index ccd775f..0000000
--- a/sys/modules/umct/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	umct
-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
deleted file mode 100644
index 458a2c3..0000000
--- a/sys/modules/umodem/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	umodem
-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
deleted file mode 100644
index fee3843..0000000
--- a/sys/modules/ums/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	ums
-SRCS=	bus_if.h device_if.h opt_usb.h ums.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/upgt/Makefile b/sys/modules/upgt/Makefile
deleted file mode 100644
index ae40e48..0000000
--- a/sys/modules/upgt/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# Conexant/Intersil PrismGT SoftMAC(GW3887) USB devices
-#
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD    = if_upgt
-SRCS    = if_upgt.c opt_usb.h device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uplcom/Makefile b/sys/modules/uplcom/Makefile
deleted file mode 100644
index 36115cc..0000000
--- a/sys/modules/uplcom/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uplcom
-SRCS=	uplcom.c ucomvar.h opt_usb.h opt_uplcom.h \
-	device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/ural/Makefile b/sys/modules/ural/Makefile
deleted file mode 100644
index 7076e811..0000000
--- a/sys/modules/ural/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD    = if_ural
-SRCS    = if_ural.c opt_usb.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
deleted file mode 100644
index 0221c5d..0000000
--- a/sys/modules/urio/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$ 
-
-MAINTAINER=	Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	urio
-SRCS=	bus_if.h device_if.h opt_usb.h urio.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/urtw/Makefile b/sys/modules/urtw/Makefile
deleted file mode 100644
index 3857e4a..0000000
--- a/sys/modules/urtw/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD    = if_urtw
-SRCS    = if_urtw.c if_urtwvar.h if_urtwreg.h opt_usb.h device_if.h	\
-	  bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
deleted file mode 100644
index 9f9cdbc..0000000
--- a/sys/modules/usb/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-
-.PATH: $S/dev/usb $S/pci
-
-KMOD=	usb
-SRCS=	bus_if.h device_if.h usb_if.h usb_if.c \
-	opt_usb.h \
-	hid.c hid.h usbhid.h \
-	uhub.c \
-	usb.c usb.h \
-	usb_mem.c usb_mem.h \
-	usb_port.h \
-	usb_quirks.c usb_quirks.h \
-	usb_subr.c \
-	usbdevs.h usbdevs_data.h \
-	usbdi.c usbdi.h usbdivar.h \
-	usbdi_util.c usbdi_util.h \
-	usb_ethersubr.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
deleted file mode 100644
index fa34856..0000000
--- a/sys/modules/uscanner/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD=	 uscanner
-SRCS=	bus_if.h device_if.h opt_usb.h uscanner.c usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uslcom/Makefile b/sys/modules/uslcom/Makefile
deleted file mode 100644
index e5dc96c..0000000
--- a/sys/modules/uslcom/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uslcom
-SRCS=	uslcom.c opt_usb.h \
-	device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/uvisor/Makefile b/sys/modules/uvisor/Makefile
deleted file mode 100644
index feb74df..0000000
--- a/sys/modules/uvisor/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uvisor
-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
deleted file mode 100644
index ceb1959..0000000
--- a/sys/modules/uvscom/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-S=	${.CURDIR}/../..
-.PATH: $S/dev/usb
-
-KMOD=	uvscom
-SRCS=	uvscom.c ucomvar.h opt_usb.h opt_uvscom.h \
-	device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/zyd/Makefile b/sys/modules/zyd/Makefile
deleted file mode 100644
index 95a7be8..0000000
--- a/sys/modules/zyd/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# ZyDAS Loadable Kernel Module
-#
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../dev/usb
-
-KMOD    = if_zyd
-SRCS    = if_zyd.c opt_usb.h device_if.h bus_if.h usbdevs.h
-
-.include <bsd.kmod.mk>
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 5a4efcc..c9fefd8 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -406,7 +406,7 @@ _crunch=	crunch
 .endif
 
 .if ${MK_USB} != "no"
-_usbdevs=	usbdevs
+#_usbdevs=	usbdevs
 _usbconfig=	usbconfig
 .endif