16 files changed, 522 insertions, 65 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b07f9512a52..a66255493e2 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -88,7 +88,7 @@
 ./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/include
 ./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d159a3c345b..45167fa6a8d 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -87,12 +87,12 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/amd64-unknown-openbsd4.7
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1
+yes./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1
 ./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/cc1
 ./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/collect2
 ./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 40d9ade3378..2f6452b7400 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -64,7 +64,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index abbc08eea3e..5b44de9b2b6 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -28,7 +28,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 083ca87f14f..cd02f61b1fa 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -88,7 +88,7 @@
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/collect2
 ./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index ba2820c1555..3ac73848b2c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -67,7 +67,6 @@
 ./sbin/kbd
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
-./usr/bin/gccbug
 ./usr/bin/pctr
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
@@ -90,13 +89,12 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/gcc-lib/i386-unknown-openbsd4.7
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
@@ -114,7 +112,7 @@
 ./usr/lib/libmenu.so.4.0
 ./usr/lib/libmilter.so.2.1
 ./usr/lib/libncurses.so.11.0
-./usr/lib/libobjc.so.4.0
+./usr/lib/libobjc.so.5.0
 ./usr/lib/libocurses.so.5.0
 ./usr/lib/libossaudio.so.3.1
 ./usr/lib/libotermcap.so.5.0
@@ -128,7 +126,7 @@
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
 ./usr/lib/libssl.so.15.1
-./usr/lib/libstdc++.so.49.0
+./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.11.0
 ./usr/lib/libtermlib.so.11.0
 ./usr/lib/libusbhid.so.3.0
@@ -1668,6 +1666,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/tree.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/backward/vector.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/allocator.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/basic_ios.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/basic_string.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/boost_concept_check.ph
@@ -1675,7 +1674,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/codecvt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/concept_check.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/cpp_type_traits.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/fpos.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/functexcept.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/gslice.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/gslice_array.ph
@@ -1685,11 +1683,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/locale_facets.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/localefwd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/mask_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/pthread_allocimpl.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/ostream_insert.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/postypes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/slice_array.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_algo.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_algobase.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_alloc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_bvector.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_construct.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_deque.ph
@@ -1704,50 +1702,117 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_multiset.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_numeric.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_pair.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_pthread_alloc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_queue.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_raw_storage_iter.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_relops.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_set.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_stack.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_tempbuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_threads.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_tree.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_uninitialized.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stl_vector.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stream_iterator.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/streambuf_iterator.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/stringfwd.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/type_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_after.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_array.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_meta.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/bits/valarray_before.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/cxxabi.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/debug.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/formatter.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/functions.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/hash_map.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/hash_multimap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/hash_multiset.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/hash_set.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/macros.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/map.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/multimap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/multiset.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/safe_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/safe_iterator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/safe_sequence.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/debug/set.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/exception_defines.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/enc_filebuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/array_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/bitmap_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/concurrence.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/debug_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/hash_fun.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/hashtable.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/malloc_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/mt_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/new_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/numeric_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/pod_char_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/pool_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/rc_string_base.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/ropeimpl.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/sso_string_base.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stdio_filebuf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hash_fun.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hashtable.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_rope.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stdio_sync_filebuf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/throw_allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/type_traits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/typelist.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring_fwd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring_util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/atomic_word.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++allocator.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++config.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++io.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/cpu_defines.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_base.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_inline.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/cxxabi_tweaks.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-default.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-posix.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-tpf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/messages_members.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/os_defines.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/bind_iterate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/bind_repeat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/boost_shared_ptr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/common.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/ctype.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/fenv.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/float.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/functional_hash.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/functional_iterate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/hashtable_policy.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/inttypes.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/limits.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/math.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/mu_iterate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/ref_fwd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/ref_wrap_iterate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/repeat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/stdarg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/stdbool.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/stdint.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/stdio.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/stdlib.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/tgmath.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/tuple_defs.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/tuple_iterate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/type_traits_fwd.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/wchar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/wctype.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/glob.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/grp.ph
@@ -1902,6 +1967,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/procfs/procfs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/specfs
 ./usr/libdata/perl5/site_perl/i386-openbsd/miscfs/specfs/specdev.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/mm_malloc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mmintrin.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/mpool.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/msdosfs
