From d7f245b19d871058abf50fc7c1cd734720f347a7 Mon Sep 17 00:00:00 2001
From: Benjamin Kosnik <bkoz@redhat.com>
Date: Wed, 20 Sep 2006 13:49:46 +0000
Subject: typelist_assoc_container.hpp: Remove, unused.

2006-09-20  Benjamin Kosnik  <bkoz@redhat.com>

	* include/ext/pb_ds/detail/
	typelist_assoc_container.hpp: Remove, unused.
	* include/ext/pb_ds/detail/typelist/
	typelist_assoc_container_find.hpp: Same.
	* include/ext/pb_ds/detail/typelist: Remove.
	* include/ext/pb_ds/detail/typelist.hpp: Merge...
	* include/ext/pb_ds/detail/typelist/typelist_flatten.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_contains.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_typelist_append.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_apply.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_filter.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_append.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_at_index.hpp: Same.
	* include/ext/pb_ds/detail/typelist/typelist_transform.hpp: Same.
	* include/ext/typelist.h: ... into this.
	* include/Makefile.am: Subtractions.
	* include/Makefile.in: Regenerate.

	* include/ext/pb_ds/assoc_container.hpp: Fixups for new includes,
	namespaces, and names.
	* include/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	hash_prime_size_policy_imp.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	cc_hash_max_collision_check_resize_trigger_imp.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	sample_resize_policy.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	sample_resize_trigger.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	hash_exponential_size_policy_imp.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	hash_load_check_resize_trigger_size_base.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	hash_load_check_resize_trigger_imp.hpp: Same.
	* include/ext/pb_ds/detail/resize_policy/
	hash_standard_resize_policy_imp.hpp: Same.
	* include/ext/pb_ds/detail/container_base_dispatch.hpp: Same.
	* testsuite/performance/ext/pb_ds/text_find_timing.cc
	* testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
	* testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
	* testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
	* testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
	* testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
	* testsuite/performance/ext/pb_ds/random_int_find_timing.cc
	* testsuite/performance/ext/pb_ds/
	multimap_text_insert_mem_usage.hpp: Same.
	* testsuite/performance/ext/pb_ds/
	priority_queue_random_int_push_timing.cc
	* testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp: Same.
	* testsuite/performance/ext/pb_ds/
	priority_queue_text_modify_timing.hpp: Same.
	* testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
	* testsuite/performance/ext/pb_ds/
	priority_queue_text_push_pop_timing.cc
	* testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
	* testsuite/performance/ext/pb_ds/
	priority_queue_random_int_push_pop_timing.cc
	* testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
	* testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
	* testsuite/performance/ext/pb_ds/
	multimap_text_insert_timing.hpp: Same.
	* testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
	* testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
	* testsuite/performance/23_containers/find/map.cc
	* testsuite/performance/23_containers/create/map.cc
	* testsuite/performance/23_containers/insert_erase/associative.cc
	* testsuite/performance/23_containers/insert/sequence.cc
	* testsuite/performance/23_containers/insert/associative.cc
	* testsuite/performance/23_containers/create_from_sorted/set.cc
	* testsuite/performance/23_containers/index/map.cc
	* testsuite/performance/23_containers/insert_from_sorted/set.cc
	* testsuite/performance/23_containers/create_sort/list.cc
	* testsuite/performance/23_containers/sort_search/list.cc
	* testsuite/performance/23_containers/producer_consumer/sequence.cc
	* testsuite/performance/23_containers/producer_consumer/associative.cc
	* testsuite/util/regression/trait/assoc/type_trait.hpp: Same.
	* testsuite/util/regression/rand/priority_queue/
	rand_regression_test.hpp: Same.
	* testsuite/util/regression/rand/assoc/rand_regression_test.hpp: Same.
	* testsuite/util/regression/assoc/common_type.hpp: Same.
	* testsuite/util/native_type/assoc/native_multimap.hpp: Same.
	* testsuite/util/native_type/assoc/native_tree_tag.hpp: Same.
	* testsuite/util/native_type/assoc/native_hash_multimap.hpp: Same.
	* testsuite/util/native_type/assoc/native_set.hpp: Same.
	* testsuite/util/native_type/assoc/native_map.hpp: Same.
	* testsuite/util/native_type/assoc/native_hash_set.hpp: Same.
	* testsuite/util/native_type/assoc/native_hash_map.hpp: Same.
	* testsuite/util/common_type/priority_queue/common_type.hpp: Same.
	* testsuite/util/common_type/assoc/common_type.hpp: Same.
	* testsuite/util/common_type/assoc/string_form.hpp: Same.
	* testsuite/util/common_type/assoc/template_policy.hpp: Same.
	* testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp:
	Same.
	* testsuite/util/performance/priority_queue/timing/push_pop_test.hpp:
	Same.
	* testsuite/util/performance/priority_queue/timing/join_test.hpp: Same.
	* testsuite/util/performance/priority_queue/timing/push_test.hpp: Same.
	* testsuite/util/performance/priority_queue/timing/modify_test.hpp:
	Same.
	* testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp:
	Same.
	* testsuite/util/performance/assoc/mem_usage/erase_test.hpp: Same.
	* testsuite/util/performance/assoc/timing/common_type.hpp: Same.
	* testsuite/util/performance/assoc/timing/multimap_insert_test.hpp:
	Same.
	* testsuite/util/performance/assoc/timing/subscript_find_test.hpp:
	Same.
	* testsuite/util/performance/assoc/timing/find_test.hpp: Same.
	* testsuite/util/performance/assoc/timing/subscript_insert_test.hpp:
	Same.
	* testsuite/util/performance/assoc/timing/insert_test.hpp: Same.
	* testsuite/util/performance/assoc/timing/
	tree_order_statistics_test.hpp: Same.
	* testsuite/util/performance/assoc/timing/multimap_find_test.hpp: Same.
	* testsuite/util/performance/assoc/timing/tree_split_join_test.hpp:
	Same.
	* testsuite/util/performance/assoc/multimap_common_type.hpp: Same.

	* testsuite/ext/pb_ds/example/hash_resize_neg.cc: Fixup line numbers.

From-SVN: r117081
---
 .../testsuite/ext/pb_ds/example/hash_resize_neg.cc |   2 +-
 .../performance/23_containers/create/map.cc        |   4 +-
 .../23_containers/create_from_sorted/set.cc        |   4 +-
 .../performance/23_containers/create_sort/list.cc  |   4 +-
 .../performance/23_containers/find/map.cc          |   4 +-
 .../performance/23_containers/index/map.cc         |   5 +-
 .../23_containers/insert/associative.cc            |   3 +-
 .../performance/23_containers/insert/sequence.cc   |   3 +-
 .../23_containers/insert_erase/associative.cc      |   3 +-
 .../23_containers/insert_from_sorted/set.cc        |   5 +-
 .../23_containers/producer_consumer/associative.cc |   3 +-
 .../23_containers/producer_consumer/sequence.cc    |   3 +-
 .../performance/23_containers/sort_search/list.cc  |   5 +-
 .../ext/pb_ds/hash_random_int_erase_mem_usage.cc   |   7 +-
 .../ext/pb_ds/hash_zlob_random_int_find_timing.cc  |   7 +-
 .../ext/pb_ds/multimap_text_find_timing.hpp        |   9 +-
 .../ext/pb_ds/multimap_text_insert_mem_usage.hpp   |  11 +-
 .../ext/pb_ds/multimap_text_insert_timing.hpp      |   9 +-
 .../priority_queue_random_int_push_pop_timing.cc   |   9 +-
 .../pb_ds/priority_queue_random_int_push_timing.cc |   9 +-
 .../ext/pb_ds/priority_queue_text_join_timing.cc   |   8 +-
 .../pb_ds/priority_queue_text_modify_timing.hpp    |   9 +-
 .../ext/pb_ds/priority_queue_text_pop_mem_usage.cc |   9 +-
 .../pb_ds/priority_queue_text_push_pop_timing.cc   |   9 +-
 .../ext/pb_ds/priority_queue_text_push_timing.cc   |   9 +-
 .../ext/pb_ds/random_int_find_timing.cc            |  11 +-
 .../ext/pb_ds/random_int_subscript_find_timing.cc  |  11 +-
 .../pb_ds/random_int_subscript_insert_timing.cc    |  11 +-
 .../performance/ext/pb_ds/text_find_timing.cc      |  20 +--
 .../ext/pb_ds/tree_order_statistics_timing.cc      |   7 +-
 .../ext/pb_ds/tree_split_join_timing.cc            |   7 +-
 .../ext/pb_ds/tree_text_insert_timing.cc           |   9 +-
 .../ext/pb_ds/tree_text_lor_find_timing.cc         |   7 +-
 .../util/common_type/assoc/common_type.hpp         | 165 +++++++++------------
 .../util/common_type/assoc/string_form.hpp         |  28 ++--
 .../util/common_type/assoc/template_policy.hpp     |   3 +-
 .../common_type/priority_queue/common_type.hpp     |   4 +-
 .../util/native_type/assoc/native_hash_map.hpp     |   3 +-
 .../native_type/assoc/native_hash_multimap.hpp     | 121 ++++-----------
 .../util/native_type/assoc/native_hash_set.hpp     |   5 +-
 .../util/native_type/assoc/native_map.hpp          |  29 +---
 .../util/native_type/assoc/native_multimap.hpp     | 101 +++----------
 .../util/native_type/assoc/native_set.hpp          |  34 ++---
 .../util/native_type/assoc/native_tree_tag.hpp     |   4 -
 .../performance/assoc/mem_usage/erase_test.hpp     |   4 +-
 .../assoc/mem_usage/multimap_insert_test.hpp       |  14 +-
 .../performance/assoc/multimap_common_type.hpp     |  14 +-
 .../util/performance/assoc/timing/common_type.hpp  |   8 +-
 .../util/performance/assoc/timing/find_test.hpp    |   4 +-
 .../util/performance/assoc/timing/insert_test.hpp  |   8 +-
 .../assoc/timing/multimap_find_test.hpp            |  14 +-
 .../assoc/timing/multimap_insert_test.hpp          |   4 +-
 .../assoc/timing/subscript_find_test.hpp           |   4 +-
 .../assoc/timing/subscript_insert_test.hpp         |   4 +-
 .../assoc/timing/tree_order_statistics_test.hpp    |   4 +-
 .../assoc/timing/tree_split_join_test.hpp          |   4 +-
 .../priority_queue/mem_usage/pop_test.hpp          |   4 +-
 .../priority_queue/timing/join_test.hpp            |   4 +-
 .../priority_queue/timing/modify_test.hpp          |   8 +-
 .../priority_queue/timing/push_pop_test.hpp        |   8 +-
 .../priority_queue/timing/push_test.hpp            |   8 +-
 .../util/regression/assoc/common_type.hpp          |   4 +-
 .../regression/rand/assoc/rand_regression_test.hpp |   4 +-
 .../rand/priority_queue/rand_regression_test.hpp   |   4 +-
 .../util/regression/trait/assoc/type_trait.hpp     |   8 +-
 65 files changed, 322 insertions(+), 549 deletions(-)

