sync

37 files changed, 3 insertions, 109 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index bc551c05649..b89f8f615ec 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -614,7 +614,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/_types.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/alpha_cpu.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/ansi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/aout_machdep.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/asm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/atomic.ph
@@ -664,7 +663,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/stdarg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/sysarch.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/tc_machdep.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/types.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/varargs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/vmparam.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/wsconsio.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 6d766abc79b..5d97f942fa6 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -626,7 +626,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/altq/if_altq.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/_types.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/ansi.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/apicvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/apmvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/asm.ph
@@ -693,7 +692,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/sysarch.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/trap.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/tss.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/types.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/userret.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/amd64/vmparam.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ar.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 0bae934e197..789f33fa18c 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -629,7 +629,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/arm/ansi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/apmvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/armreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/asm.ph
@@ -678,7 +677,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/swi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/sysarch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/arm/types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/undefined.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa
@@ -697,7 +695,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/cast.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/cats/ansi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/asm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/atomic.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/bootconfig.ph
@@ -740,7 +737,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/stdarg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/sysarch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/cats/types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cats/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/com_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/cpio.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 90b9fc599f9..e63cfb39e56 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1480,7 +1480,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/histedit.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/autoconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/bus.ph
@@ -1515,7 +1514,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/spinlock.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/hp300/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ieeefp.ph
@@ -1577,7 +1575,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm_single.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/cdefs.ph
@@ -1607,7 +1604,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/sysctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/machine
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 05d4748b0c1..76806098ac6 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1533,7 +1533,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/histedit.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/_types.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ansi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/asm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/autoconf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/bus.ph
@@ -1579,7 +1578,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/spinlock.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/stdarg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/trap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/types.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/varargs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/vmparam.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ieeefp.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 347cde0bf11..cd9c1422362 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1532,7 +1532,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/grp.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/histedit.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa
-./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/ansi.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/asm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/autoconf.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/bus.ph
@@ -1578,7 +1577,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/spinlock.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/stdarg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/trap.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/types.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/varargs.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa/vmparam.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/hppa64/_types.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 48086b10a90..1eab99b8d02 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1543,7 +1543,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/histedit.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/_types.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/i386/ansi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/apicvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/apmvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/asm.ph
@@ -1609,7 +1608,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/sysarch.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/trap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/tss.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/i386/types.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/varargs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/vm86.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/vmparam.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index febd15719fc..339ac38933a 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1467,7 +1467,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/_types.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/ansi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/asm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/asm_macro.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/autoconf.ph
@@ -1509,13 +1508,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/trap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/va-m88k.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/varargs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/luna88k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/_types.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/ansi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/asm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/asm_macro.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/cdefs.ph
@@ -1551,7 +1548,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/trap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/va-m88k.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/varargs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/vmparam.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 87c92c99a76..7999038c630 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1536,7 +1536,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm_single.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/cdefs.ph
@@ -1566,13 +1565,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/sysctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/adbsys.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/autoconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/bus.ph
@@ -1609,7 +1606,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/viareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/vmparam.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 045982ee01e..797de7c3124 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1598,7 +1598,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/adbsys.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/ansi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/apmvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/asm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/autoconf.ph
@@ -1642,7 +1641,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/spinlock.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/stdarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/trap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/va-ppc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/varargs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/vmparam.ph
@@ -1908,7 +1906,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/poll.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/_types.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ansi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/asm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/bat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/cdefs.ph
@@ -1943,7 +1940,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/spinlock.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/stdarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/trap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/va-ppc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/varargs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/wsconsio.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 7f1db1b8bba..c8e4b0a938e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1535,7 +1535,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/asm_single.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/cdefs.ph
@@ -1565,7 +1564,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/sysctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/machine
@@ -1587,7 +1585,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/ansi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/autoconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/bugio.ph
@@ -1624,7 +1621,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/trap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/varargs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mvme68k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ncurses.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index d7a3517b2d1..422101079ca 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1466,7 +1466,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/_types.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/ansi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/asm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/asm_macro.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/cdefs.ph
@@ -1502,7 +1501,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/trap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/va-m88k.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/varargs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/vmparam.ph
@@ -1525,7 +1523,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/_types.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/ansi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/asm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/asm_macro.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/autoconf.ph
@@ -1576,7 +1573,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/spinlock.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/stdarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/trap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/va-m88k.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/varargs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/mvme88k/vid.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 1743a74d73d..7c7e25d49db 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1827,7 +1827,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/adbsys.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ansi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/asm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/autoconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/bat.ph
@@ -1845,7 +1844,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieee.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieeefp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/internal_types.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/internal_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/intr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ipkdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/kbio.ph
@@ -1869,7 +1867,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/spinlock.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/stdarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/trap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/va-ppc.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/varargs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/vmparam.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index e812e71507e..e8406a88072 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1601,7 +1601,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/menu.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/_types.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/ansi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/arcbios.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/archtype.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/asm.ph
@@ -1639,7 +1638,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/spinlock.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/stdarg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/trap.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/types.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/varargs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/mips64/vmparam.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/miscfs
@@ -1973,7 +1971,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/_types.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/ansi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/asm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/autoconf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/bus.ph
@@ -2013,7 +2010,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/spinlock.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/stdarg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/trap.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/types.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/varargs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgi/vmparam.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sgtty.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 04e325e94f8..7335dce914d 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1380,7 +1380,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/soundcard.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/_types.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ansi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/apmvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/asm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/autoconf.ph
@@ -1431,7 +1430,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/sun_disklabel.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/svr4_machdep.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/trap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/types.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/varargs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/vmparam.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/z8530var.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 0369b56ae7b..204eb58c930 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1422,7 +1422,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/soundcard.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/_types.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/ansi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/asm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/autoconf.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/boot_flag.ph
@@ -1474,7 +1473,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/spinlock.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/stdarg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/trap.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/types.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/varargs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/vmparam.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/z8530var.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index a884f2b9527..e106e7a561e 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1528,7 +1528,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/varargs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/_types.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vax/ansi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/aout_machdep.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/asm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/bus.ph
@@ -1578,7 +1577,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/spinlock.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/stdarg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/trap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/vax/types.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/uvax.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/varargs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/vmparam.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index d441f8f87c7..b726c7c57e5 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -616,7 +616,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/arm/ansi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/apmvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/armreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/asm.ph
@@ -665,7 +664,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/swi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/sysarch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/arm/types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/undefined.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa
@@ -2218,7 +2216,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/xfs/xfs_vopdefs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/ansi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/apmvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/asm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/atomic.ph
@@ -2262,7 +2259,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/stdarg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/sysarch.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/zaurus_reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/zaurus_var.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 8e30af008ff..69f6b8e7f37 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -4,7 +4,6 @@
 ./usr/include/alpha
 ./usr/include/alpha/_types.h
 ./usr/include/alpha/alpha_cpu.h