@@ -2097,8 +2163,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/encoding.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/hash.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/objc-api.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/objc/objc-decls.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/objc-list.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/objc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/objc/runtime.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/sarray.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/thr.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/objc/typedstream.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 098d1934d0f..77113f3a466 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -51,7 +51,7 @@
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 9bc9f8ee06d..c116286c005 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -63,7 +63,7 @@
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/include
 ./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 995be7074c8..d70820b6dab 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -29,7 +29,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 39244054135..6d67dba1a2d 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -26,7 +26,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 17612ca6b76..85345152ad4 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -61,7 +61,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index d00e99a9b22..f950f991192 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -90,7 +90,7 @@
 ./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/include
 ./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f42eead61f6..5f78d7dec63 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -34,7 +34,7 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include
 ./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 75b0d6cd9d3..4c030af73cd 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -89,7 +89,7 @@
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/collect2
 ./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 8c635760983..63484c8d9f4 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -62,7 +62,7 @@
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
 ./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
 ./usr/lib/libasn1.so.18.0
-./usr/lib/libc.so.55.0
+./usr/lib/libc.so.56.0
 ./usr/lib/libcom_err.so.18.0
 ./usr/lib/libcrypto.so.18.0
 ./usr/lib/libcurses.so.11.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 6e842292b44..aeaf1edcd24 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -1,8 +1,6 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
-./usr/bin/protoize
 ./usr/bin/readelf
-./usr/bin/unprotoize
 ./usr/include/emmintrin.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
@@ -42,6 +40,7 @@
 ./usr/include/g++/backward/tree.h
 ./usr/include/g++/backward/vector.h
 ./usr/include/g++/bits
+./usr/include/g++/bits/allocator.h
 ./usr/include/g++/bits/basic_ios.h
 ./usr/include/g++/bits/basic_ios.tcc
 ./usr/include/g++/bits/basic_string.h
@@ -53,7 +52,6 @@
 ./usr/include/g++/bits/concept_check.h
 ./usr/include/g++/bits/cpp_type_traits.h
 ./usr/include/g++/bits/deque.tcc
-./usr/include/g++/bits/fpos.h
 ./usr/include/g++/bits/fstream.tcc
 ./usr/include/g++/bits/functexcept.h
 ./usr/include/g++/bits/gslice.h
@@ -68,12 +66,12 @@
 ./usr/include/g++/bits/localefwd.h
 ./usr/include/g++/bits/mask_array.h
 ./usr/include/g++/bits/ostream.tcc
-./usr/include/g++/bits/pthread_allocimpl.h
+./usr/include/g++/bits/ostream_insert.h
+./usr/include/g++/bits/postypes.h
 ./usr/include/g++/bits/slice_array.h
 ./usr/include/g++/bits/sstream.tcc
 ./usr/include/g++/bits/stl_algo.h
 ./usr/include/g++/bits/stl_algobase.h
-./usr/include/g++/bits/stl_alloc.h
 ./usr/include/g++/bits/stl_bvector.h
 ./usr/include/g++/bits/stl_construct.h
 ./usr/include/g++/bits/stl_deque.h
@@ -88,14 +86,12 @@
 ./usr/include/g++/bits/stl_multiset.h
 ./usr/include/g++/bits/stl_numeric.h
 ./usr/include/g++/bits/stl_pair.h
-./usr/include/g++/bits/stl_pthread_alloc.h
 ./usr/include/g++/bits/stl_queue.h
 ./usr/include/g++/bits/stl_raw_storage_iter.h
 ./usr/include/g++/bits/stl_relops.h
 ./usr/include/g++/bits/stl_set.h
 ./usr/include/g++/bits/stl_stack.h
 ./usr/include/g++/bits/stl_tempbuf.h
-./usr/include/g++/bits/stl_threads.h
 ./usr/include/g++/bits/stl_tree.h
 ./usr/include/g++/bits/stl_uninitialized.h
 ./usr/include/g++/bits/stl_vector.h
@@ -103,44 +99,385 @@
 ./usr/include/g++/bits/streambuf.tcc
 ./usr/include/g++/bits/streambuf_iterator.h
 ./usr/include/g++/bits/stringfwd.h
-./usr/include/g++/bits/type_traits.h
+./usr/include/g++/bits/valarray_after.h
 ./usr/include/g++/bits/valarray_array.h
 ./usr/include/g++/bits/valarray_array.tcc
-./usr/include/g++/bits/valarray_meta.h
+./usr/include/g++/bits/valarray_before.h
 ./usr/include/g++/bits/vector.tcc
 ./usr/include/g++/cxxabi.h