(limited to 'libstdc++-v3/testsuite')

diff --git a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
index 908675cad1c..cb13b9ada45 100644
--- a/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
+++ b/libstdc++-v3/testsuite/ext/pb_ds/example/hash_resize_neg.cc
@@ -70,5 +70,5 @@ int main()
   h.resize(20); // { dg-error "instantiated from" }
 }
 
-// { dg-error "invalid" "" { target *-*-* } 236 } 
+// { dg-error "invalid" "" { target *-*-* } 199 } 
 // { dg-excess-errors "member function" } 
diff --git a/libstdc++-v3/testsuite/performance/23_containers/create/map.cc b/libstdc++-v3/testsuite/performance/23_containers/create/map.cc
index 08009ec7f48..5049e1a1ff5 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/create/map.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/create/map.cc
@@ -51,11 +51,9 @@ main()
 #endif    
 
   typedef __gnu_test::maps<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("create");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/create_from_sorted/set.cc b/libstdc++-v3/testsuite/performance/23_containers/create_from_sorted/set.cc
index 0c6bd709cb2..97ea3af117a 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/create_from_sorted/set.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/create_from_sorted/set.cc
@@ -61,11 +61,9 @@ main()
 #endif    
 
   typedef __gnu_test::sets<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("create_from_sorted");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/create_sort/list.cc b/libstdc++-v3/testsuite/performance/23_containers/create_sort/list.cc
index 02b25cde17f..7a47f32b2ec 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/create_sort/list.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/create_sort/list.cc
@@ -54,11 +54,9 @@ main()
 #endif    
 
   typedef __gnu_test::lists<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("create_sort");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/find/map.cc b/libstdc++-v3/testsuite/performance/23_containers/find/map.cc
index f11bda1c8e2..e6c2c79a7fc 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/find/map.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/find/map.cc
@@ -57,11 +57,9 @@ main()
 #endif    
 
   typedef __gnu_test::maps<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("find");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/index/map.cc b/libstdc++-v3/testsuite/performance/23_containers/index/map.cc
index 8682c9070d5..386890d90ea 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/index/map.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/index/map.cc
@@ -58,13 +58,10 @@ main()
 #define thread_type true
 #endif    
 
-  using __gnu_test::associative_containers;
   typedef __gnu_test::maps<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("index_associative");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/insert/associative.cc b/libstdc++-v3/testsuite/performance/23_containers/insert/associative.cc
index 8be68f6c1ca..b3f8f71327c 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/insert/associative.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/insert/associative.cc
@@ -65,8 +65,7 @@ main()
 
   typedef test_sequence<thread_type> test_type;
   test_type test("insert_associative");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/insert/sequence.cc b/libstdc++-v3/testsuite/performance/23_containers/insert/sequence.cc
index b6cdbf117de..7023332e5e9 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/insert/sequence.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/insert/sequence.cc
@@ -61,8 +61,7 @@ main()
 
   typedef test_sequence<thread_type> test_type;
   test_type test("insert_sequence");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/insert_erase/associative.cc b/libstdc++-v3/testsuite/performance/23_containers/insert_erase/associative.cc
index c0ce6f9aa45..ee48ce2a708 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/insert_erase/associative.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/insert_erase/associative.cc
@@ -68,8 +68,7 @@ main()
 
   typedef test_sequence<thread_type> test_type;
   test_type test("insert_erase_associative");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/insert_from_sorted/set.cc b/libstdc++-v3/testsuite/performance/23_containers/insert_from_sorted/set.cc
index 863c7a6dc7c..72b1921e697 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/insert_from_sorted/set.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/insert_from_sorted/set.cc
@@ -76,13 +76,10 @@ main()
 #define thread_type true
 #endif    
 
-  using __gnu_test::associative_containers;
   typedef __gnu_test::sets<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("insert_from_sorted");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/associative.cc b/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/associative.cc
index 3ccfca92e69..841cdf0477e 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/associative.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/associative.cc
@@ -250,8 +250,7 @@ main()
 
   typedef test_sequence<thread_type> test_type;
   test_type test("producer_consumer_associative");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/sequence.cc b/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/sequence.cc
index 4adccb94654..1590c974b47 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/sequence.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/producer_consumer/sequence.cc
@@ -249,8 +249,7 @@ main()
 
   typedef test_sequence<thread_type> test_type;
   test_type test("producer_consumer_sequence");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/23_containers/sort_search/list.cc b/libstdc++-v3/testsuite/performance/23_containers/sort_search/list.cc
index ed48eb9412f..14b42b4c009 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/sort_search/list.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/sort_search/list.cc
@@ -71,13 +71,10 @@ main()
 #define thread_type true
 #endif    
 
-  using __gnu_test::sequence_containers;
   typedef __gnu_test::lists<int, thread_type>::type container_types;
-
   typedef test_sequence<thread_type> test_type;
   test_type test("sort_search");
-  __gnu_cxx::typelist::apply<test_type, container_types> applier;
-  applier(test);
+  __gnu_cxx::typelist::apply(test, container_types());
 
   return 0;
 }
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
index 075c4956758..48d0d8644e7 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_random_int_erase_mem_usage.cc
@@ -44,13 +44,12 @@
  * Contains test for erasing random integers.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/mem_usage/erase_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <performance/mem/mem_track_allocator.hpp>
 #include <iostream>
 #include <vector>