-./usr/include/alpha/ansi.h
 ./usr/include/alpha/aout_machdep.h
 ./usr/include/alpha/asm.h
 ./usr/include/alpha/atomic.h
@@ -54,7 +53,6 @@
 ./usr/include/alpha/stdarg.h
 ./usr/include/alpha/sysarch.h
 ./usr/include/alpha/tc_machdep.h
-./usr/include/alpha/types.h
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
 ./usr/include/alpha/wsconsio.h
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 411aa74679f..160d6c01860 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -3,7 +3,6 @@
 ./usr/bin/readelf
 ./usr/include/amd64
 ./usr/include/amd64/_types.h
-./usr/include/amd64/ansi.h
 ./usr/include/amd64/apicvar.h
 ./usr/include/amd64/apmvar.h
 ./usr/include/amd64/asm.h
@@ -70,7 +69,6 @@
 ./usr/include/amd64/sysarch.h
 ./usr/include/amd64/trap.h
 ./usr/include/amd64/tss.h
-./usr/include/amd64/types.h
 ./usr/include/amd64/userret.h
 ./usr/include/amd64/vmparam.h
 ./usr/include/bfd.h
diff --git a/distrib/sets/lists/comp/md.cats b/distrib/sets/lists/comp/md.cats
index 49ae81c90db..3d80fba7a79 100644
--- a/distrib/sets/lists/comp/md.cats
+++ b/distrib/sets/lists/comp/md.cats
@@ -4,7 +4,6 @@
 ./usr/bin/readelf
 ./usr/include/arm
 ./usr/include/arm/_types.h
