sync

14 files changed, 38 insertions, 38 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 486fd52c365..8b82e138c52 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1019,7 +1019,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_quirks.ph
@@ -1029,7 +1029,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/ascii.ph
@@ -1792,7 +1792,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 14d26d49c92..7b79cf64de9 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1021,7 +1021,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -1031,7 +1031,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
@@ -1827,7 +1827,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index b5818adba5d..7e66698abc1 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -982,7 +982,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -992,7 +992,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
@@ -1824,7 +1824,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index fd5155d56d1..bc671a0bd36 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -986,7 +986,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_quirks.ph
@@ -996,7 +996,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/ascii.ph
@@ -1815,7 +1815,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 97ef5a78748..ae53d57e5ba 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -977,7 +977,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -987,7 +987,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
@@ -1820,7 +1820,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d8a90dc5259..46d20591434 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -970,7 +970,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_quirks.ph
@@ -980,7 +980,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/ascii.ph
@@ -1837,7 +1837,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 9b35af4a8ca..5f17212e7e0 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -981,7 +981,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -991,7 +991,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
@@ -1825,7 +1825,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index a85812bfcd9..d4db7b65392 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -577,7 +577,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/swap.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/timeout.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/termcap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pmap.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 227d0a9ea7a..0d18cc4ca6c 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -963,7 +963,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_quirks.ph
@@ -973,7 +973,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/ascii.ph
@@ -1785,7 +1785,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index d17766b95d1..08922f0911d 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -641,7 +641,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_quirks.ph
@@ -651,7 +651,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/ascii.ph
@@ -1470,7 +1470,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 956fbcbc11b..0da50ad7f60 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -619,7 +619,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_quirks.ph
@@ -629,7 +629,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/ascii.ph
@@ -1445,7 +1445,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index c7c5f29b88e..101c6206d2a 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1839,7 +1839,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/utmp.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index e6ccb43b992..00d00ecb291 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -583,7 +583,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_quirks.ph
@@ -593,7 +593,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/wscons/ascii.ph
@@ -1355,7 +1355,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ufs/ufs/ufsmount.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/unctrl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/unistd.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/usb.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/usbhid.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/util.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/utime.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/utmp.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index bd86ca536ca..45ff041453a 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1426,7 +1426,7 @@
 ./usr/include/ufs/ufs/ufsmount.h
 ./usr/include/unctrl.h
 ./usr/include/unistd.h
-./usr/include/usb.h
+./usr/include/usbhid.h
 ./usr/include/util.h
 ./usr/include/utime.h
 ./usr/include/utmp.h
@@ -1629,7 +1629,7 @@
 ./usr/lib/libtermcap_p.a
 ./usr/lib/libtermlib.a
 ./usr/lib/libtermlib_p.a
-./usr/lib/libusb.a
+./usr/lib/libusbhid.a
 ./usr/lib/libutil.a
 ./usr/lib/libutil_p.a
 ./usr/lib/libwrap.a
@@ -4300,7 +4300,7 @@
 ./usr/share/man/cat3/untouchwin.0
 ./usr/share/man/cat3/unvis.0
 ./usr/share/man/cat3/update_panels.0
-./usr/share/man/cat3/usb.0
+./usr/share/man/cat3/usbhid.0
 ./usr/share/man/cat3/use_default_colors.0
 ./usr/share/man/cat3/use_env.0
 ./usr/share/man/cat3/use_extended_names.0