@@ -94,7 +93,7 @@ main(int argc, char* a_p_argv[])
 	  tl_t;
 
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
@@ -104,7 +103,7 @@ main(int argc, char* a_p_argv[])
 	  std::less<int>, alloc_t>
 	  native_t;
 
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
index a5e9f5fa785..7f27da93fa3 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/hash_zlob_random_int_find_timing.cc
@@ -44,14 +44,13 @@
  * Contains test for finding random integers.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_set.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/find_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -87,13 +86,13 @@ main(int argc, char* a_p_argv[])
       test_t tst(b, b, vn, vs, vm, vn, vs, vm);
       {
 	typedef native_hash_map< int, char> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef hash_common_types<int, char>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
index a57254a8522..bd60c0fcc23 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_find_timing.hpp
@@ -44,7 +44,7 @@
  * Contains test for inserting text words.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <io/text_populate.hpp>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_multimap.hpp>
@@ -55,7 +55,6 @@
 #include <performance/assoc/timing/multimap_find_test.hpp>
 #include <performance/assoc/multimap_common_type.hpp>
 #include <hash_fn/string_hash_fn.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -101,21 +100,21 @@ main(int argc, char* a_p_argv[])
 
 	typedef multimap_find_test<vec_t::const_iterator, false> test_type;
 	test_type tst(b, prm* ratio_n, prm* ratio_s, prm* ratio_m);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_hash_multimap<std::string, int, 8, string_hash_fn> native_t;
 	typedef multimap_find_test<vec_t::const_iterator, true> test_type;
 	test_type tst(b, prm* ratio_n, prm* ratio_s, prm* ratio_m);
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef native_multimap<std::string, int> native_t;
 	typedef multimap_find_test<vec_t::const_iterator, true> test_type;
 	test_type tst(b, prm* ratio_n, prm* ratio_s, prm* ratio_m);
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
index 896d766753f..e0b8afd609d 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_mem_usage.hpp
@@ -44,7 +44,7 @@
  * Contains test for inserting text words.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <io/text_populate.hpp>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_multimap.hpp>
@@ -54,7 +54,6 @@
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/mem_usage/multimap_insert_test.hpp>
 #include <performance/assoc/multimap_common_type.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <performance/mem/mem_track_allocator.hpp>
 #include <hash_fn/string_hash_fn.hpp>
 #include <iostream>
@@ -102,7 +101,7 @@ main(int argc, char* a_p_argv[])
 	tl_t tl;
 	typedef multimap_insert_test<vec_t::const_iterator, false> test_type;
 	test_type tst(b, prm* ratio_n, prm* ratio_s, prm* ratio_m);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
@@ -110,14 +109,14 @@ main(int argc, char* a_p_argv[])
 	tl_t tl;
 	typedef multimap_insert_test<vec_t::const_iterator, false> test_type;
 	test_type tst(b,  prm*  ratio_n, prm*  ratio_s, prm*  ratio_m);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       typedef multimap_insert_test<vec_t::const_iterator, true> test_type;
       test_type tst(b,  prm* ratio_n, prm* ratio_s, prm* ratio_m);
       {
 	typedef native_multimap<string_t, int, std::less<string_t>, alloc_t> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
@@ -131,7 +130,7 @@ main(int argc, char* a_p_argv[])
 	  alloc_t>
 	  native_t;
 
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
index 1c757d5dae2..694a5f2dbcf 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/multimap_text_insert_timing.hpp
@@ -44,7 +44,7 @@
  * Contains test for inserting text words.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <io/text_populate.hpp>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_multimap.hpp>
@@ -54,7 +54,6 @@
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/multimap_insert_test.hpp>
 #include <performance/assoc/multimap_common_type.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <hash_fn/string_hash_fn.hpp>
 #include <iostream>
 #include <vector>
@@ -99,21 +98,21 @@ main(int argc, char* a_p_argv[])
 	mmap_tl_tl tl;
 	typedef multimap_insert_test<vec_t::const_iterator, false> test_type;
 	test_type tst(b, prm*  ratio_n, prm*  ratio_s, prm*  ratio_m);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_hash_multimap<std::string, int, 8, string_hash_fn> native_t;
 	typedef multimap_insert_test<vec_t::const_iterator, true> test_type;
 	test_type tst(b,  prm*  ratio_n, prm*  ratio_s, prm*  ratio_m);
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef native_multimap<std::string, int> native_t;
 	typedef multimap_insert_test<vec_t::const_iterator, true> test_type;
 	test_type tst(b, prm* ratio_n, prm* ratio_s, prm* ratio_m);
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
index 64f19b12799..4f0f1a4aa24 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_pop_timing.cc
@@ -44,12 +44,11 @@
  * Contains test for finding random_int.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/timing/push_pop_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <iostream>
@@ -84,17 +83,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<int>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<int, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<int, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
index 7706175355b..098378da1de 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_random_int_push_timing.cc
@@ -44,12 +44,11 @@
  * Contains test for finding random_int.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/timing/push_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <iostream>
@@ -82,17 +81,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<int>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<int, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<int, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
index c13f060c3c9..c5c24f7ef5c 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_join_timing.cc
@@ -44,7 +44,7 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
@@ -101,17 +101,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<std::string>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<std::string, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<std::string, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
index 58e9cf546f9..ab0da1f41f5 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_modify_timing.hpp
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/timing/modify_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <iostream>
 #include <vector>
@@ -88,17 +87,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<std::string>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<std::string, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<std::string, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
index 12820e90690..49ba5b501d3 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_pop_mem_usage.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/mem_usage/pop_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <performance/mem/mem_track_allocator.hpp>
 #include <iostream>
@@ -84,17 +83,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<string_t, std::less<string_t>, mem_track_allocator<char> >::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<string_t, true, std::less<string_t>, mem_track_allocator<string_t> > native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<string_t, false, std::less<string_t>, mem_track_allocator<string_t> > native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
index 13f5c00000b..e7e06bc32d0 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_pop_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/timing/push_pop_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <iostream>
 #include <vector>
@@ -81,17 +80,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<std::string>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<std::string, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<std::string, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
index f1f76e899c7..e723892f0ea 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/priority_queue_text_push_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/priority_queue/common_type.hpp>
 #include <performance/priority_queue/timing/push_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/priority_queue/native_priority_queue.hpp>
 #include <iostream>
 #include <vector>
@@ -81,17 +80,17 @@ main(int argc, char* a_p_argv[])
       {
 	typedef pq_common_types<std::string>::performance_tl pq_tl_t;
 	pq_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_priority_queue<std::string, true> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
 
       {
 	typedef native_priority_queue<std::string, false> native_pq_t;
-	tst(pb_ds::detail::type_to_type<native_pq_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_pq_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
index ce7c56952da..7ac42c8e02b 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_find_timing.cc
@@ -44,7 +44,7 @@
  * Contains test for finding random integers.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_map.hpp>
 #include <native_type/assoc/native_map.hpp>
@@ -52,7 +52,6 @@
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/find_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -83,24 +82,24 @@ main(int argc, char* a_p_argv[])
       test_t tst(b, b, vn, vs, vm, vn, vs, vm);
       {
 	typedef native_hash_map< int, char> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef native_map< int, char> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef hash_common_types<int, char>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef tree_common_types<int, char>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
index 5d796c26be2..8fadbe1d192 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_find_timing.cc
@@ -44,7 +44,7 @@
  * Contains test for subscripting random integers.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_map.hpp>
 #include <native_type/assoc/native_map.hpp>
@@ -52,7 +52,6 @@
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/subscript_find_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -84,23 +83,23 @@ main(int argc, char* a_p_argv[])
       {
 	typedef hash_common_types<int, size_t>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef tree_common_types<int, size_t>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_hash_map<int, size_t> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef native_map< int, size_t> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
index 60e16dd1bcc..fc83735f82c 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/random_int_subscript_insert_timing.cc
@@ -44,7 +44,7 @@
  * Contains test for subscripting random integers.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <native_type/assoc/native_hash_map.hpp>
 #include <native_type/assoc/native_map.hpp>
@@ -52,7 +52,6 @@
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/subscript_insert_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -84,23 +83,23 @@ main(int argc, char* a_p_argv[])
       {
 	typedef hash_common_types<int, size_t>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef tree_common_types<int, size_t>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_hash_map< int, size_t> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
 
       {
 	typedef native_map< int, size_t> native_t;
-	tst(pb_ds::detail::type_to_type<native_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
index a1cc598a78d..c0a2e96ddd4 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/text_find_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/find_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <hash_fn/string_hash_fn.hpp>
 #include <native_type/assoc/native_hash_map.hpp>
 #include <native_type/assoc/native_map.hpp>
@@ -86,22 +85,20 @@ main(int argc, char* a_p_argv[])
 
 	typedef hash_common_types<std::string, char, string_hash_fn>::performance_tl hash_tl_t;
 
-	typedef pb_ds::detail::typelist_append<pat_trie_tl_t, pb_ds::detail::typelist_append<hash_tl_t, tree_tl_t>::type>::type tl_t;
+	typedef __gnu_cxx::typelist::append<pat_trie_tl_t, __gnu_cxx::typelist::append<hash_tl_t, tree_tl_t>::type>::type tl_t;
 
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_map<std::string, char> native_map_t;
-	tst(pb_ds::detail::type_to_type<native_map_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_map_t>());
 
+#ifdef PB_DS_USE_TR1
 	typedef native_hash_map<std::string, char, 8, string_hash_fn> native_hash_map_t;
-	tst(pb_ds::detail::type_to_type<native_hash_map_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_hash_map_t>());
 
-	// XXX Unfortunately, this crashes
-#if 0
-#ifdef PB_DS_USE_TR1
 	typedef
 	  native_hash_map<
 	  std::string,
@@ -117,9 +114,8 @@ main(int argc, char* a_p_argv[])
 	  true>
 	  sth_native_hash_map_t;
 
-	tst(pb_ds::detail::type_to_type<sth_native_hash_map_t>());
-#endif // #ifdef PB_DS_USE_TR1
-#endif // #if 0
+	tst(__gnu_cxx::typelist::detail::type_to_type<sth_native_hash_map_t>());
+#endif
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
index 2af32f394d6..3a67b63bff5 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_order_statistics_timing.cc
@@ -46,12 +46,11 @@
 
 #include <iostream>
 #include <vector>
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <performance/assoc/timing/tree_order_statistics_test.hpp>
 
 void
@@ -74,14 +73,14 @@ main(int argc, char* a_p_argv[])
 	test_t tst(vn, vs, vm);
 	typedef tree_common_types<int, pb_ds::null_mapped_type, std::less<int>, pb_ds::tree_order_statistics_node_update>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef tree_order_statistics_test<false> test_t;
 	test_t tst(vn, vs, vm);
 	typedef native_set<int> native_set_t;
-	tst(pb_ds::detail::type_to_type<native_set_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_set_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
index 6de06c53335..675309c63ac 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_split_join_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for joining trees.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <rng/twister_rand_gen.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/tree_split_join_test.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <iostream>
 #include <vector>
 
@@ -75,14 +74,14 @@ main(int argc, char* a_p_argv[])
 
 	typedef tree_common_types<int, pb_ds::null_mapped_type>::performance_tl tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef tree_split_join_test<false> test_t;
 	test_t tst(vn, vs, vm);
 	typedef native_set<int> native_set_t;
-	tst(pb_ds::detail::type_to_type<native_set_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_set_t>());
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
index f61fe1c6d36..9436977fc98 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_insert_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/insert_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <hash_fn/string_hash_fn.hpp>
 #include <native_type/assoc/native_hash_map.hpp>
 #include <native_type/assoc/native_map.hpp>
@@ -83,14 +82,14 @@ main(int argc, char* a_p_argv[])
       {
 	typedef trie_common_types<std::string, char>::performance_tl pat_trie_tl_t;
 	typedef tree_common_types<std::string, char>::performance_tl tree_tl_t;
-	typedef pb_ds::detail::typelist_append<pat_trie_tl_t, tree_tl_t>::type tl_t;
+	typedef __gnu_cxx::typelist::append<pat_trie_tl_t, tree_tl_t>::type tl_t;
 	tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
 
       {
 	typedef native_map<std::string, char> native_map_t;
-	tst(pb_ds::detail::type_to_type<native_map_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_map_t>());
       }
     }
   catch (...)
diff --git a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
index 4dd52445d62..3c1bc0c9037 100644
--- a/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
+++ b/libstdc++-v3/testsuite/performance/ext/pb_ds/tree_text_lor_find_timing.cc
@@ -44,13 +44,12 @@
  * Contains test for finding text with locality of reference.
  */
 
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 #include <performance/io/xml_formatter.hpp>
 #include <io/verified_cmd_line_input.hpp>
 #include <common_type/assoc/common_type.hpp>
 #include <performance/assoc/timing/find_test.hpp>
 #include <io/text_populate.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
 #include <native_type/assoc/native_map.hpp>
 #include <iostream>
 #include <vector>
@@ -81,13 +80,13 @@ main(int argc, char* a_p_argv[])
       test_t tst(b, b, vn, vs, vm, vn, vs, vm);
       {
 	typedef native_map<std::string, char> native_set_t;
-	tst(pb_ds::detail::type_to_type<native_set_t>());
+	tst(__gnu_cxx::typelist::detail::type_to_type<native_set_t>());
       }
 
       {
 	typedef tree_common_types<std::string, char>::performance_tl tree_tl_t;
 	tree_tl_t tl;
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
     }
   catch(...)
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
index df07eb38644..60ab0d802c9 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/common_type.hpp
@@ -65,7 +65,7 @@ namespace pb_ds
 	     class Eq_Fn =
 	     std::equal_to<Key>,
 	     class Allocator =
-	     std::allocator< std::pair<const Key, Data> > >
+	     std::allocator<std::pair<const Key, Data> > >
     struct hash_common_types
     {
     private:
@@ -109,12 +109,12 @@ namespace pb_ds
 	true>
       access_half_max_col_check_check_resize_trigger_policy;
 
-      typedef pb_ds::test::linear_probe_fn_t_< Key, Allocator> lin_p_t;
+      typedef pb_ds::test::linear_probe_fn_t_<Key, Allocator> lin_p_t;
 
-      typedef pb_ds::test::quadratic_probe_fn_t_< Key, Allocator> quad_p_t;
+      typedef pb_ds::test::quadratic_probe_fn_t_<Key, Allocator> quad_p_t;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -124,7 +124,7 @@ namespace pb_ds
       performance_cc_policy0;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mod_range_hashing_t_<
 	Allocator>,
@@ -133,7 +133,7 @@ namespace pb_ds
       performance_cc_policy1;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -143,7 +143,7 @@ namespace pb_ds
       performance_cc_policy2;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mod_range_hashing_t_<
 	Allocator>,
@@ -152,7 +152,7 @@ namespace pb_ds
       performance_cc_policy3;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::true_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -162,7 +162,7 @@ namespace pb_ds
       performance_cc_policy4;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -172,7 +172,7 @@ namespace pb_ds
       performance_cc_policy5;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -182,7 +182,7 @@ namespace pb_ds
       regression_cc_policy0;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::false_type,
 	pb_ds::test::direct_mask_range_hashing_t_<
 	Allocator>,
@@ -192,7 +192,7 @@ namespace pb_ds
       regression_cc_policy1;
 
       typedef
-      typename pb_ds::detail::typelist4<
+      typename __gnu_cxx::typelist::create4<
 	pb_ds::detail::true_type,
 	pb_ds::test::direct_mod_range_hashing_t_<
 	Allocator>,
@@ -201,7 +201,7 @@ namespace pb_ds
       regression_cc_policy2;
 
       typedef
-      typename pb_ds::detail::typelist5<
+      typename __gnu_cxx::typelist::create5<
 	pb_ds::detail::false_type,
 	lin_p_t,
 	pb_ds::test::direct_mask_range_hashing_t_<
@@ -212,7 +212,7 @@ namespace pb_ds
       performance_gp_policy0;
 
       typedef
-      typename pb_ds::detail::typelist5<
+      typename __gnu_cxx::typelist::create5<
 	pb_ds::detail::false_type,
 	quad_p_t,
 	pb_ds::test::direct_mod_range_hashing_t_<
@@ -222,7 +222,7 @@ namespace pb_ds
       performance_gp_policy1;
 
       typedef
-      typename pb_ds::detail::typelist5<
+      typename __gnu_cxx::typelist::create5<
 	pb_ds::detail::false_type,
 	quad_p_t,
 	pb_ds::test::direct_mod_range_hashing_t_<
@@ -232,7 +232,7 @@ namespace pb_ds
       regression_gp_policy0;
 
       typedef
-      typename pb_ds::detail::typelist5<
+      typename __gnu_cxx::typelist::create5<
 	pb_ds::detail::true_type,
 	lin_p_t,
 	pb_ds::test::direct_mask_range_hashing_t_<
@@ -243,7 +243,7 @@ namespace pb_ds
       regression_gp_policy1;
 
       typedef
-      typename pb_ds::detail::typelist6<
+      typename __gnu_cxx::typelist::create6<
 	performance_cc_policy0,
 	performance_cc_policy1,
 	performance_cc_policy2,
@@ -253,20 +253,20 @@ namespace pb_ds
       performance_cc_range_hashing_policies;
 
       typedef
-      typename pb_ds::detail::typelist3<
+      typename __gnu_cxx::typelist::create3<
 	regression_cc_policy0,
 	regression_cc_policy1,
 	regression_cc_policy2>::type
       regression_cc_range_hashing_policies;
 
       typedef
-      typename pb_ds::detail::typelist2<
+      typename __gnu_cxx::typelist::create2<
 	performance_gp_policy0,
 	performance_gp_policy1>::type
       performance_gp_range_hashing_policies;
 
       typedef
-      typename pb_ds::detail::typelist2<
+      typename __gnu_cxx::typelist::create2<
 	regression_gp_policy0,
 	regression_gp_policy1>::type
       regression_gp_range_hashing_policies;
@@ -276,7 +276,7 @@ namespace pb_ds
       {
       private:
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	Policy_Tl, 0>::type
 	store_hash_indicator;
 
@@ -286,17 +286,17 @@ namespace pb_ds
 	  };
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 1>::type
 	comb_hash_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 2>::type
 	trigger_policy;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 3>::type
 	size_policy;
 
@@ -322,7 +322,7 @@ namespace pb_ds
       {
       private:
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	Policy_Tl, 0>::type
 	store_hash_indicator;
 
@@ -332,17 +332,17 @@ namespace pb_ds
 	  };
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 1>::type
 	comb_hash_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 2>::type
 	trigger_policy;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 3>::type
 	size_policy;
 
@@ -368,7 +368,7 @@ namespace pb_ds
       {
       private:
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	Policy_Tl, 0>::type
 	store_hash_indicator;
 
@@ -378,22 +378,22 @@ namespace pb_ds
 	  };
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 1>::type
 	probe_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 2>::type
 	comb_probe_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 3>::type
 	trigger_policy;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 4>::type
 	size_policy;
 
@@ -420,7 +420,7 @@ namespace pb_ds
       {
       private:
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	Policy_Tl, 0>::type
 	store_hash_indicator;
 
@@ -430,22 +430,22 @@ namespace pb_ds
 	  };
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 1>::type
 	probe_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 2>::type
 	comb_probe_fn;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 3>::type
 	trigger_policy;
 
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	  Policy_Tl, 4>::type
 	size_policy;
 
@@ -468,56 +468,56 @@ namespace pb_ds
       };
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	performance_cc_range_hashing_policies,
 	no_access_generic_cc_hash_table_t>::type
       performance_cc_types;
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	regression_cc_range_hashing_policies,
 	access_generic_cc_hash_table_t>::type
       regression_cc_types;
 
       typedef
-      typename pb_ds::detail::typelist_at_index<
+      typename __gnu_cxx::typelist::at_index<
 	performance_cc_types,
 	0>::type
       performance_min_cc_type;
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	performance_gp_range_hashing_policies,
 	no_access_generic_gp_hash_table_t>::type
       performance_gp_types;
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	regression_gp_range_hashing_policies,
 	access_generic_gp_hash_table_t>::type
       regression_gp_types;
 
       typedef
-      typename pb_ds::detail::typelist_at_index<
+      typename __gnu_cxx::typelist::at_index<
 	performance_gp_types,
 	0>::type
       performance_min_gp_type;
 
     public:
       typedef
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
       performance_cc_types,
       performance_gp_types>::type
       performance_tl;
 
       typedef
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
 	regression_gp_types,
 	regression_cc_types>::type
       regression_tl;
 
       typedef
-      typename pb_ds::detail::typelist1<
+      typename __gnu_cxx::typelist::create1<
 	performance_min_cc_type>::type
       performance_min_tl;
     };
@@ -636,7 +636,7 @@ namespace pb_ds
       };
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	Comb_Hash_Fn_TL,
 	generic_cc_hash_table_t>::type
       performance_cc_types;
@@ -660,14 +660,14 @@ namespace pb_ds
       };
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	Comb_Probe_Fn_TL,
 	no_access_generic_gp_hash_table_t>::type
       performance_gp_types;
 
     public:
       typedef
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
       performance_cc_types,
       performance_gp_types>::type
       performance_tl;
@@ -683,14 +683,14 @@ namespace pb_ds
 
       typedef pb_ds::test::move_to_front_lu_policy_t_ mtf_u;
 
-      typedef pb_ds::test::counter_lu_policy_t_< Allocator, 5> cnt_5_u;
+      typedef pb_ds::test::counter_lu_policy_t_<Allocator, 5> cnt_5_u;
 
-      typedef typename pb_ds::detail::typelist1< mtf_u>::type lu_policy0;
+      typedef typename __gnu_cxx::typelist::create1<mtf_u>::type lu_policy0;
 
-      typedef typename pb_ds::detail::typelist1< cnt_5_u>::type lu_policy1;
+      typedef typename __gnu_cxx::typelist::create1<cnt_5_u>::type lu_policy1;
 
       typedef
-      typename pb_ds::detail::typelist2<
+      typename __gnu_cxx::typelist::create2<
 	lu_policy0,
 	lu_policy1>::type
       lu_policies;
@@ -700,7 +700,7 @@ namespace pb_ds
       {
       private:
         typedef
-	typename pb_ds::detail::typelist_at_index<
+	typename __gnu_cxx::typelist::at_index<
 	Policy_Tl, 0>::type
 	update_policy_t;
 
@@ -716,26 +716,22 @@ namespace pb_ds
       };
 
       typedef
-      typename pb_ds::detail::typelist_transform<
+      typename __gnu_cxx::typelist::transform<
 	lu_policies,
 	generic_list_update_t>::type
       lu_types;
 
       typedef
-      typename pb_ds::detail::typelist_at_index<
+      typename __gnu_cxx::typelist::at_index<
 	lu_types,
 	0>::type
       min_lu_type;
 
     public:
       typedef lu_types performance_tl;
-
       typedef lu_types regression_tl;
 
-      typedef
-      typename pb_ds::detail::typelist1<
-	min_lu_type>::type
-      performance_min_tl;
+      typedef typename __gnu_cxx::typelist::create1<min_lu_type>::type performance_min_tl;
     };
 
     template<typename Key, typename Data, class Cmp_Fn = std::less<Key>,
@@ -743,10 +739,8 @@ namespace pb_ds
 		      class Node_Iterator,
 		      class Cmp_Fn_,
 		      class Allocator_>
-    class Node_Update =
-	     pb_ds::null_tree_node_update,
-	     class Allocator =
-	     std::allocator<std::pair<const Key, Data> > >
+    class Node_Update = pb_ds::null_tree_node_update,
+	     class Allocator = std::allocator<std::pair<const Key, Data> > >
     struct tree_common_types
     {
     private:
@@ -782,21 +776,21 @@ namespace pb_ds
 
     public:
       typedef
-      typename pb_ds::detail::typelist3<
+      typename __gnu_cxx::typelist::create3<
       splay_tree_assoc_container_t,
       rb_tree_assoc_container_t,
       ov_tree_assoc_container_t>::type
       performance_tl;
 
       typedef
-      typename pb_ds::detail::typelist3<
+      typename __gnu_cxx::typelist::create3<
 	ov_tree_assoc_container_t,
 	splay_tree_assoc_container_t,
 	rb_tree_assoc_container_t>::type
       regression_tl;
 
       typedef
-      typename pb_ds::detail::typelist1<
+      typename __gnu_cxx::typelist::create1<
 	rb_tree_assoc_container_t>::type
       performance_min_tl;
     };
@@ -804,40 +798,23 @@ namespace pb_ds
     template<typename Key,
 	     typename Data,
 	     class E_Access_Traits =
-	     typename pb_ds::detail::default_trie_e_access_traits<
-      Key>::type,
-	     class Tag =
-	     pb_ds::pat_trie_tag,
+	     typename pb_ds::detail::default_trie_e_access_traits<Key>::type,
+	     class Tag = pb_ds::pat_trie_tag,
 	     template<typename Const_Node_Iterator,
 		      typename Node_Iterator,
 		      class E_Access_Traits_,
 		      typename Allocator_>
-    class Node_Update =
-	     pb_ds::null_trie_node_update,
-	     class Allocator =
-	     std::allocator<char> >
+    class Node_Update = pb_ds::null_trie_node_update,
+	     class Allocator = std::allocator<char> >
     class trie_common_types
     {
     private:
-      typedef
-      pb_ds::trie<
-      Key,
-      Data,
-      E_Access_Traits,
-      Tag,
-      Node_Update,
-      Allocator>
-      type;
+      typedef pb_ds::trie<Key, Data, E_Access_Traits, Tag, Node_Update, Allocator> type;
 
     public:
-      typedef typename pb_ds::detail::typelist1< type>::type performance_tl;
-
-      typedef typename pb_ds::detail::typelist1< type>::type regression_tl;
-
-      typedef
-      typename pb_ds::detail::typelist1<
-	type>::type
-      performance_min_tl;
+      typedef typename __gnu_cxx::typelist::create1<type>::type performance_tl;
+      typedef typename __gnu_cxx::typelist::create1<type>::type regression_tl;
+      typedef typename __gnu_cxx::typelist::create1<type>::type performance_min_tl;
     };
 
   } // namespace test
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
index 983f8a11c57..f28cb83176b 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/string_form.hpp
@@ -81,74 +81,74 @@ namespace pb_ds
 	private:
 	  template<typename D_Cntnr>
 	  static std::string
-	  name(pb_ds::detail::type_to_type<D_Cntnr>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<D_Cntnr>)
 	  {
             return ("mmap_" + pb_ds_string_form<D_Cntnr>::name());
 	  }
 
 	  template<typename D_Cntnr>
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<D_Cntnr>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<D_Cntnr>)
 	  {
             return (pb_ds_string_form<D_Cntnr>::desc());
 	  }
 
 	  static std::string
-	  name(pb_ds::detail::type_to_type<size_t>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<size_t>)
 	  {
             return ("map");
 	  }
 
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<size_t>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<size_t>)
 	  {
             return ("");
 	  }
 
 	  static std::string
-	  name(pb_ds::detail::type_to_type<basic_type>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<basic_type>)
 	  {
             return ("map");
 	  }
 
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<basic_type>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<basic_type>)
 	  {
             return ("");
 	  }
 
 	  static std::string
-	  name(pb_ds::detail::type_to_type<int>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<int>)
 	  {
             return ("map");
 	  }
 
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<int>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<int>)
 	  {
             return ("");
 	  }
 
 	  static std::string
-	  name(pb_ds::detail::type_to_type<char>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<char>)
 	  {
             return ("map");
 	  }
 
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<char>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<char>)
 	  {
             return ("");
 	  }
 
 	  static std::string
-	  name(pb_ds::detail::type_to_type<pb_ds::null_mapped_type>)
+	  name(__gnu_cxx::typelist::detail::type_to_type<pb_ds::null_mapped_type>)
 	  {
             return ("set");
 	  }
 
 	  static std::string
-	  desc(pb_ds::detail::type_to_type<pb_ds::null_mapped_type>)
+	  desc(__gnu_cxx::typelist::detail::type_to_type<pb_ds::null_mapped_type>)
 	  {
             return ("");
 	  }
@@ -157,13 +157,13 @@ namespace pb_ds
 	  static std::string
 	  name()
 	  {
-            return (name(pb_ds::detail::type_to_type<mapped_type>()));
+            return (name(__gnu_cxx::typelist::detail::type_to_type<mapped_type>()));
 	  }
 
 	  static std::string
 	  desc()
 	  {
-            return (desc(pb_ds::detail::type_to_type<mapped_type>()));
+            return (desc(__gnu_cxx::typelist::detail::type_to_type<mapped_type>()));
 	  }
 	};
 
