20 files changed, 54 insertions, 92 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index fe89be7e390..1e7ea3c4a17 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -749,7 +749,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cons.ph
@@ -1192,7 +1191,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/xmaciireg.ph
@@ -1961,6 +1959,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/sdvar.ph
@@ -2251,4 +2250,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d3464a99ecd..5bbbfdd5769 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -762,7 +762,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cons.ph
@@ -1205,7 +1204,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/xmaciireg.ph
@@ -1448,6 +1446,24 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/FlexLexer.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algo.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algobase.ph
@@ -1554,24 +1570,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.7/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/glob.ph
@@ -1989,6 +1987,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/sdvar.ph
@@ -2282,4 +2281,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 367c5958c38..965796765ae 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1,4 +1,3 @@
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_ses.ph
 ./etc/firmware/3c990
 ./etc/firmware/3c990-license
 ./etc/firmware/atu-at76c503-i3863-ext
@@ -796,7 +795,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cons.ph
@@ -1239,7 +1237,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/xmaciireg.ph
@@ -2023,6 +2020,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/sdvar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 3202474edf8..84f3dee7a79 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1,4 +1,3 @@
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
 ./sbin/ldconfig
 ./sbin/wsconsctl
 ./usr/bin/ldd
@@ -657,7 +656,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -1100,7 +1098,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/xmaciireg.ph
@@ -1946,6 +1943,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/sdvar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index e0447fb64bd..29a890e176b 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -693,7 +693,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cons.ph
@@ -1136,7 +1135,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/xmaciireg.ph
@@ -1970,6 +1968,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/sdvar.ph
@@ -2239,4 +2238,3 @@
 ./usr/mdec/xxboot
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 7c9e5579df0..944dea94427 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -693,7 +693,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/cons.ph
@@ -1136,7 +1135,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/xmaciireg.ph
@@ -1970,6 +1968,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/sdvar.ph
@@ -2239,4 +2238,3 @@
 ./usr/mdec/xxboot
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index dd1c957fd72..85582b6760c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -702,7 +702,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cons.ph
@@ -1145,7 +1144,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/xmaciireg.ph
@@ -2004,6 +2002,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/sdvar.ph
@@ -2305,4 +2304,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index b22254a50d5..1d2986eb9fe 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -589,7 +589,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cons.ph
@@ -1032,7 +1031,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/xmaciireg.ph
@@ -1886,6 +1884,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/sdvar.ph
@@ -2144,4 +2143,3 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zlib.ph
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 9073fab0982..d9b5cd6bf34 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,4 +1,3 @@
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
 ./sbin/ldconfig
 ./sbin/pdisk
 ./usr/bin/ldd
@@ -657,7 +656,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -1100,7 +1098,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/xmaciireg.ph
@@ -1951,6 +1948,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/sdvar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d455ab03141..c8f001e1b64 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1,4 +1,3 @@
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_ses.ph
 ./etc/firmware/3c990
 ./etc/firmware/3c990-license
 ./etc/firmware/atu-at76c503-i3863-ext
@@ -700,7 +699,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cons.ph
@@ -1143,7 +1141,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/xmaciireg.ph
@@ -2019,6 +2016,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/sdvar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e0d8b664bdb..2b81340f803 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -655,7 +655,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cons.ph
@@ -1098,7 +1097,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/xmaciireg.ph
@@ -1946,6 +1944,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/sdvar.ph
@@ -2213,4 +2212,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index a6d2fb7661e..7a175f9f4f9 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -588,7 +588,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cons.ph
@@ -1031,7 +1030,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/xmaciireg.ph
@@ -1895,6 +1893,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/sdvar.ph
@@ -2159,4 +2158,3 @@
 ./usr/mdec/netboot
 ./usr/mdec/stboot
 ./usr/mdec/tftpboot
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 4701fd267ff..0149bf308ba 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -690,7 +690,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cons.ph
@@ -1130,7 +1129,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/xmaciireg.ph
@@ -1945,6 +1943,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/sdvar.ph
@@ -2209,4 +2208,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 40d29e8ff25..e8300c881a2 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -697,7 +697,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cons.ph
@@ -1140,7 +1139,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/xmaciireg.ph
@@ -1966,6 +1964,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/sdvar.ph
@@ -2275,4 +2274,3 @@
 ./usr/mdec/boot
 ./usr/mdec/sgivol
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 67695eaef6a..224caee62c5 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -156,7 +156,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cons.ph
@@ -599,7 +598,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/xmaciireg.ph
@@ -1368,6 +1366,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/sdvar.ph
@@ -2200,4 +2199,3 @@
 ./usr/sbin/fdformat
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index b27247d2fe2..dc06f7989e0 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -182,7 +182,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cons.ph
@@ -625,7 +624,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/xmaciireg.ph
@@ -1409,6 +1407,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/sdvar.ph
@@ -2241,4 +2240,3 @@
 ./usr/sbin/fdformat
 ./usr/sbin/hotplugd
 ./usr/sbin/wsconscfg
-./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 2143f8cad6b..a67b0f55f33 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -93,7 +93,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cons.ph
@@ -536,7 +535,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/xmaciireg.ph
@@ -1303,6 +1301,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/sdvar.ph
@@ -2119,4 +2118,3 @@
 ./usr/mdec/raboot
 ./usr/mdec/sdboot
 ./usr/mdec/xxboot
-./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index db9436d98ea..1f8eaac32a2 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -735,7 +735,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/rbus.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/usb_cardbus.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ccdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/clock_subr.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cons.ph
@@ -1178,7 +1177,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/tgavar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/ubsecreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/ubsecvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/usb_pci.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/vga_pcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/wdt50x.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/xmaciireg.ph
@@ -1962,6 +1960,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_message.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_scanner.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_ses.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_tape.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsiconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/sdvar.ph
@@ -2279,4 +2278,3 @@
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
 ./usr/sbin/zzz
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_ses.ph
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 0d2d7b529a7..0ed7bb53412 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -73,6 +73,24 @@
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dis-asm.h
+./usr/include/g++/amd64-unknown-openbsd3.7
+./usr/include/g++/amd64-unknown-openbsd3.7/bits
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd3.7/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -202,24 +220,6 @@
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
-./usr/include/g++/amd64-unknown-openbsd3.7
-./usr/include/g++/amd64-unknown-openbsd3.7/bits
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/atomicity.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/codecvt_specializations.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd3.7/bits/time_members.h
 ./usr/include/ieeefp.h
 ./usr/include/unwind.h
 ./usr/lib/crtbegin.o
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 28669ba987d..568ace5a24c 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -112,7 +112,6 @@
 ./usr/include/dev/cardbus/cardbusvar.h
 ./usr/include/dev/cardbus/cardslotvar.h
 ./usr/include/dev/cardbus/rbus.h
-./usr/include/dev/cardbus/usb_cardbus.h
 ./usr/include/dev/ccdvar.h
 ./usr/include/dev/clock_subr.h
 ./usr/include/dev/cons.h
@@ -555,7 +554,6 @@
 ./usr/include/dev/pci/tgavar.h
 ./usr/include/dev/pci/ubsecreg.h
 ./usr/include/dev/pci/ubsecvar.h
-./usr/include/dev/pci/usb_pci.h
 ./usr/include/dev/pci/vga_pcivar.h
 ./usr/include/dev/pci/wdt50x.h
 ./usr/include/dev/pci/xmaciireg.h