+./usr/include/g++/debug
+./usr/include/g++/debug/bitset
+./usr/include/g++/debug/debug.h
+./usr/include/g++/debug/deque
+./usr/include/g++/debug/formatter.h
+./usr/include/g++/debug/functions.h
+./usr/include/g++/debug/hash_map
+./usr/include/g++/debug/hash_map.h
+./usr/include/g++/debug/hash_multimap.h
+./usr/include/g++/debug/hash_multiset.h
+./usr/include/g++/debug/hash_set
+./usr/include/g++/debug/hash_set.h
+./usr/include/g++/debug/list
+./usr/include/g++/debug/macros.h
+./usr/include/g++/debug/map
+./usr/include/g++/debug/map.h
+./usr/include/g++/debug/multimap.h
+./usr/include/g++/debug/multiset.h
+./usr/include/g++/debug/safe_base.h
+./usr/include/g++/debug/safe_iterator.h
+./usr/include/g++/debug/safe_iterator.tcc
+./usr/include/g++/debug/safe_sequence.h
+./usr/include/g++/debug/set
+./usr/include/g++/debug/set.h
+./usr/include/g++/debug/string
+./usr/include/g++/debug/vector
 ./usr/include/g++/exception_defines.h
 ./usr/include/g++/ext
 ./usr/include/g++/ext/algorithm
-./usr/include/g++/ext/enc_filebuf.h
+./usr/include/g++/ext/array_allocator.h
+./usr/include/g++/ext/atomicity.h
+./usr/include/g++/ext/bitmap_allocator.h
+./usr/include/g++/ext/codecvt_specializations.h
+./usr/include/g++/ext/concurrence.h
+./usr/include/g++/ext/debug_allocator.h
 ./usr/include/g++/ext/functional
+./usr/include/g++/ext/hash_fun.h
 ./usr/include/g++/ext/hash_map
 ./usr/include/g++/ext/hash_set
+./usr/include/g++/ext/hashtable.h
 ./usr/include/g++/ext/iterator
+./usr/include/g++/ext/malloc_allocator.h
 ./usr/include/g++/ext/memory
+./usr/include/g++/ext/mt_allocator.h
+./usr/include/g++/ext/new_allocator.h
 ./usr/include/g++/ext/numeric
+./usr/include/g++/ext/numeric_traits.h
+./usr/include/g++/ext/pb_ds
+./usr/include/g++/ext/pb_ds/assoc_container.hpp
+./usr/include/g++/ext/pb_ds/detail
+./usr/include/g++/ext/pb_ds/detail/basic_tree_policy
+./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
+./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
+./usr/include/g++/ext/pb_ds/detail/basic_tree_policy/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/basic_types.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
+./usr/include/g++/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/cond_dealtor.hpp
+./usr/include/g++/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/container_base_dispatch.hpp
+./usr/include/g++/ext/pb_ds/detail/eq_fn
+./usr/include/g++/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+./usr/include/g++/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
+./usr/include/g++/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn
+./usr/include/g++/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_policy
+./usr/include/g++/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+./usr/include/g++/ext/pb_ds/detail/map_debug_base.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/head.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/internal_node.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/leaf.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_base.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/node.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy
+./usr/include/g++/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+./usr/include/g++/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/node.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/splay_tree_/traits.hpp
+./usr/include/g++/ext/pb_ds/detail/standard_policies.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+./usr/include/g++/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+./usr/include/g++/ext/pb_ds/detail/tree_policy
+./usr/include/g++/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+./usr/include/g++/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+./usr/include/g++/ext/pb_ds/detail/tree_trace_base.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy
+./usr/include/g++/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
+./usr/include/g++/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+./usr/include/g++/ext/pb_ds/detail/type_utils.hpp
+./usr/include/g++/ext/pb_ds/detail/types_traits.hpp
+./usr/include/g++/ext/pb_ds/detail/unordered_iterator
+./usr/include/g++/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+./usr/include/g++/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+./usr/include/g++/ext/pb_ds/exception.hpp
+./usr/include/g++/ext/pb_ds/hash_policy.hpp
+./usr/include/g++/ext/pb_ds/list_update_policy.hpp
+./usr/include/g++/ext/pb_ds/priority_queue.hpp
+./usr/include/g++/ext/pb_ds/tag_and_trait.hpp
+./usr/include/g++/ext/pb_ds/tree_policy.hpp
+./usr/include/g++/ext/pb_ds/trie_policy.hpp
+./usr/include/g++/ext/pod_char_traits.h
+./usr/include/g++/ext/pool_allocator.h
 ./usr/include/g++/ext/rb_tree
+./usr/include/g++/ext/rc_string_base.h
 ./usr/include/g++/ext/rope
 ./usr/include/g++/ext/ropeimpl.h
 ./usr/include/g++/ext/slist
+./usr/include/g++/ext/sso_string_base.h
 ./usr/include/g++/ext/stdio_filebuf.h