diff --git a/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp b/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
index 288aba24a47..3df687c4354 100644
--- a/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/assoc/template_policy.hpp
@@ -47,8 +47,7 @@
 #ifndef PB_DS_TEMPLATE_POLICY_HPP
 #define PB_DS_TEMPLATE_POLICY_HPP
 
-#include <ext/pb_ds/detail/typelist.hpp>
-
+#include <ext/typelist.h>
 #include <ext/pb_ds/hash_policy.hpp>
 #include <ext/pb_ds/tree_policy.hpp>
 #include <ext/pb_ds/list_update_policy.hpp>
diff --git a/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp b/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
index 437fe6e09e5..a9975578463 100644
--- a/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/common_type/priority_queue/common_type.hpp
@@ -49,7 +49,7 @@
 
 #include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/priority_queue.hpp>
-#include <ext/pb_ds/detail/typelist.hpp>
+#include <ext/typelist.h>
 
 namespace pb_ds
 {
@@ -72,7 +72,7 @@ namespace pb_ds
 
       typedef pb_ds::priority_queue<Value_Type, Cmp_Fn, pb_ds::thin_heap_tag, Allocator> thin_heap_t;
 
-      typedef typename pb_ds::detail::typelist5<thin_heap_t, pairing_heap_t, binomial_heap_t, rc_binomial_heap_t, binary_heap_t>::type all_tl;
+      typedef typename __gnu_cxx::typelist::create5<thin_heap_t, pairing_heap_t, binomial_heap_t, rc_binomial_heap_t, binary_heap_t>::type all_tl;
 
     public:
       typedef all_tl performance_tl;
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
index 528934e92c6..889edf24e1b 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_map.hpp
@@ -47,10 +47,11 @@
 #ifndef PB_DS_NATIVE_HASH_MAP_HPP
 #define PB_DS_NATIVE_HASH_MAP_HPP
 
+#include <string>
+#include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_hash_tag.hpp>
 #include <io/xml.hpp>
-#include <string>
 
 // Default to using tr1.
 #define PB_DS_USE_TR1 1
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
index 937cc6735df..a525ef20759 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_multimap.hpp
@@ -47,57 +47,27 @@
 #ifndef PB_DS_NATIVE_HASH_MULTIMAP_HPP
 #define PB_DS_NATIVE_HASH_MULTIMAP_HPP
 
+#include <string>
+#include <ext/hash_map>
+#include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_hash_tag.hpp>
 #include <io/xml.hpp>
-#include <string>
-#include <ext/hash_map>
 
 namespace pb_ds
 {
-
   namespace test
   {
-
-#define PB_DS_CLASS_T_DEC						\
-    template<								\
-						typename Key,		\
-						typename Data,		\
-						size_t Init_Size,	\
-						class Hash_Fn,		\
-						class Eq_Fn,		\
-						class Less_Fn,		\
-						class Allocator>
-
-#define PB_DS_CLASS_C_DEC					\
-    native_hash_multimap<					\
-						Key,		\
-						Data,		\
-						Init_Size,	\
-						Hash_Fn,	\
-						Eq_Fn,		\
-						Less_Fn,	\
-						Allocator>
-
-#define PB_DS_BASE_C_DEC					\
-    __gnu_cxx::hash_multimap<					\
-						Key,		\
-						Data,		\
-						Hash_Fn,	\
-						Eq_Fn,		\
-						Allocator>
+#define PB_DS_BASE_C_DEC \
+    __gnu_cxx::hash_multimap<Key, Data, Hash_Fn, Eq_Fn, Allocator>
 
     template<typename Key,
 	     typename Data,
 	     size_t Init_Size = 8,
-	     class Hash_Fn =
-	     typename pb_ds::detail::default_hash_fn<Key>::type,
-	     class Eq_Fn =
-	     std::equal_to<Key>,
-	     class Less_Fn =
-	     std::less<Key>,
-	     class Allocator =
-	     std::allocator<char> >
+	     class Hash_Fn = typename pb_ds::detail::default_hash_fn<Key>::type,
+	     class Eq_Fn = std::equal_to<Key>,
+	     class Less_Fn = std::less<Key>,
+	     class Allocator = std::allocator<char> >
     class native_hash_multimap : public PB_DS_BASE_C_DEC
     {
     private:
@@ -114,119 +84,78 @@ namespace pb_ds
 
       typedef
       typename Allocator::template rebind<
-	std::pair<
-	Key,
-	Data> >::other::const_reference
+	std::pair<Key, Data> >::other::const_reference
       const_reference;
 
-    public:
-      native_hash_multimap();
+      native_hash_multimap() : base_type(Init_Size)
+      { }
+
+      template<typename It>
+      native_hash_multimap(It f, It l) : base_type(f, l)
+      { }
 
       inline void
       insert(typename base_type::const_reference r_val)
       {
-        typedef
-	  std::pair<
-	  typename base_type::iterator,
-	  typename base_type::iterator>
-	  eq_range_t;
-
+        typedef std::pair<iterator, iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::iterator it = f.first;
-
+        iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
 	      return;
-
             ++it;
 	  }
-
         base_type::insert(r_val);
       }
 
       inline iterator
       find(const_reference r_val)
       {
-        typedef
-	std::pair<
-	typename base_type::iterator,
-	typename base_type::iterator>
-	eq_range_t;
-
+        typedef std::pair<iterator, iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::iterator it = f.first;
-
+        iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
 	      return it;
-
             ++it;
 	  }
-
         return base_type::end();
       }
 
       inline const_iterator
       find(const_reference r_val) const
       {
-        typedef
-	std::pair<
-	typename base_type::const_iterator,
-	typename base_type::const_iterator>
-	eq_range_t;
-
+        typedef std::pair<const_iterator, const_iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::const_iterator it = f.first;
-
+        const_iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
 	      return it;
-
             ++it;
 	  }
-
         return base_type::end();
       }
 
-      template<typename It>
-      native_hash_multimap(It f, It l);
-
       static std::string
       name()
-      {
-        return ("n_hash_mmap");
-      }
+      { return std::string("n_hash_mmap"); }
 
       static std::string
       desc()
       {
-        return (make_xml_tag("type", "value", "__gnucxx_hash_multimap"));
+        return make_xml_tag("type", "value", "__gnucxx_hash_multimap");
       }
     };
 
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    native_hash_multimap() : base_type(Init_Size)
-    { }
-
-    PB_DS_CLASS_T_DEC
-    template<typename It>
-    PB_DS_CLASS_C_DEC::
-    native_hash_multimap(It f, It l) : base_type(f, l)
-    { }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
 #undef PB_DS_BASE_C_DEC
 
   } // namespace test
