diff --git a/example/cookbook/do_the_bind.cpp b/example/cookbook/do_the_bind.cpp
index e63556a9..33772383 100644
--- a/example/cookbook/do_the_bind.cpp
+++ b/example/cookbook/do_the_bind.cpp
@@ -28,7 +28,7 @@
 #include <boost/fusion/support/deduce_sequence.hpp>
 
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
diff --git a/example/cookbook/fill_em_up.cpp b/example/cookbook/fill_em_up.cpp
index c77c7b68..69576612 100644
--- a/example/cookbook/fill_em_up.cpp
+++ b/example/cookbook/fill_em_up.cpp
@@ -24,8 +24,8 @@
 ==============================================================================*/
 
 // We'll use these containers as examples
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 // For doing I/O
 #include <boost/fusion/sequence/io.hpp>
diff --git a/example/performance/accumulate.cpp b/example/performance/accumulate.cpp
index 7d8f0a76..6e3d9f80 100644
--- a/example/performance/accumulate.cpp
+++ b/example/performance/accumulate.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 
 #include <algorithm>
 #include <numeric>
diff --git a/example/performance/functional.cpp b/example/performance/functional.cpp
index 228586eb..cb4c2ab9 100644
--- a/example/performance/functional.cpp
+++ b/example/performance/functional.cpp
@@ -7,8 +7,8 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/functional/adapter/unfused_generic.hpp>
 #include <boost/fusion/functional/adapter/unfused_rvalue_args.hpp>
diff --git a/example/performance/inner_product.cpp b/example/performance/inner_product.cpp
index 8257921d..b84eabde 100644
--- a/example/performance/inner_product.cpp
+++ b/example/performance/inner_product.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>
diff --git a/example/performance/inner_product2.cpp b/example/performance/inner_product2.cpp
index b831b219..9bab438e 100644
--- a/example/performance/inner_product2.cpp
+++ b/example/performance/inner_product2.cpp
@@ -10,10 +10,10 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
 #include <algorithm>
