sync

24 files changed, 917 insertions, 51 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 600b50ff074..f891ebf5231 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/alpha
 ./usr/include/alpha/_types.h
 ./usr/include/alpha/alpha_cpu.h
@@ -273,4 +275,6 @@
 ./usr/libdata/lint/llib-lalpha.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
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index f99bc63bda6..1953755003a 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -78,18 +78,23 @@
 ./usr/include/emmintrin.h
 ./usr/include/g++/amd64-unknown-openbsd4.7
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/atomic_word.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++allocator.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++config.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++io.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/cpu_defines.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_base.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_inline.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/cxxabi_tweaks.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-default.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-posix.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-tpf.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/messages_members.h
 ./usr/include/g++/amd64-unknown-openbsd4.7/bits/os_defines.h
@@ -132,6 +137,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
@@ -143,7 +149,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
@@ -158,12 +163,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
@@ -178,14 +183,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
@@ -193,38 +196,433 @@
 ./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++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./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/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
@@ -232,18 +630,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/fpic
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/libgcc.a
 ./usr/lib/libamd64.a
 ./usr/lib/libamd64_p.a
 ./usr/lib/libasn1_pic.a
@@ -281,7 +670,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
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index 87eeb57801a..4cb27adaab1 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -1,7 +1,9 @@
 ./usr/bin/addr2line
 ./usr/bin/gccbug
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/arm
 ./usr/include/arm/_types.h
 ./usr/include/arm/apmvar.h
@@ -318,4 +320,6 @@
 ./usr/libdata/lint/llib-larm.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
diff --git a/distrib/sets/lists/comp/md.aviion b/distrib/sets/lists/comp/md.aviion
index 278c326505c..a122aa70494 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/aviion
 ./usr/include/aviion/_types.h
 ./usr/include/aviion/asm.h
@@ -219,3 +221,5 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 728dd24148a..20d58abd35d 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -247,3 +249,5 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 2cc663dcf38..839f0c56343 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -267,4 +269,6 @@
 ./usr/libdata/ldscripts/hppaobsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 37a11e37d15..d7f069385dd 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -265,4 +267,6 @@
 ./usr/libdata/ldscripts/hppa64obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 6e110c859cd..6e842292b44 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -1,6 +1,8 @@
 ./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
@@ -306,4 +308,6 @@
 ./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
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 0634aa3c844..a10c6e1537d 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -1,7 +1,9 @@
 ./usr/bin/addr2line
 ./usr/bin/gccbug
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -329,4 +331,6 @@
 ./usr/libdata/ldscripts/shlelf_obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.loongson b/distrib/sets/lists/comp/md.loongson
index cc334606dc5..96c52f8e138 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -310,4 +312,6 @@
 ./usr/libdata/ldscripts/elf64ltsmip_obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index f460e9de47d..52e4017b29a 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -212,3 +214,5 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 9e81e4dc145..efee4531f49 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -250,3 +252,5 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 3d0f13434a7..c0a3f81cc94 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/altivec.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
@@ -314,4 +316,6 @@
 ./usr/libdata/ldscripts/elf32ppc_obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 5e9cf3ed3c3..fb43cc2e4e6 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -249,3 +251,5 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index d7beb685406..5a2a3daf508 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -223,3 +225,5 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 17e5af4423f..0245e127e9e 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -237,4 +239,6 @@
 ./usr/libdata/ldscripts/elf32ppcsim.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.palm b/distrib/sets/lists/comp/md.palm
index 2c97f28ca14..f111d2d292e 100644
--- a/distrib/sets/lists/comp/md.palm
+++ b/distrib/sets/lists/comp/md.palm
@@ -1,7 +1,9 @@
 ./usr/bin/addr2line
 ./usr/bin/gccbug
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/arm
 ./usr/include/arm/_types.h
 ./usr/include/arm/apmvar.h
@@ -319,4 +321,6 @@
 ./usr/libdata/lint/llib-larm.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
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index 5b54a23b174..2e482dca676 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -309,4 +311,6 @@
 ./usr/libdata/ldscripts/elf64ltsmip.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 549ee668a3c..18c18e4cf87 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/altivec.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
@@ -308,4 +310,6 @@
 ./usr/libdata/ldscripts/elf32ppc_obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index ab283735493..55ae7f30b6b 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -1,6 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -248,4 +250,6 @@
 ./usr/libdata/ldscripts/elf32_sparc_obsd.xz
 ./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
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index d81ba05e141..04c7af71dc9 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -39,6 +39,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
@@ -50,7 +51,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
@@ -65,12 +65,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
@@ -85,14 +85,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
@@ -100,30 +98,366 @@
 ./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++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -131,24 +465,87 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/sparc64-unknown-openbsd4.7
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/atomic_word.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++allocator.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++config.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++io.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/cpu_defines.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_base.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_inline.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/cxxabi_tweaks.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-default.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-posix.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-tpf.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/messages_members.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/os_defines.h
 ./usr/include/g++/sparc64-unknown-openbsd4.7/bits/time_members.h
 ./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/ieeefp.h
+./usr/include/objc/objc-decls.h
+./usr/include/objc/runtime.h
 ./usr/include/sparc64
 ./usr/include/sparc64/_types.h
 ./usr/include/sparc64/apmvar.h
@@ -213,15 +610,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -257,7 +648,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
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index c48585170ad..19c1d2d0dec 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -1,3 +1,5 @@
+./usr/bin/protoize
+./usr/bin/unprotoize
 ./usr/include/g++/PlotFile.h
 ./usr/include/g++/SFile.h
 ./usr/include/g++/_G_config.h
@@ -185,4 +187,6 @@
 ./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/protoize.0
+./usr/share/man/cat1/unprotoize.0
 ./usr/share/man/cat3/infnan.0
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 436bc384cec..6b81eba753b 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -1,7 +1,9 @@
 ./usr/bin/addr2line
 ./usr/bin/gccbug
 ./usr/bin/objcopy
+./usr/bin/protoize
 ./usr/bin/readelf
+./usr/bin/unprotoize
 ./usr/include/arm
 ./usr/include/arm/_types.h
 ./usr/include/arm/apmvar.h
@@ -319,4 +321,6 @@
 ./usr/libdata/lint/llib-larm.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
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 379730e563a..ba3ab1faa17 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -20,11 +20,9 @@
 ./usr/bin/mkstr
 ./usr/bin/objdump
 ./usr/bin/pmdb
-./usr/bin/protoize
 ./usr/bin/ranlib
 ./usr/bin/rpcgen
 ./usr/bin/strip
-./usr/bin/unprotoize
 ./usr/bin/xstr
 ./usr/bin/yacc
 ./usr/include/a.out.h
@@ -1891,11 +1889,9 @@
 ./usr/share/man/cat1/mkstr.0
 ./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat1/pmdb.0
-./usr/share/man/cat1/protoize.0
 ./usr/share/man/cat1/ranlib.0
 ./usr/share/man/cat1/rpcgen.0
 ./usr/share/man/cat1/strip.0
-./usr/share/man/cat1/unprotoize.0
 ./usr/share/man/cat1/xstr.0
 ./usr/share/man/cat1/yacc.0
 ./usr/share/man/cat2/EV_SET.0