-
 } // namespace pb_ds
 
-#endif // #ifndef PB_DS_NATIVE_HASH_MULTIMAP_HPP
+#endif 
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
index e1082c907e4..7f89392629f 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_hash_set.hpp
@@ -47,10 +47,11 @@
 #ifndef PB_DS_NATIVE_HASH_SET_HPP
 #define PB_DS_NATIVE_HASH_SET_HPP
 
+#include <string>
+#include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_hash_tag.hpp>
 #include <io/xml.hpp>
-#include <string>
 
 // Default to using tr1.
 #define PB_DS_USE_TR1 1
@@ -77,7 +78,7 @@ namespace pb_ds
 
     template<typename Key,
 	     size_t Init_Size = 8,
-	     typename Hash_Fn = typename pb_ds::detail::default_hash_fn<Key>::type,
+         typename Hash_Fn = typename pb_ds::detail::default_hash_fn<Key>::type,
 	     typename Eq_Fn = std::equal_to<Key>,
 	     typename Less_Fn = std::less<Key>,
 	     typename Allocator = std::allocator<char>
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
index a9d8e11b10e..d32730c230b 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_map.hpp
@@ -48,30 +48,22 @@
 #define PB_DS_NATIVE_MAP_HPP
 
 #include <map>
+#include <string>
+#include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_tree_tag.hpp>
 #include <io/xml.hpp>
