sync

22 files changed, 0 insertions, 110 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 803309fe685..b76ee75f996 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -2342,24 +2342,19 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index ee91fc50477..e5a446ed3fb 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -2367,24 +2367,19 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 8dfe57af489..10e0406ef31 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -2364,24 +2364,19 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 34d011f1780..437fd03108b 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -2179,24 +2179,19 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index ee3e9385b93..f59f100bb11 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -2299,24 +2299,19 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 63a8704870c..daf2ad05526 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -2341,24 +2341,19 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 24927a9ec92..e0c44f32fe2 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -2341,24 +2341,19 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index ac8b7293fea..c02fea1d0fd 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -2374,24 +2374,19 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 79620028c04..61f2e12fbda 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -2357,24 +2357,19 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 74e82a3c79d..c874833ff9f 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -2174,24 +2174,19 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 77085ac0c35..585e821567d 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -2303,24 +2303,19 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index fa639629173..e1c0f6c3034 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -2384,24 +2384,19 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 76f61c34d00..3c1a36bb426 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -2299,24 +2299,19 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 3c3144cef52..2b7cb6be70f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -2309,24 +2309,19 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 3bc61267b96..63542495c75 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -2231,24 +2231,19 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 33ef1107bd8..dd694bed140 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -2378,24 +2378,19 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 925da6bb5e1..9264e7b1de9 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -2370,24 +2370,19 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 3e4764076f4..187853af4da 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1729,24 +1729,19 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 210950b1b8c..71f126caed6 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1792,24 +1792,19 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index c9e61800993..1b89cfa8f44 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1609,24 +1609,19 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 3f842072641..af2e8f37fa4 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -2320,24 +2320,19 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_amap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_amap_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_anon.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_aobj.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_ddb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_device.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_extern.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_fault.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_fault_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_glue.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_km.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_loan.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_map.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_map_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_object.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_page.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_page_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pager.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pager_i.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_param.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pdaemon.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/uvm/uvm_pglist.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index fa98a7c4d75..cbdb6392752 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1586,24 +1586,19 @@
 ./usr/include/uvm
 ./usr/include/uvm/uvm.h
 ./usr/include/uvm/uvm_amap.h
-./usr/include/uvm/uvm_amap_i.h
 ./usr/include/uvm/uvm_anon.h
 ./usr/include/uvm/uvm_aobj.h
 ./usr/include/uvm/uvm_ddb.h
 ./usr/include/uvm/uvm_device.h
 ./usr/include/uvm/uvm_extern.h
 ./usr/include/uvm/uvm_fault.h
-./usr/include/uvm/uvm_fault_i.h
 ./usr/include/uvm/uvm_glue.h
 ./usr/include/uvm/uvm_km.h
 ./usr/include/uvm/uvm_loan.h
 ./usr/include/uvm/uvm_map.h
-./usr/include/uvm/uvm_map_i.h
 ./usr/include/uvm/uvm_object.h
 ./usr/include/uvm/uvm_page.h
-./usr/include/uvm/uvm_page_i.h
 ./usr/include/uvm/uvm_pager.h
-./usr/include/uvm/uvm_pager_i.h
 ./usr/include/uvm/uvm_param.h
 ./usr/include/uvm/uvm_pdaemon.h
 ./usr/include/uvm/uvm_pglist.h