phase3: refactoring for v2.1

[SVN r40211]

include/boost/fusion/adapted.hpp

@@ -8,10 +8,10 @@
 #if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
 #define BOOST_FUSION_ADAPTED_30122005_1420
 
-#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/boost_tuple.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #endif

include/boost/fusion/adapted/array.hpp

@@ -0,0 +1,22 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_ARRAY_27122005_1035)
+#define BOOST_FUSION_ARRAY_27122005_1035
+
+#include <boost/fusion/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/tag_of.hpp>
+#include <boost/fusion/adapted/array/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/array/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/array/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/array/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/array/detail/end_impl.hpp>
+#include <boost/fusion/adapted/array/detail/size_impl.hpp>
+#include <boost/fusion/adapted/array/detail/at_impl.hpp>
+#include <boost/fusion/adapted/array/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/array/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/array/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/boost_tuple.hpp

@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_BOOST_TUPLE_09272006_0732)
+#define BOOST_FUSION_BOOST_TUPLE_09272006_0732
+
+#include <boost/fusion/adapted/boost_tuple/tag_of.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/end_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/size_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/at_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp

@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_09272006_0719)
 #define BOOST_FUSION_BEGIN_IMPL_09272006_0719
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 
 namespace boost { namespace fusion 
 {

include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp

@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_09272006_0721)
 #define BOOST_FUSION_END_IMPL_09272006_0721
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 

include/boost/fusion/adapted/mpl.hpp

@@ -0,0 +1,21 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_MPL_31122005_1152)
+#define BOOST_FUSION_MPL_31122005_1152
+
+#include <boost/fusion/adapted/mpl/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/end_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/size_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_view_impl.hpp>
+
+#endif

include/boost/fusion/adapted/mpl/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_31122005_1209)
 #define BOOST_FUSION_BEGIN_IMPL_31122005_1209
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/begin.hpp>
 #include <boost/type_traits/remove_const.hpp>
 

include/boost/fusion/adapted/mpl/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_31122005_1237)
 #define BOOST_FUSION_END_IMPL_31122005_1237
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/end.hpp>
 #include <boost/type_traits/add_const.hpp>
 

include/boost/fusion/adapted/std_pair.hpp

@@ -9,7 +9,7 @@
 #define BOOST_FUSION_STD_PAIR_24122005_1744
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct.hpp>
+#include <boost/fusion/adapted/struct.hpp>
 #include <boost/mpl/int.hpp>
 #include <utility>
 

include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/std_pair/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/struct.hpp

@@ -0,0 +1,23 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_STRUCT_24122005_1744)
+#define BOOST_FUSION_STD_STRUCT_24122005_1744
+
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp

@@ -9,19 +9,19 @@
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_20070508_2207
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_key_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>

include/boost/fusion/adapted/struct/adapt_struct.hpp

@@ -8,16 +8,16 @@
 #define BOOST_FUSION_ADAPT_STRUCT_APRIL_2_2007_1158AM
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>

include/boost/fusion/adapted/struct/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/adapted/struct/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/adapted/struct/struct_iterator.hpp

@@ -9,7 +9,7 @@
 #define FUSION_STRUCT_ITERATOR_APRIL_2_2007_1008AM
 
 #include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/mpl/assert.hpp>

include/boost/fusion/adapted/variant.hpp

@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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)
+==============================================================================*/
+#if !defined(BOOST_FUSION_VARIANT_12112006_1614)
+#define BOOST_FUSION_VARIANT_12112006_1614
+
+#include <boost/fusion/adapted/variant/variant_iterator.hpp>
+#include <boost/fusion/adapted/variant/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/variant/tag_of.hpp>
+#include <boost/fusion/adapted/variant/detail/size_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/end_impl.hpp>
+
+#endif

include/boost/fusion/algorithm/transformation/erase.hpp

@@ -15,7 +15,7 @@
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/insert.hpp

@@ -15,7 +15,7 @@
 #include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/insert_range.hpp

@@ -14,7 +14,7 @@
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/zip.hpp