-#include <string>
 
 namespace pb_ds
 {
-
   namespace test
   {
-
-#define PB_DS_BASE_C_DEC						\
-    std::map<								\
-									Key, \
-									Data, \
-									Cmp_Fn,	\
-									typename Allocator::template rebind< \
-																std::pair< \
-																			const Key, \
-																			Data > >::other >
+#define PB_DS_BASE_C_DEC \
+    std::map<Key, Data, Cmp_Fn,	\
+typename Allocator::template rebind<std::pair<const Key, Data > >::other >
 
     template<typename Key, typename Data, class Cmp_Fn = std::less<Key>,
-	     class Allocator =
-	     std::allocator<char> >
+	     class Allocator = std::allocator<char> >
     class native_map : public PB_DS_BASE_C_DEC
     {
     private:
@@ -80,7 +72,6 @@ namespace pb_ds
     public:
       typedef native_tree_tag container_category;
 
-    public:
       native_map() : base_type()
       { }
 
@@ -90,15 +81,11 @@ namespace pb_ds
 
       static std::string
       name()
-      {
-        return ("n_map");
-      }
+      { return std::string("n_map"); }
 
       static std::string
       desc()
-      {
-        return (make_xml_tag(            "type", "value", "std_map"));
-      }
+      { return make_xml_tag("type", "value", "std_map"); }
     };
 
 #undef PB_DS_BASE_C_DEC
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
index 42b9766e3c7..e2e1bafb3fb 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_multimap.hpp
@@ -48,38 +48,20 @@
 #define PB_DS_NATIVE_MULTIMAP_HPP
 
 #include <map>
-#include <native_type/assoc/native_tree_tag.hpp>
 #include <string>
+#include <ext/pb_ds/detail/type_utils.hpp>
+#include <native_type/assoc/native_tree_tag.hpp>
 
 namespace pb_ds
 {
-
   namespace test
   {
-
-#define PB_DS_CLASS_T_DEC						\
-    template<typename Key, typename Data, class Less_Fn, class Allocator>
-
-#define PB_DS_CLASS_C_DEC					\
-    native_multimap<						\
-						Key,		\
-						Data,		\
-						Less_Fn,	\
-						Allocator>
-
-#define PB_DS_BASE_C_DEC						\
-    std::multimap<							\
-									Key, \
-									Data, \
-									Less_Fn, \
-									typename Allocator::template rebind< \
-																std::pair< \
-																		const Key, \
-																		Data> >::other >
+#define PB_DS_BASE_C_DEC \
+    std::multimap<Key, Data, Less_Fn, \
+      typename Allocator::template rebind<std::pair<const Key, Data> >::other>
 
     template<typename Key, typename Data, class Less_Fn = std::less<Key>,
-	     class Allocator =
-	     std::allocator<char> >
+	     class Allocator = std::allocator<char> >
     class native_multimap : public PB_DS_BASE_C_DEC
     {
     private:
@@ -92,55 +74,41 @@ namespace pb_ds
 
       typedef
       typename Allocator::template rebind<
-	std::pair<
-	Key,
-	Data> >::other::const_reference
+	std::pair<Key, Data> >::other::const_reference
       const_reference;
 
       typedef typename base_type::iterator iterator;
-
       typedef typename base_type::const_iterator const_iterator;
 
-    public:
-      native_multimap();
+      native_multimap()  { }
+
+      template<typename It>
+      native_multimap(It f, It l) : base_type(f, l)
+      { }
 
       inline void
       insert(const_reference r_val)
       {
-        typedef
-	  std::pair<
-	  typename base_type::iterator,
-	  typename base_type::iterator>
-	  eq_range_t;
-
+        typedef std::pair<iterator, iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::iterator it = f.first;
-
+        iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
 	      return;
-
             ++it;
 	  }
-
         base_type::insert(r_val);
       }
 
       inline iterator
       find(const_reference r_val)
       {
-        typedef
-	std::pair<
-	typename base_type::iterator,
-	typename base_type::iterator>
-	eq_range_t;
-
+        typedef std::pair<iterator, iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::iterator it = f.first;
-
+        iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
@@ -154,55 +122,28 @@ namespace pb_ds
       inline const_iterator
       find(const_reference r_val) const
       {
-        typedef
-	std::pair<
-	typename base_type::const_iterator,
-	typename base_type::const_iterator>
-	eq_range_t;
-
+        typedef std::pair<const_iterator, const_iterator> eq_range_t;
         eq_range_t f = base_type::equal_range(r_val.first);
 
-        typename base_type::const_iterator it = f.first;
-
+        const_iterator it = f.first;
         while (it != f.second)
 	  {
             if (it->second == r_val.second)
 	      return it;
             ++it;
 	  }
-
         return base_type::end();
       }
-
-      template<typename It>
-      native_multimap(It f, It l);
-
+      
       static std::string
       name()
-      {
-        return ("n_mmap");
-      }
+      { return std::string("n_mmap"); }
 
       static std::string
       desc()
-      {
-        return (make_xml_tag("type", "value", "std_multimap"));
-      }
+      { return make_xml_tag("type", "value", "std_multimap"); }
     };
 
-    PB_DS_CLASS_T_DEC
-    PB_DS_CLASS_C_DEC::
-    native_multimap()
-    { }
-
-    PB_DS_CLASS_T_DEC
-    template<typename It>
-    PB_DS_CLASS_C_DEC::
-    native_multimap(It f, It l) : base_type(f, l)
-    { }
-
-#undef PB_DS_CLASS_T_DEC
-#undef PB_DS_CLASS_C_DEC
 #undef PB_DS_BASE_C_DEC
 } // namespace test
 
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
index ec72648f854..9d03adce3fc 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_set.hpp
@@ -47,38 +47,30 @@
 #ifndef PB_DS_NATIVE_SET_HPP
 #define PB_DS_NATIVE_SET_HPP
 
+#include <string>
+#include <ext/pb_ds/detail/type_utils.hpp>
 #include <ext/pb_ds/detail/standard_policies.hpp>
 #include <native_type/assoc/native_tree_tag.hpp>
 #include <io/xml.hpp>
-#include <string>
 
 namespace pb_ds
 {
-
   namespace test
   {
-
-#define PB_DS_BASE_C_DEC						\
-    std::set<								\
-								Key,	\
-								Cmp_Fn,	\
-								typename Allocator::template rebind< \
-														Key>::other>
+#define PB_DS_BASE_C_DEC \
+    std::set<Key, Cmp_Fn, typename Allocator::template rebind<Key>::other>
 
     template<typename Key, class Cmp_Fn = std::less<Key>,
-	     class Allocator =
-	     std::allocator<char> >
+	     class Allocator = std::allocator<char> >
     class native_set : public PB_DS_BASE_C_DEC
     {
     private:
-      typedef PB_DS_BASE_C_DEC base_type;
+      typedef PB_DS_BASE_C_DEC 			 base_type;
 
     public:
-      typedef native_tree_tag container_category;
+      typedef native_tree_tag 			 container_category;
+      typedef typename base_type::const_iterator const_iterator;
 
-      typedef typename PB_DS_BASE_C_DEC::const_iterator const_iterator;
-
-    public:
       native_set() : base_type()
       { }
 
@@ -91,21 +83,15 @@ namespace pb_ds
 
       static std::string
       name()
-      {
-        return ("n_set");
-      }
+      { return std::string("n_set"); }
 
       static std::string
       desc()
-      {
-        return (make_xml_tag(            "type", "value", "std_set"));
-      }
+      { return make_xml_tag("type", "value", "std_set"); }
     };
 
 #undef PB_DS_BASE_C_DEC
-
   } // namespace test
-
 } // namespace pb_ds
 
 #endif // #ifndef PB_DS_NATIVE_SET_HPP
diff --git a/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp b/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
index bf69c92c235..079f1489bfa 100644
--- a/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
+++ b/libstdc++-v3/testsuite/util/native_type/assoc/native_tree_tag.hpp
@@ -49,15 +49,11 @@
 
 namespace pb_ds
 {
-
   namespace test
   {
-
     struct native_tree_tag
     { };
-
   } // namespace test
-
 } // namespace pb_ds
 
 #endif // #ifndef PB_DS_NATIVE_TREE_DS_TAG_HPP
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
index 0754567a304..83e5fda0e5e 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/erase_test.hpp
@@ -74,7 +74,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       erase_test(const erase_test& );
@@ -100,7 +100,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
index 2cb9abc8f50..c20aee3e8fb 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/mem_usage/multimap_insert_test.hpp
@@ -75,18 +75,18 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       multimap_insert_test(const multimap_insert_test& );
 
       template<typename Cntnr>
       size_t
-      insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::true_type);
+      insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::true_type);
 
       template<typename Cntnr>
       size_t
-      insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::false_type);
+      insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::false_type);
 
     private:
       const It m_ins_b;