diff --git a/example/performance/sequence_efficiency.cpp b/example/performance/sequence_efficiency.cpp
index 6a24f74f..9e1d34c8 100644
--- a/example/performance/sequence_efficiency.cpp
+++ b/example/performance/sequence_efficiency.cpp
@@ -10,8 +10,8 @@
 #define FUSION_MAX_VECTOR_SIZE 30
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/preprocessor/stringize.hpp>
diff --git a/example/performance/zip_efficiency.cpp b/example/performance/zip_efficiency.cpp
index c8132c74..36ded283 100644
--- a/example/performance/zip_efficiency.cpp
+++ b/example/performance/zip_efficiency.cpp
@@ -10,7 +10,7 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/type_traits/remove_reference.hpp>
diff --git a/test/algorithm/all.cpp b/test/algorithm/all.cpp
index 983059c8..47c65e50 100644
--- a/test/algorithm/all.cpp
+++ b/test/algorithm/all.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/any.cpp b/test/algorithm/any.cpp
index 71685ef2..69f114f8 100644
--- a/test/algorithm/any.cpp
+++ b/test/algorithm/any.cpp
@@ -7,8 +7,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/clear.cpp b/test/algorithm/clear.cpp
index 309f3e28..3ab42030 100644
--- a/test/algorithm/clear.cpp
+++ b/test/algorithm/clear.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/count.cpp b/test/algorithm/count.cpp
index ae6ccde6..e87ff9d8 100644
--- a/test/algorithm/count.cpp
+++ b/test/algorithm/count.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <string>
diff --git a/test/algorithm/count_if.cpp b/test/algorithm/count_if.cpp
index 1a8c02e5..d67e464c 100644
--- a/test/algorithm/count_if.cpp
+++ b/test/algorithm/count_if.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/erase.cpp b/test/algorithm/erase.cpp
index efe7dcfe..44f641f3 100644
--- a/test/algorithm/erase.cpp
+++ b/test/algorithm/erase.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/erase_key.cpp b/test/algorithm/erase_key.cpp
index d940714c..c3a2f2f0 100644
--- a/test/algorithm/erase_key.cpp
+++ b/test/algorithm/erase_key.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/sequence/generation/make_set.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#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>
diff --git a/test/algorithm/ext_/find_if_s.cpp b/test/algorithm/ext_/find_if_s.cpp
index d57876e2..f3b06d2b 100755
--- a/test/algorithm/ext_/find_if_s.cpp
+++ b/test/algorithm/ext_/find_if_s.cpp
@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/ext_/for_each_s.cpp b/test/algorithm/ext_/for_each_s.cpp
index 6758872c..bf4e2bbd 100755
--- a/test/algorithm/ext_/for_each_s.cpp
+++ b/test/algorithm/ext_/for_each_s.cpp
@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 
 struct print
 {
diff --git a/test/algorithm/filter.cpp b/test/algorithm/filter.cpp
index 21c93ed0..4c21d03a 100644
--- a/test/algorithm/filter.cpp
+++ b/test/algorithm/filter.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/filter_if.cpp b/test/algorithm/filter_if.cpp
index 681d2bbd..e1bbb230 100644
--- a/test/algorithm/filter_if.cpp
+++ b/test/algorithm/filter_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/find.cpp b/test/algorithm/find.cpp
index 1b913a73..25a61e94 100644
--- a/test/algorithm/find.cpp
+++ b/test/algorithm/find.cpp
@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/algorithm/find_if.cpp b/test/algorithm/find_if.cpp
index 93c694cb..2b402b9f 100644
--- a/test/algorithm/find_if.cpp
+++ b/test/algorithm/find_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/algorithm/fold.cpp b/test/algorithm/fold.cpp
index 933eadb3..55641677 100644
--- a/test/algorithm/fold.cpp
+++ b/test/algorithm/fold.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/for_each.cpp b/test/algorithm/for_each.cpp
index 18ebbda9..a0054fad 100644
--- a/test/algorithm/for_each.cpp
+++ b/test/algorithm/for_each.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/insert.cpp b/test/algorithm/insert.cpp
index 8780636f..acbcf9a3 100644
--- a/test/algorithm/insert.cpp
+++ b/test/algorithm/insert.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/insert_range.cpp b/test/algorithm/insert_range.cpp
index 0aef1e81..4cd3ae41 100644
--- a/test/algorithm/insert_range.cpp
+++ b/test/algorithm/insert_range.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/join.cpp b/test/algorithm/join.cpp
index 39709c50..04341160 100644
--- a/test/algorithm/join.cpp
+++ b/test/algorithm/join.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/algorithm/transformation/join.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
 
 int main()
diff --git a/test/algorithm/none.cpp b/test/algorithm/none.cpp
index 5747494b..ec5676b6 100644
--- a/test/algorithm/none.cpp
+++ b/test/algorithm/none.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/algorithm/pop_back.cpp b/test/algorithm/pop_back.cpp
index 5f9ebaf4..55d4b7fe 100644
--- a/test/algorithm/pop_back.cpp
+++ b/test/algorithm/pop_back.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/pop_front.cpp b/test/algorithm/pop_front.cpp
index 8e87a959..c4b797ab 100644
--- a/test/algorithm/pop_front.cpp
+++ b/test/algorithm/pop_front.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/push_back.cpp b/test/algorithm/push_back.cpp
index 94e013a3..a15d4401 100644
--- a/test/algorithm/push_back.cpp
+++ b/test/algorithm/push_back.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/push_front.cpp b/test/algorithm/push_front.cpp
index dabdbf77..5c9e8fa8 100644
--- a/test/algorithm/push_front.cpp
+++ b/test/algorithm/push_front.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/algorithm/remove.cpp b/test/algorithm/remove.cpp
index a0f20ba0..95f351ef 100644
--- a/test/algorithm/remove.cpp
+++ b/test/algorithm/remove.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/remove_if.cpp b/test/algorithm/remove_if.cpp
index ee4ca848..9cef9a3d 100644
--- a/test/algorithm/remove_if.cpp
+++ b/test/algorithm/remove_if.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/replace.cpp b/test/algorithm/replace.cpp
index 3ccf13b1..acdb9761 100644
--- a/test/algorithm/replace.cpp
+++ b/test/algorithm/replace.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/replace_if.cpp b/test/algorithm/replace_if.cpp
index 01b2df8a..b885976c 100644
--- a/test/algorithm/replace_if.cpp
+++ b/test/algorithm/replace_if.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
diff --git a/test/algorithm/reverse.cpp b/test/algorithm/reverse.cpp
index 598edac0..4cae9b33 100644
--- a/test/algorithm/reverse.cpp
+++ b/test/algorithm/reverse.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/transform.cpp b/test/algorithm/transform.cpp
index c7ce3625..1597dfd2 100644
--- a/test/algorithm/transform.cpp
+++ b/test/algorithm/transform.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
diff --git a/test/algorithm/zip.cpp b/test/algorithm/zip.cpp
index eb60ba17..e4f9bedb 100644
--- a/test/algorithm/zip.cpp
+++ b/test/algorithm/zip.cpp
@@ -9,7 +9,7 @@
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()
diff --git a/test/algorithm/zip2.cpp b/test/algorithm/zip2.cpp
index 0823af0e..c8007117 100644
--- a/test/algorithm/zip2.cpp
+++ b/test/algorithm/zip2.cpp
@@ -8,7 +8,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()
diff --git a/test/algorithm/zip_ignore.cpp b/test/algorithm/zip_ignore.cpp
index cd71ed44..a12b5820 100644
--- a/test/algorithm/zip_ignore.cpp
+++ b/test/algorithm/zip_ignore.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/functional/fused.cpp b/test/functional/fused.cpp
index 4b960ee0..de974cf8 100644
--- a/test/functional/fused.cpp
+++ b/test/functional/fused.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/assert.hpp>
diff --git a/test/functional/fused_function_object.cpp b/test/functional/fused_function_object.cpp
index 50a1b38b..45fab30f 100644
--- a/test/functional/fused_function_object.cpp
+++ b/test/functional/fused_function_object.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/fused_procedure.cpp b/test/functional/fused_procedure.cpp
index d4fd0d9f..34ba09d0 100644
--- a/test/functional/fused_procedure.cpp
+++ b/test/functional/fused_procedure.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/invoke.cpp b/test/functional/invoke.cpp
index f6e4c868..3960af17 100644
--- a/test/functional/invoke.cpp
+++ b/test/functional/invoke.cpp
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/invoke_function_object.cpp b/test/functional/invoke_function_object.cpp
index 0f6272b2..5f08f650 100644
--- a/test/functional/invoke_function_object.cpp
+++ b/test/functional/invoke_function_object.cpp
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/invoke_procedure.cpp b/test/functional/invoke_procedure.cpp
index bf92ef23..810cb903 100644
--- a/test/functional/invoke_procedure.cpp
+++ b/test/functional/invoke_procedure.cpp
@@ -15,12 +15,12 @@
 
 #include <boost/mpl/int.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
diff --git a/test/functional/make_fused.cpp b/test/functional/make_fused.cpp
index a1cd77f7..ba5e604f 100644
--- a/test/functional/make_fused.cpp
+++ b/test/functional/make_fused.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/make_fused_function_object.cpp b/test/functional/make_fused_function_object.cpp
index 51808266..f2463003 100644
--- a/test/functional/make_fused_function_object.cpp
+++ b/test/functional/make_fused_function_object.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/functional/make_fused_procedure.cpp b/test/functional/make_fused_procedure.cpp
index ebe5b555..6a4cf572 100644
--- a/test/functional/make_fused_procedure.cpp
+++ b/test/functional/make_fused_procedure.cpp
@@ -13,7 +13,7 @@
 #include <boost/blank.hpp>
 
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;
diff --git a/test/sequence/adapt_assoc_struct.cpp b/test/sequence/adapt_assoc_struct.cpp
index 926294a6..44c7bcec 100644
--- a/test/sequence/adapt_assoc_struct.cpp
+++ b/test/sequence/adapt_assoc_struct.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
@@ -16,8 +16,8 @@
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#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/sequence/comparison/equal_to.hpp>
diff --git a/test/sequence/adapt_struct.cpp b/test/sequence/adapt_struct.cpp
index 114b8862..e043a0ff 100644
--- a/test/sequence/adapt_struct.cpp
+++ b/test/sequence/adapt_struct.cpp
@@ -5,15 +5,15 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#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/sequence/comparison/equal_to.hpp>
diff --git a/test/sequence/array.cpp b/test/sequence/array.cpp
index 3a776d52..0ca5255d 100644
--- a/test/sequence/array.cpp
+++ b/test/sequence/array.cpp
@@ -8,7 +8,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/array.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
diff --git a/test/sequence/as_list.cpp b/test/sequence/as_list.cpp
index aa45d469..fed5286f 100644
--- a/test/sequence/as_list.cpp
+++ b/test/sequence/as_list.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#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>
diff --git a/test/sequence/as_map.cpp b/test/sequence/as_map.cpp
index b1b336fb..584c7ca5 100644
--- a/test/sequence/as_map.cpp
+++ b/test/sequence/as_map.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#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>
diff --git a/test/sequence/as_set.cpp b/test/sequence/as_set.cpp
index 40488f32..4afa4045 100644
--- a/test/sequence/as_set.cpp
+++ b/test/sequence/as_set.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#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>
diff --git a/test/sequence/as_vector.cpp b/test/sequence/as_vector.cpp
index b5c3425e..c295e966 100644
--- a/test/sequence/as_vector.cpp
+++ b/test/sequence/as_vector.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#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>
diff --git a/test/sequence/back_extended_deque.cpp b/test/sequence/back_extended_deque.cpp
index f58dfdc6..a2daa4cf 100644
--- a/test/sequence/back_extended_deque.cpp
+++ b/test/sequence/back_extended_deque.cpp
@@ -3,15 +3,16 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/back_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/back_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/sequence/boost_tuple.cpp b/test/sequence/boost_tuple.cpp
index 522686fd..17b96c77 100644
--- a/test/sequence/boost_tuple.cpp
+++ b/test/sequence/boost_tuple.cpp
@@ -5,15 +5,15 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
+#include <boost/fusion/adapted/boost_tuple.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#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/sequence/comparison/equal_to.hpp>
diff --git a/test/sequence/cons.cpp b/test/sequence/cons.cpp
index 644ced5c..b27345e6 100644
--- a/test/sequence/cons.cpp
+++ b/test/sequence/cons.cpp
@@ -7,10 +7,10 @@
 ==============================================================================*/
 #include <string>
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/sequence/generation/make_cons.hpp>
 #include <boost/fusion/sequence/generation/cons_tie.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/lambda/lambda.hpp>
diff --git a/test/sequence/construction.hpp b/test/sequence/construction.hpp
index 6c289749..d5c56664 100644
--- a/test/sequence/construction.hpp
+++ b/test/sequence/construction.hpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 
 #if !defined(FUSION_AT)
 #define FUSION_AT at_c
diff --git a/test/sequence/copy.hpp b/test/sequence/copy.hpp
index f47a0bca..96edbc45 100644
--- a/test/sequence/copy.hpp
+++ b/test/sequence/copy.hpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/insert_range.hpp>
 #include <boost/mpl/vector.hpp>
diff --git a/test/sequence/deduce_sequence.cpp b/test/sequence/deduce_sequence.cpp
index 9c6d1ef4..5b234781 100644
--- a/test/sequence/deduce_sequence.cpp
+++ b/test/sequence/deduce_sequence.cpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 
 #include <boost/fusion/support/deduce_sequence.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/mpl/equal.hpp>
diff --git a/test/sequence/deque_comparison.cpp b/test/sequence/deque_comparison.cpp
index 2c6db999..229fd0e6 100644
--- a/test/sequence/deque_comparison.cpp
+++ b/test/sequence/deque_comparison.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "comparison.hpp"
diff --git a/test/sequence/deque_construction.cpp b/test/sequence/deque_construction.cpp
index 7ec3caff..bba8f09a 100644
--- a/test/sequence/deque_construction.cpp
+++ b/test/sequence/deque_construction.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "construction.hpp"
diff --git a/test/sequence/deque_copy.cpp b/test/sequence/deque_copy.cpp
index 6d3ee13f..57e7334d 100644
--- a/test/sequence/deque_copy.cpp
+++ b/test/sequence/deque_copy.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 #include <boost/fusion/sequence/generation/deque_tie.hpp>
 
diff --git a/test/sequence/deque_iterator.cpp b/test/sequence/deque_iterator.cpp
index 414b94c5..baf6f827 100644
--- a/test/sequence/deque_iterator.cpp
+++ b/test/sequence/deque_iterator.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #define FUSION_TRAVERSAL_TAG bidirectional_traversal_tag
diff --git a/test/sequence/deque_make.cpp b/test/sequence/deque_make.cpp
index dfdc681d..4dc7346b 100644
--- a/test/sequence/deque_make.cpp
+++ b/test/sequence/deque_make.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
 
 #define FUSION_SEQUENCE deque
diff --git a/test/sequence/deque_misc.cpp b/test/sequence/deque_misc.cpp
index 01784c1e..e29c7c8b 100644
--- a/test/sequence/deque_misc.cpp
+++ b/test/sequence/deque_misc.cpp
@@ -6,9 +6,9 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/conversion/as_deque.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "misc.hpp"
diff --git a/test/sequence/deque_mutate.cpp b/test/sequence/deque_mutate.cpp
index 8b56aeac..66ab1478 100644
--- a/test/sequence/deque_mutate.cpp
+++ b/test/sequence/deque_mutate.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "mutate.hpp"
diff --git a/test/sequence/deque_tie.cpp b/test/sequence/deque_tie.cpp
index 2afb519f..e922335b 100644
--- a/test/sequence/deque_tie.cpp
+++ b/test/sequence/deque_tie.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 #include <boost/fusion/sequence/generation/deque_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_deque.hpp>
diff --git a/test/sequence/deque_value_at.cpp b/test/sequence/deque_value_at.cpp
index 4a0a9ab3..c348d287 100644
--- a/test/sequence/deque_value_at.cpp
+++ b/test/sequence/deque_value_at.cpp
@@ -6,7 +6,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "value_at.hpp"
diff --git a/test/sequence/ext_/iterator_range_s.cpp b/test/sequence/ext_/iterator_range_s.cpp
index 4f6ead43..1468f61b 100755
--- a/test/sequence/ext_/iterator_range_s.cpp
+++ b/test/sequence/ext_/iterator_range_s.cpp
@@ -7,11 +7,11 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator_range.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/test/sequence/filter_view.cpp b/test/sequence/filter_view.cpp
index 28dbb8a0..eaefb35e 100644
--- a/test/sequence/filter_view.cpp
+++ b/test/sequence/filter_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/type_traits/is_class.hpp>
diff --git a/test/sequence/front_extended_deque.cpp b/test/sequence/front_extended_deque.cpp
index 2afa6190..40100c32 100644
--- a/test/sequence/front_extended_deque.cpp
+++ b/test/sequence/front_extended_deque.cpp
@@ -3,15 +3,16 @@
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/front_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/front_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>
diff --git a/test/sequence/io.cpp b/test/sequence/io.cpp
index 3629ea39..f7692163 100644
--- a/test/sequence/io.cpp
+++ b/test/sequence/io.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
diff --git a/test/sequence/iterator_range.cpp b/test/sequence/iterator_range.cpp
index 1abaf0d5..29993d8e 100644
--- a/test/sequence/iterator_range.cpp
+++ b/test/sequence/iterator_range.cpp
@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
diff --git a/test/sequence/joint_view.cpp b/test/sequence/joint_view.cpp
index eb108df1..7ce135e7 100644
--- a/test/sequence/joint_view.cpp
+++ b/test/sequence/joint_view.cpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/sequence/list_comparison.cpp b/test/sequence/list_comparison.cpp
index 19094687..fcf213c5 100644
--- a/test/sequence/list_comparison.cpp
+++ b/test/sequence/list_comparison.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "comparison.hpp"
diff --git a/test/sequence/list_construction.cpp b/test/sequence/list_construction.cpp
index 83d748be..26d648fd 100644
--- a/test/sequence/list_construction.cpp
+++ b/test/sequence/list_construction.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "construction.hpp"
diff --git a/test/sequence/list_copy.cpp b/test/sequence/list_copy.cpp
index 68ae042f..561ab10d 100644
--- a/test/sequence/list_copy.cpp
+++ b/test/sequence/list_copy.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 #include <boost/fusion/sequence/generation/list_tie.hpp>
 
diff --git a/test/sequence/list_iterator.cpp b/test/sequence/list_iterator.cpp
index 515a6e0f..f7cc6e1d 100644
--- a/test/sequence/list_iterator.cpp
+++ b/test/sequence/list_iterator.cpp
@@ -4,7 +4,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_NO_PRIOR
diff --git a/test/sequence/list_make.cpp b/test/sequence/list_make.cpp
index 55833b64..7e7120fe 100644
--- a/test/sequence/list_make.cpp
+++ b/test/sequence/list_make.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
diff --git a/test/sequence/list_misc.cpp b/test/sequence/list_misc.cpp
index c5ff71ca..68827398 100644
--- a/test/sequence/list_misc.cpp
+++ b/test/sequence/list_misc.cpp
@@ -2,12 +2,11 @@
     Copyright (c) 1999-2003 Jaakko Järvi
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/conversion/as_list.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_FORWARD_ONLY
diff --git a/test/sequence/list_mutate.cpp b/test/sequence/list_mutate.cpp
index abfc9a3e..f8802b27 100644
--- a/test/sequence/list_mutate.cpp
+++ b/test/sequence/list_mutate.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "mutate.hpp"
diff --git a/test/sequence/list_tie.cpp b/test/sequence/list_tie.cpp
index e227edee..1a0e73b2 100644
--- a/test/sequence/list_tie.cpp
+++ b/test/sequence/list_tie.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/list_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
diff --git a/test/sequence/list_value_at.cpp b/test/sequence/list_value_at.cpp
index 9bd3de69..763cf265 100644
--- a/test/sequence/list_value_at.cpp
+++ b/test/sequence/list_value_at.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "value_at.hpp"
diff --git a/test/sequence/make_list.cpp b/test/sequence/make_list.cpp
index 55833b64..7e7120fe 100644
--- a/test/sequence/make_list.cpp
+++ b/test/sequence/make_list.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 #include <boost/fusion/sequence/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
diff --git a/test/sequence/make_vector.cpp b/test/sequence/make_vector.cpp
index ffd06489..228fbb77 100644
--- a/test/sequence/make_vector.cpp
+++ b/test/sequence/make_vector.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector
diff --git a/test/sequence/map.cpp b/test/sequence/map.cpp
index b170158d..689e086d 100644
--- a/test/sequence/map.cpp
+++ b/test/sequence/map.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/sequence/generation/make_map.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
diff --git a/test/sequence/misc.hpp b/test/sequence/misc.hpp
index 01ee773d..d1fae03b 100644
--- a/test/sequence/misc.hpp
+++ b/test/sequence/misc.hpp
@@ -2,12 +2,13 @@
     Copyright (C) 1999-2003 Jaakko Järvi
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/int.hpp>
@@ -105,7 +106,7 @@ struct test_intrinsics2
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq2, target2>::value));
 
 #endif
