/usr/include/arch and /usr/include/machine should be in comp, not base;

and the /usr/include/readline contents are mi.
deraadt@ ok

29 files changed, 111 insertions, 149 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index f658dbea862..b87320c0db7 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -7,8 +7,6 @@
 ./sbin/wsconsctl
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/alpha
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 501e9a37386..1b07024a080 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -2,9 +2,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/amiga
-./usr/include/m68k
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index fb14b49f13a..87395fff95f 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1,9 +1,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/hp300
-./usr/include/m68k
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 876ba79deec..b2bfd1ef5a5 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -2,8 +2,6 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/c++filt
-./usr/include/hppa
-./usr/include/readline
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1/2.95.3
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1/2.95.3/collect2
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 850bb80c79b..9e66558570b 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -8,7 +8,6 @@
 ./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/bin/pctr
-./usr/include/i386
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 4b772f0dc03..5403dacac92 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,9 +1,8 @@
 ./sbin/kbd
 ./sbin/ldconfig
+./sbin/pdisk
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/m68k
-./usr/include/mac68k
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 2eca3cbf06a..68f8de27b42 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -11,9 +11,6 @@
 ./usr/bin/ldd
 ./usr/bin/readelf
 ./usr/bin/windres
-./usr/include/macppc
-./usr/include/powerpc
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 9063c19fa1a..dd499261dcd 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1,8 +1,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/m68k
-./usr/include/mvme68k
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index ceab048f39b..c6781a1a144 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1,8 +1,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/m88k
-./usr/include/readline
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cpp
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/specs
 ./usr/lib/gcc-lib/m88k-unknown-openbsd3.1
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 05cb2dba2dd..ab9ee13a204 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -7,8 +7,6 @@
 ./usr/bin/ldd
 ./usr/bin/readelf
 ./usr/bin/windres
-./usr/include/powerpc
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index ee6022ce940..c0358533960 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -2,8 +2,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/readline
-./usr/include/sparc
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 0b8acda3217..fb3530109e7 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -3,7 +3,6 @@
 ./sbin/wsconsctl
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/readline
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 8a68f941666..89d5e7cd548 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1,8 +1,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/m68k
-./usr/include/sun3
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
 ./usr/lib/apache/modules/mod_auth_db.so
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 44ea0a52473..70fcbbc4862 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -3,7 +3,6 @@
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
-./usr/include/vax
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.1
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.1/2.95.3
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.1/2.95.3/collect2
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 36768b3e553..1137add12a8 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -4,6 +4,7 @@
 ./usr/bin/objcopy
 ./usr/bin/objdump
 ./usr/bin/readelf
+./usr/include/alpha
 ./usr/include/alpha/alpha_cpu.h
 ./usr/include/alpha/ansi.h
 ./usr/include/alpha/aout_machdep.h
@@ -67,9 +68,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index e90db999669..717ad52cbb2 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -1,5 +1,6 @@
 ./usr/bin/gdb
 ./usr/bin/objdump
+./usr/include/amiga
 ./usr/include/amiga/ansi.h
 ./usr/include/amiga/asm.h
 ./usr/include/amiga/bus.h
@@ -45,6 +46,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
@@ -80,9 +82,7 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1obj
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 7d69d914d41..0cb69050a04 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -4,6 +4,7 @@
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
+./usr/include/hp300
 ./usr/include/hp300/ansi.h
 ./usr/include/hp300/asm.h
 ./usr/include/hp300/autoconf.h
@@ -42,6 +43,7 @@
 ./usr/include/hp300/vmparam.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
@@ -77,9 +79,7 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1obj
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 514bf8308fc..41fc8efda1c 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -8,6 +8,7 @@
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
+./usr/include/hppa
 ./usr/include/hppa/ansi.h
 ./usr/include/hppa/aout_machdep.h
 ./usr/include/hppa/asm.h
@@ -64,9 +65,7 @@
 ./usr/include/hppa/wsconsio.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 94715c32eb5..841cac1aa27 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -4,6 +4,7 @@
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
+./usr/include/i386
 ./usr/include/i386/ansi.h
 ./usr/include/i386/apmvar.h
 ./usr/include/i386/asm.h
@@ -62,10 +63,7 @@
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/readline
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.1/2.95.3/cc1
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.1/2.95.3/cc1obj
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index a7374688480..aa5e73efd33 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -6,6 +6,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
@@ -41,6 +42,7 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
+./usr/include/mac68k
 ./usr/include/mac68k/adbsys.h
 ./usr/include/mac68k/ansi.h
 ./usr/include/mac68k/asm.h