@@ -109,7 +109,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -123,7 +123,7 @@ namespace pb_ds
 	  It ins_it_e = m_ins_b;
 	  std::advance(ins_it_e, ins_size);
 
-	  const size_t delta_mem = insert(pb_ds::detail::type_to_type<Cntnr>(),
+	  const size_t delta_mem = insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>(),
 					  ins_it_b,
 					  ins_it_e,
 					  pb_ds::detail::integral_constant<int,Native>());
@@ -136,7 +136,7 @@ namespace pb_ds
     template<typename Cntnr>
     size_t
     PB_DS_CLASS_C_DEC::
-    insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::true_type)
+    insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::true_type)
     {
       mem_track_allocator<char> alloc;
 
@@ -158,7 +158,7 @@ namespace pb_ds
     template<typename Cntnr>
     size_t
     PB_DS_CLASS_C_DEC::
-    insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::false_type)
+    insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e, pb_ds::detail::false_type)
     {
       mem_track_allocator<char> alloc;
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
index 51cc3ccac62..c26cf3de587 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/multimap_common_type.hpp
@@ -129,8 +129,8 @@ namespace pb_ds
 
       public:
 	typedef
-        typename pb_ds::detail::typelist_flatten<
-	typename pb_ds::detail::typelist_transform<
+        typename __gnu_cxx::typelist::flatten<
+	typename __gnu_cxx::typelist::transform<
 	Sec_Tl,
 	hash_mmap_transform>::type>::type
         type;
@@ -159,8 +159,8 @@ namespace pb_ds
 
       public:
 	typedef
-        typename pb_ds::detail::typelist_flatten<
-	typename pb_ds::detail::typelist_transform<
+        typename __gnu_cxx::typelist::flatten<
+	typename __gnu_cxx::typelist::transform<
 	Sec_Tl,
 	tree_mmap_transform>::type>::type
         type;
@@ -242,11 +242,11 @@ namespace pb_ds
 
     public:
       typedef
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
       hl_mmap_tl_t,
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
       hh_mmap_tl_t,
-      typename pb_ds::detail::typelist_append<
+      typename __gnu_cxx::typelist::append<
       th_mmap_tl_t,
       tl_mmap_tl_t>::type>::type>::type
       type;
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
index 8a6a22e9827..be4a31b3bdc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/common_type.hpp
@@ -73,8 +73,8 @@ namespace pb_ds
     };
 
     typedef
-    pb_ds::detail::typelist_flatten<
-      pb_ds::detail::typelist_transform<
+    __gnu_cxx::typelist::flatten<
+      __gnu_cxx::typelist::transform<
       hash_set_tl_t,
       hash_mmap_transform>::type>::type
     hash_mmap_tl_t;
@@ -97,8 +97,8 @@ namespace pb_ds
     };
 
     typedef
-    pb_ds::detail::typelist_flatten<
-      pb_ds::detail::typelist_transform<
+    __gnu_cxx::typelist::flatten<
+      __gnu_cxx::typelist::transform<
       tree_set_tl_t,
       tree_mmap_transform>::type>::type
     tree_mmap_tl_t;
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
index aa58e8a9d4e..1ef770adcdc 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/find_test.hpp
@@ -140,7 +140,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       find_test(const find_test& );
@@ -176,7 +176,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
index d4227796d75..ab74c7a0492 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/insert_test.hpp
@@ -104,14 +104,14 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       insert_test(const insert_test& );
 
       template<typename Cntnr>
       void
-      insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
+      insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
 
     private:
       const It m_ins_b;