-    
+
     typedef boost::fusion::FUSION_SEQUENCE<int> target3;
     typedef boost::mpl::push_front<seq0, int>::type seq3;
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq3, target3>::value));
@@ -170,9 +171,9 @@ test()
         BOOST_STATIC_ASSERT(!traits::is_sequence<int>::value);
         BOOST_STATIC_ASSERT(!traits::is_sequence<char>::value);
     }
-    
+
     {   // testing mpl compatibility
-        
+
         // test begin, end, next, prior, advance, size, deref, etc.
         //~ typedef FUSION_SEQUENCE<int, float, bool, char> tuple_type;
         //~ test_intrinsics1<tuple_type> test1;
@@ -181,7 +182,7 @@ test()
         // test an algorithm
         typedef FUSION_SEQUENCE<int, float, double> t1;
         typedef boost::mpl::find<t1, float>::type iter;
-        typedef boost::mpl::deref<iter>::type type;        
+        typedef boost::mpl::deref<iter>::type type;
         BOOST_STATIC_ASSERT((boost::is_same<type, float>::value));
 
     }
diff --git a/test/sequence/repetitive_view.cpp b/test/sequence/repetitive_view.cpp
index 0a2c01d9..54da37bc 100644
--- a/test/sequence/repetitive_view.cpp
+++ b/test/sequence/repetitive_view.cpp
@@ -7,10 +7,10 @@
 ==============================================================================*/
 
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/view/repetitive_view.hpp>
+#include <boost/fusion/view/repetitive_view.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 
diff --git a/test/sequence/reverse_view.cpp b/test/sequence/reverse_view.cpp
index 3cc2bf91..03d0632f 100644
--- a/test/sequence/reverse_view.cpp
+++ b/test/sequence/reverse_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/prior.hpp>
diff --git a/test/sequence/set.cpp b/test/sequence/set.cpp
index c658380e..0c376f3a 100644
--- a/test/sequence/set.cpp
+++ b/test/sequence/set.cpp
@@ -5,7 +5,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
+#include <boost/fusion/container/set/set.hpp>
 #include <boost/fusion/sequence/generation/make_set.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