@@ -10,7 +10,7 @@
 #define FUSION_ZIP_HPP_20060125_2058
 
 #include <boost/fusion/view/zip_view.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/conversion/as_vector.hpp>
 #include <boost/type_traits/add_reference.hpp>

include/boost/fusion/include/adapt_struct.hpp

@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_ADAPT_STRUCT)
 #define FUSION_INCLUDE_ADAPT_STRUCT
 
-#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 
 #endif

include/boost/fusion/include/mpl.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_MPL)
 #define FUSION_INCLUDE_MPL
 
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #endif

include/boost/fusion/include/std_pair.hpp

@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_STD_PAIR)
 #define FUSION_INCLUDE_STD_PAIR
 
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
 
 #endif

include/boost/fusion/include/variant.hpp

@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_VARIANT)
 #define FUSION_INCLUDE_VARIANT
 
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #endif

include/boost/fusion/mpl.hpp

@@ -1,7 +1,7 @@
 /*=============================================================================
     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)
 ==============================================================================*/
 #if !defined(FUSION_MPL_09172006_2049)
@@ -9,7 +9,24 @@
 
 // The fusion <--> MPL link headers
 #include <boost/fusion/iterator/mpl.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+
+#include <boost/fusion/mpl/at.hpp>
+#include <boost/fusion/mpl/back.hpp>
+#include <boost/fusion/mpl/begin.hpp>
+#include <boost/fusion/mpl/clear.hpp>
+#include <boost/fusion/mpl/empty.hpp>
+#include <boost/fusion/mpl/end.hpp>
+#include <boost/fusion/mpl/erase.hpp>
+#include <boost/fusion/mpl/erase_key.hpp>
+#include <boost/fusion/mpl/front.hpp>
+#include <boost/fusion/mpl/has_key.hpp>
+#include <boost/fusion/mpl/insert.hpp>
+#include <boost/fusion/mpl/insert_range.hpp>
+#include <boost/fusion/mpl/pop_back.hpp>
+#include <boost/fusion/mpl/pop_front.hpp>
+#include <boost/fusion/mpl/push_back.hpp>
+#include <boost/fusion/mpl/push_front.hpp>
+#include <boost/fusion/mpl/size.hpp>
 
 #endif

include/boost/fusion/mpl/begin.hpp

@@ -9,7 +9,7 @@
 
 #include <boost/mpl/begin_end.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/begin_impl.hpp>
 #include <boost/fusion/iterator/mpl/fusion_iterator.hpp>
 
 namespace boost { namespace mpl

include/boost/fusion/mpl/clear.hpp

@@ -9,7 +9,7 @@
 
 #include <boost/mpl/clear.hpp>
 #include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp>
+#include <boost/fusion/mpl/detail/clear.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/end.hpp

@@ -9,7 +9,7 @@
 
 #include <boost/mpl/begin_end.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/end_impl.hpp>
 #include <boost/fusion/iterator/mpl/fusion_iterator.hpp>
 
 namespace boost { namespace mpl

include/boost/fusion/mpl/erase.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/erase.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/erase.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/erase_key.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/erase_key.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/erase_key.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/insert.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/insert.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/insert.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/insert_range.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/insert_range.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/insert_range.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/pop_back.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/pop_back.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/pop_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/pop_front.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/pop_front.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/pop_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/push_back.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/push_back.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/mpl/push_front.hpp

@@ -10,7 +10,7 @@
 #include <boost/mpl/push_front.hpp>
 #include <boost/fusion/support/tag_of.hpp>
 #include <boost/fusion/algorithm/transformation/push_front.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl/detail/as.hpp>
+#include <boost/fusion/mpl/detail/as.hpp>
 
 namespace boost { namespace mpl
 {

include/boost/fusion/sequence.hpp

@@ -13,6 +13,6 @@
 #include <boost/fusion/sequence/generation.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/sequence/io.hpp>
-#include <boost/fusion/sequence/adapted.hpp>
+#include <boost/fusion/adapted.hpp>
 
 #endif