diff --git a/test/algorithm/erase_key.cpp b/test/algorithm/erase_key.cpp
index c3a2f2f0..2685bfd2 100644
--- a/test/algorithm/erase_key.cpp
+++ b/test/algorithm/erase_key.cpp
@@ -10,9 +10,9 @@
 #include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/sequence/generation/make_map.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_set.hpp>
-#include <boost/fusion/sequence/conversion/as_map.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/container/set/convert.hpp>
+#include <boost/fusion/container/map/convert.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/iterator/deref.hpp>
diff --git a/test/sequence/adapt_assoc_struct.cpp b/test/sequence/adapt_assoc_struct.cpp
index 44c7bcec..277433b3 100644
--- a/test/sequence/adapt_assoc_struct.cpp
+++ b/test/sequence/adapt_assoc_struct.cpp
@@ -19,7 +19,7 @@
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp
index e043a0ff..0f47c648 100644
--- a/test/sequence/adapt_struct.cpp
+++ b/test/sequence/adapt_struct.cpp
@@ -15,7 +15,7 @@
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/as_list.cpp b/test/sequence/as_list.cpp
index fed5286f..72dc9aa4 100644
--- a/test/sequence/as_list.cpp
+++ b/test/sequence/as_list.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
+#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/as_map.cpp b/test/sequence/as_map.cpp
index 584c7ca5..a9364bc6 100644
--- a/test/sequence/as_map.cpp
+++ b/test/sequence/as_map.cpp
@@ -9,8 +9,8 @@
 #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_map.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/map/convert.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
diff --git a/test/sequence/as_set.cpp b/test/sequence/as_set.cpp
index 4afa4045..9bfd5869 100644
--- a/test/sequence/as_set.cpp
+++ b/test/sequence/as_set.cpp
@@ -9,9 +9,9 @@
 #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_set.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/set/convert.hpp>
+#include <boost/fusion/container/list/convert.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
diff --git a/test/sequence/as_vector.cpp b/test/sequence/as_vector.cpp
index c295e966..d728c837 100644
--- a/test/sequence/as_vector.cpp
+++ b/test/sequence/as_vector.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/boost_tuple.cpp b/test/sequence/boost_tuple.cpp
index 17b96c77..1e3d23b4 100644
--- a/test/sequence/boost_tuple.cpp
+++ b/test/sequence/boost_tuple.cpp
@@ -15,7 +15,7 @@
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/deque_misc.cpp b/test/sequence/deque_misc.cpp
index e29c7c8b..53836bbc 100644
--- a/test/sequence/deque_misc.cpp
+++ b/test/sequence/deque_misc.cpp
@@ -7,7 +7,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/container/deque/deque.hpp>
-#include <boost/fusion/sequence/conversion/as_deque.hpp>
+#include <boost/fusion/container/deque/convert.hpp>
 #include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE deque
diff --git a/test/sequence/list_misc.cpp b/test/sequence/list_misc.cpp
index 68827398..2d8fe047 100644
--- a/test/sequence/list_misc.cpp
+++ b/test/sequence/list_misc.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/container/list/list.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
+#include <boost/fusion/container/list/convert.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_FORWARD_ONLY
diff --git a/test/sequence/std_pair.cpp b/test/sequence/std_pair.cpp
index 435a4b85..127a1fbc 100644
--- a/test/sequence/std_pair.cpp
+++ b/test/sequence/std_pair.cpp
@@ -15,7 +15,7 @@
 #include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
diff --git a/test/sequence/tuple_misc.cpp b/test/sequence/tuple_misc.cpp
index 632a9ca1..daef0322 100644
--- a/test/sequence/tuple_misc.cpp
+++ b/test/sequence/tuple_misc.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/tuple.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
diff --git a/test/sequence/vector_misc.cpp b/test/sequence/vector_misc.cpp
index d8e02876..25d3ecfc 100644
--- a/test/sequence/vector_misc.cpp
+++ b/test/sequence/vector_misc.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/container/vector/vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE vector