diff --git a/test/sequence/single_view.cpp b/test/sequence/single_view.cpp
index fd1d1341..e3faa26a 100644
--- a/test/sequence/single_view.cpp
+++ b/test/sequence/single_view.cpp
@@ -6,7 +6,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 
diff --git a/test/sequence/std_pair.cpp b/test/sequence/std_pair.cpp
index d0434821..435a4b85 100644
--- a/test/sequence/std_pair.cpp
+++ b/test/sequence/std_pair.cpp
@@ -5,15 +5,15 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
+#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/sequence/comparison/equal_to.hpp>
diff --git a/test/sequence/swap.cpp b/test/sequence/swap.cpp
index f9573d52..e89542e0 100644
--- a/test/sequence/swap.cpp
+++ b/test/sequence/swap.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/sequence/intrinsic/swap.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/detail/lightweight_test.hpp>
diff --git a/test/sequence/transform_view.cpp b/test/sequence/transform_view.cpp
index 3dce9043..e811f5f7 100644
--- a/test/sequence/transform_view.cpp
+++ b/test/sequence/transform_view.cpp
@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
diff --git a/test/sequence/tuple_comparison.cpp b/test/sequence/tuple_comparison.cpp
index fde2ad47..8108256b 100644
--- a/test/sequence/tuple_comparison.cpp
+++ b/test/sequence/tuple_comparison.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/tuple.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #include "comparison.hpp"
diff --git a/test/sequence/tuple_construction.cpp b/test/sequence/tuple_construction.cpp
index 0d357002..323c72ed 100644
--- a/test/sequence/tuple_construction.cpp
+++ b/test/sequence/tuple_construction.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/tuple.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get
diff --git a/test/sequence/tuple_misc.cpp b/test/sequence/tuple_misc.cpp
index 704ebd3a..632a9ca1 100644
--- a/test/sequence/tuple_misc.cpp
+++ b/test/sequence/tuple_misc.cpp
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/fusion/tuple.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get
diff --git a/test/sequence/variant.cpp b/test/sequence/variant.cpp
index b4feee13..bfbf6fd3 100644
--- a/test/sequence/variant.cpp
+++ b/test/sequence/variant.cpp
@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/support/is_view.hpp>
diff --git a/test/sequence/vector_comparison.cpp b/test/sequence/vector_comparison.cpp
index 0a7ae781..7321820e 100644
--- a/test/sequence/vector_comparison.cpp
+++ b/test/sequence/vector_comparison.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "comparison.hpp"
diff --git a/test/sequence/vector_construction.cpp b/test/sequence/vector_construction.cpp
index 4f1eaa02..d279c232 100644
--- a/test/sequence/vector_construction.cpp
+++ b/test/sequence/vector_construction.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "construction.hpp"
diff --git a/test/sequence/vector_copy.cpp b/test/sequence/vector_copy.cpp
index e554a768..9b1e207d 100644
--- a/test/sequence/vector_copy.cpp
+++ b/test/sequence/vector_copy.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 #include <boost/fusion/sequence/generation/vector_tie.hpp>
 