@@ -86,10 +88,7 @@
 ./usr/include/mac68k/viareg.h
 ./usr/include/mac68k/vmparam.h
 ./usr/include/mac68k/z8530var.h
-./usr/include/readline
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1obj
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 526792c6b26..ceb81a306cf 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -9,6 +9,8 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/machine
+./usr/include/macppc
 ./usr/include/macppc/adbsys.h
 ./usr/include/macppc/ansi.h
 ./usr/include/macppc/apmvar.h
@@ -62,6 +64,7 @@
 ./usr/include/macppc/vuid_event.h
 ./usr/include/macppc/wsconsio.h
 ./usr/include/macppc/z8530var.h
+./usr/include/powerpc
 ./usr/include/powerpc/ansi.h
 ./usr/include/powerpc/asm.h
 ./usr/include/powerpc/bat.h
@@ -103,9 +106,6 @@
 ./usr/include/powerpc/varargs.h
 ./usr/include/powerpc/vuid_event.h
 ./usr/include/powerpc/wsconsio.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 43e0a1cc8b2..67def5d49bd 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -6,6 +6,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
@@ -41,6 +42,8 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
+./usr/include/machine
+./usr/include/mvme68k
 ./usr/include/mvme68k/ansi.h
 ./usr/include/mvme68k/asm.h
 ./usr/include/mvme68k/autoconf.h
@@ -81,10 +84,6 @@
 ./usr/include/mvme68k/types.h
 ./usr/include/mvme68k/varargs.h
 ./usr/include/mvme68k/vmparam.h
-./usr/include/readline
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.1/2.95.3/cc1obj
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index ff6ca76a035..186378b5c0b 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -6,86 +6,83 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/m88k/internal_types.h
-./usr/include/machine/ansi.h
-./usr/include/machine/asm.h
-./usr/include/machine/asm_macro.h
-./usr/include/machine/assert.h
-./usr/include/machine/autoconf.h
-./usr/include/machine/board.h
-./usr/include/machine/bug.h
-./usr/include/machine/bugio.h
-./usr/include/machine/cdefs.h
-./usr/include/machine/cpu.h
-./usr/include/machine/cpus.h
-./usr/include/machine/db_machdep.h
-./usr/include/machine/disklabel.h
-./usr/include/machine/endian.h
-./usr/include/machine/exception_vectors.h
-./usr/include/machine/exec.h
-./usr/include/machine/float.h
-./usr/include/machine/frame.h
-./usr/include/machine/ieee.h
-./usr/include/machine/ieeefp.h
-./usr/include/machine/limits.h
-./usr/include/machine/locore.h
-./usr/include/machine/m88100.h
-./usr/include/machine/m882xx.h
-./usr/include/machine/mioctl.h
-./usr/include/machine/mmu.h
-./usr/include/machine/param.h
-./usr/include/machine/pcb.h
-./usr/include/machine/pmap.h
-./usr/include/machine/pmap_table.h
-./usr/include/machine/proc.h
-./usr/include/machine/profile.h
-./usr/include/machine/prom.h
-./usr/include/machine/psl.h
-./usr/include/machine/pte.h
-./usr/include/machine/ptrace.h
-./usr/include/machine/reg.h
-./usr/include/machine/setjmp.h
-./usr/include/machine/signal.h
-./usr/include/machine/stdarg.h
-./usr/include/machine/trap.h
-./usr/include/machine/types.h
-./usr/include/machine/va-m88k.h
-./usr/include/machine/varargs.h
-./usr/include/machine/vid.h
-./usr/include/machine/vmparam.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
-./usr/include/vm/lock.h
+./usr/include/machine
+./usr/include/mvme88k
+./usr/include/mvme88k/ansi.h
+./usr/include/mvme88k/asm.h
+./usr/include/mvme88k/asm_macro.h
+./usr/include/mvme88k/autoconf.h
+./usr/include/mvme88k/board.h
+./usr/include/mvme88k/bug.h
+./usr/include/mvme88k/bugio.h
+./usr/include/mvme88k/cdefs.h
+./usr/include/mvme88k/cmmu.h
+./usr/include/mvme88k/conf.h
+./usr/include/mvme88k/cpu.h
+./usr/include/mvme88k/cpu_number.h
+./usr/include/mvme88k/cpus.h
+./usr/include/mvme88k/db_machdep.h
+./usr/include/mvme88k/disklabel.h
+./usr/include/mvme88k/endian.h
+./usr/include/mvme88k/exception_vectors.h
+./usr/include/mvme88k/exception_vectors2.h
+./usr/include/mvme88k/exec.h
+./usr/include/mvme88k/float.h
+./usr/include/mvme88k/frame.h
+./usr/include/mvme88k/ieee.h
+./usr/include/mvme88k/ieeefp.h
+./usr/include/mvme88k/intr.h
+./usr/include/mvme88k/kcore.h
+./usr/include/mvme88k/limits.h
+./usr/include/mvme88k/locore.h
+./usr/include/mvme88k/m88100.h
+./usr/include/mvme88k/m88110.h
+./usr/include/mvme88k/m8820x.h
+./usr/include/mvme88k/m88410.h
+./usr/include/mvme88k/mioctl.h
+./usr/include/mvme88k/mmu.h
+./usr/include/mvme88k/mvme187.h
+./usr/include/mvme88k/mvme188.h
+./usr/include/mvme88k/mvme197.h
+./usr/include/mvme88k/mvme1x7.h
+./usr/include/mvme88k/param.h
+./usr/include/mvme88k/pcb.h
+./usr/include/mvme88k/pmap.h
+./usr/include/mvme88k/pmap_table.h
+./usr/include/mvme88k/proc.h
+./usr/include/mvme88k/profile.h
+./usr/include/mvme88k/prom.h
+./usr/include/mvme88k/psl.h
+./usr/include/mvme88k/ptrace.h
+./usr/include/mvme88k/reg.h
+./usr/include/mvme88k/setjmp.h
+./usr/include/mvme88k/signal.h
+./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
+./usr/include/mvme88k/vmparam.h
 ./usr/lib
 ./usr/lib/c++rt0.o
 ./usr/lib/crt0.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/f2c.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/Object.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/encoding.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/hash.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/objc-list.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/objc.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/sarray.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/thr.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libf2c.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/libobjc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.1/2.95.3/libgcc.a
 ./usr/lib/gcrt0.o
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index b505fc8d3c8..8b2a1b392bd 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -9,6 +9,8 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/machine
+./usr/include/mvmeppc
 ./usr/include/mvmeppc/ansi.h
 ./usr/include/mvmeppc/asm.h
 ./usr/include/mvmeppc/autoconf.h