-./usr/include/arm/ansi.h
 ./usr/include/arm/apmvar.h
 ./usr/include/arm/armreg.h
 ./usr/include/arm/asm.h
@@ -53,14 +52,12 @@
 ./usr/include/arm/swi.h
 ./usr/include/arm/sysarch.h
 ./usr/include/arm/trap.h
-./usr/include/arm/types.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/cats
 ./usr/include/cats/_types.h
-./usr/include/cats/ansi.h
 ./usr/include/cats/asm.h
 ./usr/include/cats/atomic.h
 ./usr/include/cats/bootconfig.h
@@ -103,7 +100,6 @@
 ./usr/include/cats/stdarg.h
 ./usr/include/cats/sysarch.h
 ./usr/include/cats/trap.h
-./usr/include/cats/types.h
 ./usr/include/cats/vmparam.h
 ./usr/include/dis-asm.h
 ./usr/include/g++/arm-unknown-openbsd3.8
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index b11bf48ab45..f96bb61755f 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -110,7 +110,6 @@
 ./usr/include/g++/vector.h
 ./usr/include/hp300
 ./usr/include/hp300/_types.h
-./usr/include/hp300/ansi.h
 ./usr/include/hp300/asm.h
 ./usr/include/hp300/autoconf.h
 ./usr/include/hp300/bus.h
@@ -145,13 +144,11 @@
 ./usr/include/hp300/spinlock.h
 ./usr/include/hp300/stdarg.h
 ./usr/include/hp300/trap.h
-./usr/include/hp300/types.h
 ./usr/include/hp300/varargs.h
 ./usr/include/hp300/vmparam.h
 ./usr/include/ieeefp.h
 ./usr/include/m68k
 ./usr/include/m68k/_types.h
-./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cdefs.h
@@ -181,7 +178,6 @@
 ./usr/include/m68k/stdarg.h
 ./usr/include/m68k/sysctl.h
 ./usr/include/m68k/trap.h
-./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/SYSCALLS.c.X
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 8faa600783d..68c8bb5dcfe 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -153,7 +153,6 @@
 ./usr/include/g++/streambuf
 ./usr/include/hppa
 ./usr/include/hppa/_types.h
-./usr/include/hppa/ansi.h
 ./usr/include/hppa/asm.h
 ./usr/include/hppa/autoconf.h
 ./usr/include/hppa/bus.h
@@ -199,7 +198,6 @@
 ./usr/include/hppa/spinlock.h
 ./usr/include/hppa/stdarg.h
 ./usr/include/hppa/trap.h
-./usr/include/hppa/types.h
 ./usr/include/hppa/varargs.h
 ./usr/include/hppa/vmparam.h
 ./usr/include/ieeefp.h
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 42bbd2c6d88..891e76d8449 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -153,7 +153,6 @@
 ./usr/include/g++/streambuf
 ./usr/include/hppa64
 ./usr/include/hppa64/_types.h
-./usr/include/hppa64/ansi.h
 ./usr/include/hppa64/asm.h
 ./usr/include/hppa64/autoconf.h
 ./usr/include/hppa64/bus.h
@@ -199,7 +198,6 @@
 ./usr/include/hppa64/spinlock.h
 ./usr/include/hppa64/stdarg.h
 ./usr/include/hppa64/trap.h
-./usr/include/hppa64/types.h
 ./usr/include/hppa64/varargs.h
 ./usr/include/hppa64/vmparam.h
 ./usr/include/ieeefp.h
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 5264fa6a3e7..a99be2e4d74 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -154,7 +154,6 @@
 ./usr/include/g++/streambuf
 ./usr/include/i386
 ./usr/include/i386/_types.h
-./usr/include/i386/ansi.h
 ./usr/include/i386/apicvar.h
 ./usr/include/i386/apmvar.h
 ./usr/include/i386/asm.h