@@ -134,7 +134,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -162,7 +162,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    insert(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
+    insert(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
     {
       Cntnr cntnr;
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
index 1d005fc686f..d8e5326afba 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_find_test.hpp
@@ -155,18 +155,18 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       multimap_find_test(const multimap_find_test& );
 
       template<typename Cntnr>
       Cntnr
-      init(It ins_b, It ins_e, pb_ds::detail::type_to_type<Cntnr>, pb_ds::detail::true_type);
+      init(It ins_b, It ins_e, __gnu_cxx::typelist::detail::type_to_type<Cntnr>, pb_ds::detail::true_type);
 
       template<typename Cntnr>
       Cntnr
-      init(It ins_b, It ins_e, pb_ds::detail::type_to_type<Cntnr>, pb_ds::detail::false_type);
+      init(It ins_b, It ins_e, __gnu_cxx::typelist::detail::type_to_type<Cntnr>, pb_ds::detail::false_type);
 
     private:
       const It m_ins_b;
@@ -189,7 +189,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -205,7 +205,7 @@ namespace pb_ds
 
 	  Cntnr c = init(ins_it_b,
 			 ins_it_e,
-			 pb_ds::detail::type_to_type<Cntnr>(),
+			 __gnu_cxx::typelist::detail::type_to_type<Cntnr>(),
 			 pb_ds::detail::integral_constant<int,Native>());
 
 	  pb_ds::test::detail::multimap_find_functor<It, Cntnr, Native>
@@ -222,7 +222,7 @@ namespace pb_ds
     template<typename Cntnr>
     Cntnr
     PB_DS_CLASS_C_DEC::
-    init(It ins_b, It ins_e, pb_ds::detail::type_to_type<Cntnr>, pb_ds::detail::true_type)
+    init(It ins_b, It ins_e, __gnu_cxx::typelist::detail::type_to_type<Cntnr>, pb_ds::detail::true_type)
     {
       return Cntnr(ins_b, ins_e);
     }
@@ -231,7 +231,7 @@ namespace pb_ds
     template<typename Cntnr>
     Cntnr
     PB_DS_CLASS_C_DEC::
-    init(It ins_b, It ins_e, pb_ds::detail::type_to_type<Cntnr>, pb_ds::detail::false_type)
+    init(It ins_b, It ins_e, __gnu_cxx::typelist::detail::type_to_type<Cntnr>, pb_ds::detail::false_type)
     {
       Cntnr ret;
 
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
index f481137825c..4b6885bec02 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/multimap_insert_test.hpp
@@ -132,7 +132,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       multimap_insert_test(const multimap_insert_test& );
@@ -158,7 +158,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
index eaf66b4537e..96c08b5c4db 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_find_test.hpp
@@ -106,7 +106,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       subscript_find_test(const subscript_find_test& );
@@ -142,7 +142,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
index 2fd8b887487..ad3d650f0c2 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/subscript_insert_test.hpp
@@ -104,7 +104,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       subscript_insert_test(const subscript_insert_test& );
@@ -140,7 +140,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
index c87a7823d6a..b169048883c 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_order_statistics_test.hpp
@@ -157,7 +157,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       tree_order_statistics_test(const tree_order_statistics_test& );
@@ -188,7 +188,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
index 18dd0af6c13..4309d5a5b08 100644
--- a/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/assoc/timing/tree_split_join_test.hpp
@@ -134,7 +134,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       tree_split_join_test(const tree_split_join_test& );
@@ -157,7 +157,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
index 85e234c9b68..a0db15ff299 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/mem_usage/pop_test.hpp
@@ -74,7 +74,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       pop_test(const pop_test& );
@@ -100,7 +100,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
index ffa1187dde4..cd8135dba55 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/join_test.hpp
@@ -128,7 +128,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>)
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
       {
 	using pb_ds::test::detail::double_push_functor;
 	using pb_ds::test::detail::double_push_join_functor;
@@ -159,7 +159,7 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      join(pb_ds::detail::type_to_type<Cntnr>, It b, It e)
+      join(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It b, It e)
       {
 	Cntnr cntnr;
 	typedef typename Cntnr::const_reference const_reference;
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
index 8694f995769..25fc4167c5f 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/modify_test.hpp
@@ -283,14 +283,14 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       modify_test(const modify_test& );
 
       template<typename Cntnr>
       void
-      modify(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
+      modify(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
 
     private:
       const It m_ins_b;
@@ -316,7 +316,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -367,7 +367,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    modify(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
+    modify(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
     {
       Cntnr cntnr;
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
index 779ee672926..21869517cb3 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_pop_test.hpp
@@ -107,14 +107,14 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       push_pop_test(const push_pop_test& );
 
       template<typename Cntnr>
       void
-      push(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
+      push(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
 
     private:
       const It m_ins_b;
@@ -137,7 +137,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -165,7 +165,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    push(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
+    push(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
     {
       Cntnr cntnr;
 
diff --git a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
index 29dcd7740ce..fbcc340fad3 100644
--- a/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
+++ b/libstdc++-v3/testsuite/util/performance/priority_queue/timing/push_test.hpp
@@ -104,14 +104,14 @@ namespace pb_ds
 
       template<typename Cntnr>
       void
-      operator()(pb_ds::detail::type_to_type<Cntnr>);
+      operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>);
 
     private:
       push_test(const push_test& );
 
       template<typename Cntnr>
       void
-      push(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
+      push(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e);
 
     private:
       const It m_ins_b;
@@ -134,7 +134,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       xml_result_set_performance_formatter res_set_fmt(
 						       string_form<Cntnr>::name(),
@@ -162,7 +162,7 @@ namespace pb_ds
     template<typename Cntnr>
     void
     PB_DS_CLASS_C_DEC::
-    push(pb_ds::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
+    push(__gnu_cxx::typelist::detail::type_to_type<Cntnr>, It ins_it_b, It ins_it_e)
     {
       Cntnr cntnr;
 
diff --git a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
index 7567c5f105e..e62bf409c10 100644
--- a/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
+++ b/libstdc++-v3/testsuite/util/regression/assoc/common_type.hpp
@@ -82,7 +82,7 @@ namespace test
     typedef typename tree_common_types<basic_type, Data_Type, std::less<basic_type>, pb_ds::tree_order_statistics_node_update, alloc_type>::regression_tl order_statistics_tl_t;
 
   public:
-    typedef typename pb_ds::detail::typelist_append<no_order_statistics_tl_t, order_statistics_tl_t>::type tl_t;
+    typedef typename __gnu_cxx::typelist::append<no_order_statistics_tl_t, order_statistics_tl_t>::type tl_t;
 
     typedef no_order_statistics_tl_t min_tl_t;
   };
@@ -98,7 +98,7 @@ namespace test
     typedef typename trie_common_types<basic_type, Data_Type, e_access_traits_t, pb_ds::pat_trie_tag, pb_ds::trie_prefix_search_node_update, alloc_type>::regression_tl prefix_search_tl_t;
 
   public:
-    typedef typename pb_ds::detail::typelist_append<no_updates_tl_t, typename pb_ds::detail::typelist_append<prefix_search_tl_t, order_statistics_tl_t>::type>::type tl_t;
+    typedef typename __gnu_cxx::typelist::append<no_updates_tl_t, typename __gnu_cxx::typelist::append<prefix_search_tl_t, order_statistics_tl_t>::type>::type tl_t;
 
     typedef no_updates_tl_t min_tl_t;
   };
diff --git a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
index a7c3b7b8b30..219701c46cf 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/assoc/rand_regression_test.hpp
@@ -76,7 +76,7 @@ namespace detail
 
     template<typename Cntnr>
     void
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       unsigned long ul = static_cast<unsigned long>(m_sd);
       container_rand_regression_test<Cntnr> t(ul, m_n, m_n, m_tp, m_ip, 
@@ -143,7 +143,7 @@ namespace detail
     try
       {
 	detail::rand_reg_test tst(sd, n, m, tp, ip, ep, cp, mp, disp);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
     catch(...)
       {
diff --git a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
index 385a2c4dda2..1390a075b86 100644
--- a/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
+++ b/libstdc++-v3/testsuite/util/regression/rand/priority_queue/rand_regression_test.hpp
@@ -76,7 +76,7 @@ namespace detail
 
     template<typename Cntnr>
     void
-    operator()(pb_ds::detail::type_to_type<Cntnr>)
+    operator()(__gnu_cxx::typelist::detail::type_to_type<Cntnr>)
     {
       unsigned long ul = static_cast<unsigned long>(m_sd);
       container_rand_regression_test<Cntnr> t(ul, m_n, m_n, m_tp, m_ip, m_dp, 
@@ -145,7 +145,7 @@ namespace detail
     try
       {
 	detail::rand_reg_test tst(sd, n, m, tp, ip, dp, ep, cp, mp, disp);
-	pb_ds::detail::typelist_apply(tst, tl);
+	__gnu_cxx::typelist::apply(tst, tl);
       }
     catch(...)
       {
diff --git a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
index f0da95ed0dd..16075f17e17 100644
--- a/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
+++ b/libstdc++-v3/testsuite/util/regression/trait/assoc/type_trait.hpp
@@ -93,7 +93,7 @@ namespace pb_ds
         generate_value(Gen& r_gen, size_t max)
 	{
 	  return (generate_value(r_gen, max,
-				 pb_ds::detail::type_to_type<value_type>()));
+				 __gnu_cxx::typelist::detail::type_to_type<value_type>()));
 	}
 
 	static const_key_reference
@@ -118,21 +118,21 @@ namespace pb_ds
       private:
 	template<typename Gen>
 	static value_type
-        generate_value(Gen& r_gen, size_t max,  pb_ds::detail::type_to_type<pb_ds::null_mapped_type>)
+        generate_value(Gen& r_gen, size_t max,  __gnu_cxx::typelist::detail::type_to_type<pb_ds::null_mapped_type>)
 	{
 	  return (basic_type(r_gen, max));
 	}
 
 	template<typename Gen>
 	static value_type
-        generate_value(Gen& r_gen, size_t max, pb_ds::detail::type_to_type<basic_type>)
+        generate_value(Gen& r_gen, size_t max, __gnu_cxx::typelist::detail::type_to_type<basic_type>)
 	{
 	  return (basic_type(r_gen, max));
 	}
 
 	template<typename Gen>
 	static value_type
-        generate_value(Gen& r_gen, size_t max, pb_ds::detail::type_to_type<std::pair<const basic_type, basic_type> >)
+        generate_value(Gen& r_gen, size_t max, __gnu_cxx::typelist::detail::type_to_type<std::pair<const basic_type, basic_type> >)
 	{
 	  return (std::make_pair(basic_type(r_gen, max), basic_type(r_gen, max)));
 	}
-- 
cgit v1.2.1