@@ -56,10 +58,8 @@
 ./usr/include/mvmeppc/vmparam.h
 ./usr/include/mvmeppc/vuid_event.h
 ./usr/include/mvmeppc/wsconsio.h
+./usr/include/powerpc
 ./usr/include/powerpc/internal_types.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index ea76920b867..657bd5e7e00 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -6,9 +6,8 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
+./usr/include/sparc
 ./usr/include/sparc/ansi.h
 ./usr/include/sparc/asm.h
 ./usr/include/sparc/autoconf.h
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 0bbc3d4f223..4ad8d293eb5 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -10,9 +10,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
 ./usr/include/sparc64
 ./usr/include/sparc64/ansi.h
 ./usr/include/sparc64/asm.h
diff --git a/distrib/sets/lists/comp/md.sun3 b/distrib/sets/lists/comp/md.sun3
index 1e731d81ff5..f4edabf5d27 100644
--- a/distrib/sets/lists/comp/md.sun3
+++ b/distrib/sets/lists/comp/md.sun3
@@ -6,6 +6,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
@@ -41,10 +42,8 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
-./usr/include/readline
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
+./usr/include/sun3
 ./usr/include/sun3/ansi.h
 ./usr/include/sun3/asm.h
 ./usr/include/sun3/autoconf.h
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index c047b176118..2a9b97c802c 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -5,10 +5,8 @@
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
 ./usr/include/link.h
-./usr/include/readline
-./usr/include/readline/chardefs.h
-./usr/include/readline/keymaps.h
-./usr/include/readline/readline.h
+./usr/include/machine
+./usr/include/vax
 ./usr/include/vax/ansi.h
 ./usr/include/vax/aout_machdep.h
 ./usr/include/vax/asm.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 9f20d49a44c..c2cb6e6c6af 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1142,7 +1142,11 @@
 ./usr/include/pwd.h
 ./usr/include/ranlib.h
 ./usr/include/re_comp.h
+./usr/include/readline
+./usr/include/readline/chardefs.h
 ./usr/include/readline/history.h
+./usr/include/readline/keymaps.h
+./usr/include/readline/readline.h
 ./usr/include/readline/rlconf.h
 ./usr/include/readline/rlstdc.h
 ./usr/include/readline/tilde.h