@@ -220,7 +219,6 @@
 ./usr/include/i386/sysarch.h
 ./usr/include/i386/trap.h
 ./usr/include/i386/tss.h
-./usr/include/i386/types.h
 ./usr/include/i386/varargs.h
 ./usr/include/i386/vm86.h
 ./usr/include/i386/vmparam.h
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 28909f36ba3..f2f03a17178 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -111,7 +111,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/luna88k
 ./usr/include/luna88k/_types.h
-./usr/include/luna88k/ansi.h
 ./usr/include/luna88k/asm.h
 ./usr/include/luna88k/asm_macro.h
 ./usr/include/luna88k/autoconf.h
@@ -153,13 +152,11 @@
 ./usr/include/luna88k/spinlock.h
 ./usr/include/luna88k/stdarg.h
 ./usr/include/luna88k/trap.h
-./usr/include/luna88k/types.h
 ./usr/include/luna88k/va-m88k.h
 ./usr/include/luna88k/varargs.h
 ./usr/include/luna88k/vmparam.h
 ./usr/include/m88k
 ./usr/include/m88k/_types.h
-./usr/include/m88k/ansi.h
 ./usr/include/m88k/asm.h
 ./usr/include/m88k/asm_macro.h
 ./usr/include/m88k/cdefs.h
@@ -195,7 +192,6 @@
 ./usr/include/m88k/spinlock.h
 ./usr/include/m88k/stdarg.h
 ./usr/include/m88k/trap.h
-./usr/include/m88k/types.h
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 232ce88e653..5187e05f1f3 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -111,7 +111,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/m68k
 ./usr/include/m68k/_types.h
-./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cdefs.h
@@ -141,13 +140,11 @@
 ./usr/include/m68k/stdarg.h
 ./usr/include/m68k/sysctl.h
 ./usr/include/m68k/trap.h
-./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
 ./usr/include/mac68k
 ./usr/include/mac68k/_types.h
 ./usr/include/mac68k/adbsys.h
-./usr/include/mac68k/ansi.h
 ./usr/include/mac68k/asm.h
 ./usr/include/mac68k/autoconf.h
 ./usr/include/mac68k/bus.h
@@ -184,7 +181,6 @@
 ./usr/include/mac68k/spinlock.h
 ./usr/include/mac68k/stdarg.h
 ./usr/include/mac68k/trap.h
-./usr/include/mac68k/types.h
 ./usr/include/mac68k/varargs.h
 ./usr/include/mac68k/viareg.h
 ./usr/include/mac68k/vmparam.h
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 15799e2774c..290c7753c95 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -155,7 +155,6 @@
 ./usr/include/macppc
 ./usr/include/macppc/_types.h
 ./usr/include/macppc/adbsys.h
-./usr/include/macppc/ansi.h
 ./usr/include/macppc/apmvar.h
 ./usr/include/macppc/asm.h
 ./usr/include/macppc/autoconf.h
@@ -199,7 +198,6 @@
 ./usr/include/macppc/spinlock.h
 ./usr/include/macppc/stdarg.h
 ./usr/include/macppc/trap.h
-./usr/include/macppc/types.h
 ./usr/include/macppc/va-ppc.h
 ./usr/include/macppc/varargs.h
 ./usr/include/macppc/vmparam.h
@@ -207,7 +205,6 @@
 ./usr/include/macppc/z8530var.h
 ./usr/include/powerpc
 ./usr/include/powerpc/_types.h
-./usr/include/powerpc/ansi.h
 ./usr/include/powerpc/asm.h
 ./usr/include/powerpc/bat.h
 ./usr/include/powerpc/cdefs.h
@@ -242,7 +239,6 @@
 ./usr/include/powerpc/spinlock.h
 ./usr/include/powerpc/stdarg.h
 ./usr/include/powerpc/trap.h
-./usr/include/powerpc/types.h
 ./usr/include/powerpc/va-ppc.h
 ./usr/include/powerpc/varargs.h
 ./usr/include/powerpc/wsconsio.h
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index dd6c351e6b5..cf18397a78d 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -111,7 +111,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/m68k
 ./usr/include/m68k/_types.h