diff --git a/test/sequence/vector_iterator.cpp b/test/sequence/vector_iterator.cpp
index 662466fa..bcf15c69 100644
--- a/test/sequence/vector_iterator.cpp
+++ b/test/sequence/vector_iterator.cpp
@@ -4,8 +4,8 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 
 #define FUSION_SEQUENCE vector
 #define FUSION_TRAVERSAL_TAG random_access_traversal_tag
diff --git a/test/sequence/vector_make.cpp b/test/sequence/vector_make.cpp
index ffd06489..228fbb77 100644
--- a/test/sequence/vector_make.cpp
+++ b/test/sequence/vector_make.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector
diff --git a/test/sequence/vector_misc.cpp b/test/sequence/vector_misc.cpp
index e2a22fb7..d8e02876 100644
--- a/test/sequence/vector_misc.cpp
+++ b/test/sequence/vector_misc.cpp
@@ -5,9 +5,9 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "misc.hpp"
diff --git a/test/sequence/vector_mutate.cpp b/test/sequence/vector_mutate.cpp
index 60a410b7..610c0c18 100644
--- a/test/sequence/vector_mutate.cpp
+++ b/test/sequence/vector_mutate.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "mutate.hpp"
diff --git a/test/sequence/vector_n.cpp b/test/sequence/vector_n.cpp
index e7ff4ad3..b051ca89 100644
--- a/test/sequence/vector_n.cpp
+++ b/test/sequence/vector_n.cpp
@@ -5,16 +5,16 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 
-#include <boost/fusion/sequence/container/vector/vector20.hpp>
-#include <boost/fusion/sequence/container/vector/vector30.hpp>
-#include <boost/fusion/sequence/container/vector/vector40.hpp>
-#include <boost/fusion/sequence/container/vector/vector50.hpp>
+#include <boost/fusion/container/vector/vector20.hpp>
+#include <boost/fusion/container/vector/vector30.hpp>
+#include <boost/fusion/container/vector/vector40.hpp>
+#include <boost/fusion/container/vector/vector50.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_empty.hpp>
diff --git a/test/sequence/vector_tie.cpp b/test/sequence/vector_tie.cpp
index 348e235c..08a82e3d 100644
--- a/test/sequence/vector_tie.cpp
+++ b/test/sequence/vector_tie.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/generation/vector_tie.hpp>
 #include <boost/fusion/sequence/generation/ignore.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
