19 files changed, 19 insertions, 57 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 3c01a6fa206..f9762681b9d 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -738,13 +738,11 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d79f090acb9..7e6127fa50a 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -753,13 +753,11 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 07b02836be9..8d99911215a 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -783,13 +783,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 31dd02d4731..8aaf5a5a431 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -645,13 +645,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index b43b2bd3e2b..a162aa80463 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -682,13 +682,11 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index a0f05c87879..0fe421a4b07 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -683,13 +683,11 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 03b9b888daa..35e14b9d225 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -691,13 +691,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 022968db1ae..d68908a4606 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -575,13 +575,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 2027bfc6446..df5016fe586 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -644,13 +644,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 5e554e5c8ae..0d98b1a0582 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -688,13 +688,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index f8cffe23b0c..3b8f8cd5426 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -643,13 +643,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 32c4a2104c0..4649680a827 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -574,13 +574,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 25563e07e5a..249ca004d9d 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -679,13 +679,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 49a1eabbfec..9b1299f7024 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -686,13 +686,11 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 5ae000e7dc9..0af3d9c1696 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -144,13 +144,11 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index dcba64142c2..0f81b533160 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -171,13 +171,11 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 22835fb0511..add6d656483 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -79,13 +79,11 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 496531292cc..15001d0c38a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -724,13 +724,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/des.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpiac.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpibat.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpidev.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/dsdt.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/hpetreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index f55182ec8ee..b4a5b1f64dc 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -100,13 +100,11 @@
 ./usr/include/des.h
 ./usr/include/dev
 ./usr/include/dev/acpi
-./usr/include/dev/acpi/acpiac.h
-./usr/include/dev/acpi/acpibat.h
+./usr/include/dev/acpi/acpidev.h
 ./usr/include/dev/acpi/acpireg.h
 ./usr/include/dev/acpi/acpivar.h
 ./usr/include/dev/acpi/amltypes.h
 ./usr/include/dev/acpi/dsdt.h
-./usr/include/dev/acpi/hpetreg.h
 ./usr/include/dev/ata
 ./usr/include/dev/ata/atareg.h
 ./usr/include/dev/ata/atavar.h