-./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cdefs.h
@@ -141,12 +140,10 @@
 ./usr/include/m68k/stdarg.h
 ./usr/include/m68k/sysctl.h
 ./usr/include/m68k/trap.h
-./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
 ./usr/include/mvme68k
 ./usr/include/mvme68k/_types.h
-./usr/include/mvme68k/ansi.h
 ./usr/include/mvme68k/asm.h
 ./usr/include/mvme68k/autoconf.h
 ./usr/include/mvme68k/bugio.h
@@ -183,7 +180,6 @@
 ./usr/include/mvme68k/spinlock.h
 ./usr/include/mvme68k/stdarg.h
 ./usr/include/mvme68k/trap.h
-./usr/include/mvme68k/types.h
 ./usr/include/mvme68k/varargs.h
 ./usr/include/mvme68k/vmparam.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/SYSCALLS.c.X
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index f39bfb48744..7706165aeef 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -111,7 +111,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/m88k
 ./usr/include/m88k/_types.h
-./usr/include/m88k/ansi.h
 ./usr/include/m88k/asm.h
 ./usr/include/m88k/asm_macro.h
 ./usr/include/m88k/cdefs.h
@@ -147,13 +146,11 @@
 ./usr/include/m88k/spinlock.h
 ./usr/include/m88k/stdarg.h
 ./usr/include/m88k/trap.h
-./usr/include/m88k/types.h
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
 ./usr/include/mvme88k
 ./usr/include/mvme88k/_types.h
-./usr/include/mvme88k/ansi.h
 ./usr/include/mvme88k/asm.h
 ./usr/include/mvme88k/asm_macro.h
 ./usr/include/mvme88k/autoconf.h
@@ -204,7 +201,6 @@
 ./usr/include/mvme88k/spinlock.h
 ./usr/include/mvme88k/stdarg.h
 ./usr/include/mvme88k/trap.h
-./usr/include/mvme88k/types.h
 ./usr/include/mvme88k/va-m88k.h
 ./usr/include/mvme88k/varargs.h
 ./usr/include/mvme88k/vid.h
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 22373cae1b3..fa4fe78a3ce 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -116,7 +116,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/powerpc
 ./usr/include/powerpc/_types.h
-./usr/include/powerpc/ansi.h
 ./usr/include/powerpc/asm.h
 ./usr/include/powerpc/autoconf.h
 ./usr/include/powerpc/bat.h
@@ -157,7 +156,6 @@
 ./usr/include/powerpc/spinlock.h
 ./usr/include/powerpc/stdarg.h
 ./usr/include/powerpc/trap.h
-./usr/include/powerpc/types.h
 ./usr/include/powerpc/va-ppc.h
 ./usr/include/powerpc/varargs.h
 ./usr/include/powerpc/vmparam.h
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index b2a764f22ba..26400e74fa7 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -152,7 +152,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/mips64
 ./usr/include/mips64/_types.h
-./usr/include/mips64/ansi.h
 ./usr/include/mips64/arcbios.h
 ./usr/include/mips64/archtype.h
 ./usr/include/mips64/asm.h
@@ -190,12 +189,10 @@
 ./usr/include/mips64/spinlock.h
 ./usr/include/mips64/stdarg.h
 ./usr/include/mips64/trap.h
-./usr/include/mips64/types.h
 ./usr/include/mips64/varargs.h
 ./usr/include/mips64/vmparam.h
 ./usr/include/sgi
 ./usr/include/sgi/_types.h
-./usr/include/sgi/ansi.h
 ./usr/include/sgi/asm.h
 ./usr/include/sgi/autoconf.h
 ./usr/include/sgi/bus.h
@@ -235,7 +232,6 @@
 ./usr/include/sgi/spinlock.h
 ./usr/include/sgi/stdarg.h
 ./usr/include/sgi/trap.h
-./usr/include/sgi/types.h
 ./usr/include/sgi/varargs.h
 ./usr/include/sgi/vmparam.h
 ./usr/include/unwind.h
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 2f3d743cd4e..db550c83f32 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -117,7 +117,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/sparc
 ./usr/include/sparc/_types.h