diff --git a/test/sequence/vector_value_at.cpp b/test/sequence/vector_value_at.cpp
index e4aa9ac4..8a99da5b 100644
--- a/test/sequence/vector_value_at.cpp
+++ b/test/sequence/vector_value_at.cpp
@@ -5,7 +5,7 @@
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "value_at.hpp"
diff --git a/test/sequence/zip_view.cpp b/test/sequence/zip_view.cpp
index 485760cd..0fcb438d 100644
--- a/test/sequence/zip_view.cpp
+++ b/test/sequence/zip_view.cpp
@@ -7,9 +7,9 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/view/zip_view.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/view/zip_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
@@ -20,7 +20,7 @@
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/vector_c.hpp>
diff --git a/test/sequence/zip_view2.cpp b/test/sequence/zip_view2.cpp
index c8c42e1e..611c41cb 100644
--- a/test/sequence/zip_view2.cpp
+++ b/test/sequence/zip_view2.cpp
@@ -9,9 +9,9 @@
 
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/view/zip_view.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/view/zip_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
@@ -22,7 +22,7 @@
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/equal_to.hpp>
 
diff --git a/test/sequence/zip_view_ignore.cpp b/test/sequence/zip_view_ignore.cpp
index 5eb3bf39..2a300809 100644
--- a/test/sequence/zip_view_ignore.cpp
+++ b/test/sequence/zip_view_ignore.cpp
@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/view/zip_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/view/zip_view.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>