-./usr/include/g++/ext/stl_hash_fun.h
-./usr/include/g++/ext/stl_hashtable.h
-./usr/include/g++/ext/stl_rope.h
+./usr/include/g++/ext/stdio_sync_filebuf.h
+./usr/include/g++/ext/throw_allocator.h
+./usr/include/g++/ext/type_traits.h
+./usr/include/g++/ext/typelist.h
+./usr/include/g++/ext/vstring.h
+./usr/include/g++/ext/vstring.tcc
+./usr/include/g++/ext/vstring_fwd.h
+./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/i386-unknown-openbsd4.7
 ./usr/include/g++/i386-unknown-openbsd4.7/bits
-./usr/include/g++/i386-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/atomic_word.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/c++allocator.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/c++config.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/c++io.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/cpu_defines.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_base.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_inline.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/cxxabi_tweaks.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-default.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-posix.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-tpf.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/messages_members.h
 ./usr/include/g++/i386-unknown-openbsd4.7/bits/os_defines.h
@@ -151,6 +488,62 @@
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
+./usr/include/g++/tr1
+./usr/include/g++/tr1/array
+./usr/include/g++/tr1/bind_iterate.h
+./usr/include/g++/tr1/bind_repeat.h
+./usr/include/g++/tr1/boost_shared_ptr.h
+./usr/include/g++/tr1/cctype
+./usr/include/g++/tr1/cfenv
+./usr/include/g++/tr1/cfloat
+./usr/include/g++/tr1/cinttypes
+./usr/include/g++/tr1/climits
+./usr/include/g++/tr1/cmath
+./usr/include/g++/tr1/common.h
+./usr/include/g++/tr1/complex
+./usr/include/g++/tr1/cstdarg
+./usr/include/g++/tr1/cstdbool
+./usr/include/g++/tr1/cstdint
+./usr/include/g++/tr1/cstdio
+./usr/include/g++/tr1/cstdlib
+./usr/include/g++/tr1/ctgmath
+./usr/include/g++/tr1/ctime
+./usr/include/g++/tr1/ctype.h
+./usr/include/g++/tr1/cwchar
+./usr/include/g++/tr1/cwctype
+./usr/include/g++/tr1/fenv.h
+./usr/include/g++/tr1/float.h
+./usr/include/g++/tr1/functional
+./usr/include/g++/tr1/functional_hash.h
+./usr/include/g++/tr1/functional_iterate.h
+./usr/include/g++/tr1/hashtable
+./usr/include/g++/tr1/hashtable_policy.h
+./usr/include/g++/tr1/inttypes.h
+./usr/include/g++/tr1/limits.h
+./usr/include/g++/tr1/math.h
+./usr/include/g++/tr1/memory
+./usr/include/g++/tr1/mu_iterate.h
+./usr/include/g++/tr1/random
+./usr/include/g++/tr1/random.tcc
+./usr/include/g++/tr1/ref_fwd.h
+./usr/include/g++/tr1/ref_wrap_iterate.h
+./usr/include/g++/tr1/repeat.h
+./usr/include/g++/tr1/stdarg.h
+./usr/include/g++/tr1/stdbool.h
+./usr/include/g++/tr1/stdint.h
+./usr/include/g++/tr1/stdio.h
+./usr/include/g++/tr1/stdlib.h
+./usr/include/g++/tr1/tgmath.h
+./usr/include/g++/tr1/tuple
+./usr/include/g++/tr1/tuple_defs.h
+./usr/include/g++/tr1/tuple_iterate.h
+./usr/include/g++/tr1/type_traits
+./usr/include/g++/tr1/type_traits_fwd.h
+./usr/include/g++/tr1/unordered_map
+./usr/include/g++/tr1/unordered_set
+./usr/include/g++/tr1/utility
+./usr/include/g++/tr1/wchar.h
+./usr/include/g++/tr1/wctype.h
 ./usr/include/i386
 ./usr/include/i386/_types.h
 ./usr/include/i386/acpiapm.h
@@ -228,7 +621,10 @@
 ./usr/include/i386/vm86.h
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
+./usr/include/mm_malloc.h
 ./usr/include/mmintrin.h
+./usr/include/objc/objc-decls.h
+./usr/include/objc/runtime.h
 ./usr/include/pmmintrin.h
 ./usr/include/unwind.h
 ./usr/include/xmmintrin.h
@@ -236,17 +632,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -284,7 +672,10 @@
 ./usr/lib/libskey_pic.a
 ./usr/lib/libsndio_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
+./usr/lib/libstdc++_pic.a
 ./usr/lib/libsupc++.a
+./usr/lib/libsupc++_p.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
 ./usr/lib/libusbhid_pic.a
@@ -308,6 +699,4 @@
 ./usr/libdata/lint/llib-li386.ln
 ./usr/share/man/cat1/addr2line.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/protoize.0
 ./usr/share/man/cat1/readelf.0
-./usr/share/man/cat1/unprotoize.0