-./usr/include/sparc/ansi.h
 ./usr/include/sparc/apmvar.h
 ./usr/include/sparc/asm.h
 ./usr/include/sparc/autoconf.h
@@ -168,7 +167,6 @@
 ./usr/include/sparc/sun_disklabel.h
 ./usr/include/sparc/svr4_machdep.h
 ./usr/include/sparc/trap.h
-./usr/include/sparc/types.h
 ./usr/include/sparc/varargs.h
 ./usr/include/sparc/vmparam.h
 ./usr/include/sparc/z8530var.h
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 0218443bc07..5f06ff92a91 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -154,7 +154,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/sparc64
 ./usr/include/sparc64/_types.h
-./usr/include/sparc64/ansi.h
 ./usr/include/sparc64/asm.h
 ./usr/include/sparc64/autoconf.h
 ./usr/include/sparc64/boot_flag.h
@@ -206,7 +205,6 @@
 ./usr/include/sparc64/spinlock.h
 ./usr/include/sparc64/stdarg.h
 ./usr/include/sparc64/trap.h
-./usr/include/sparc64/types.h
 ./usr/include/sparc64/varargs.h
 ./usr/include/sparc64/vmparam.h
 ./usr/include/sparc64/z8530var.h
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index 05307f8f620..2fc596affdd 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -110,7 +110,6 @@
 ./usr/include/g++/vector.h
 ./usr/include/vax
 ./usr/include/vax/_types.h
-./usr/include/vax/ansi.h
 ./usr/include/vax/aout_machdep.h
 ./usr/include/vax/asm.h
 ./usr/include/vax/bus.h
@@ -160,7 +159,6 @@
 ./usr/include/vax/spinlock.h
 ./usr/include/vax/stdarg.h
 ./usr/include/vax/trap.h
-./usr/include/vax/types.h
 ./usr/include/vax/uvax.h
 ./usr/include/vax/varargs.h
 ./usr/include/vax/vmparam.h
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 2f9fe86f359..c670f9e1575 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -4,7 +4,6 @@
 ./usr/bin/readelf
 ./usr/include/arm
 ./usr/include/arm/_types.h
-./usr/include/arm/ansi.h
 ./usr/include/arm/apmvar.h
 ./usr/include/arm/armreg.h
 ./usr/include/arm/asm.h
@@ -53,7 +52,6 @@
 ./usr/include/arm/swi.h
 ./usr/include/arm/sysarch.h
 ./usr/include/arm/trap.h
-./usr/include/arm/types.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
 ./usr/include/bfd.h
@@ -210,7 +208,6 @@
 ./usr/include/unwind.h
 ./usr/include/zaurus
 ./usr/include/zaurus/_types.h
-./usr/include/zaurus/ansi.h
 ./usr/include/zaurus/apmvar.h
 ./usr/include/zaurus/asm.h
 ./usr/include/zaurus/atomic.h
@@ -254,7 +251,6 @@
 ./usr/include/zaurus/stdarg.h
 ./usr/include/zaurus/sysarch.h
 ./usr/include/zaurus/trap.h
-./usr/include/zaurus/types.h
 ./usr/include/zaurus/vmparam.h
 ./usr/include/zaurus/zaurus_reg.h
 ./usr/include/zaurus/zaurus_var.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index afd2e3a56f8..6d5ab3dc901 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1068,6 +1068,8 @@
 ./usr/share/man/cat4/aac.0
 ./usr/share/man/cat4/ac97.0
 ./usr/share/man/cat4/acphy.0
+./usr/share/man/cat4/acpi.0
+./usr/share/man/cat4/acpitimer.0
 ./usr/share/man/cat4/adc.0
 ./usr/share/man/cat4/addcom.0
 ./usr/share/man/cat4/admcts.0
@@ -1242,6 +1244,7 @@
 ./usr/share/man/cat4/hp300/sgc.0
 ./usr/share/man/cat4/hp300/spc.0
 ./usr/share/man/cat4/hp300/topcat.0
+./usr/share/man/cat4/hpet.0
 ./usr/share/man/cat4/hppa
 ./usr/share/man/cat4/hppa/asp.0
 ./usr/share/man/cat4/hppa/cpu.0