From 41c46501db628b189a03bb53d646dec596e85d2a Mon Sep 17 00:00:00 2001
From: Joel de Guzman <djowel@gmail.com>
Date: Tue, 6 Nov 2007 11:58:37 +0000
Subject: [PATCH] doc updates + some more header tweaks

[SVN r40830]
---
 .../generation/cons_tie.hpp                    |  0
 .../generation/deque_tie.hpp                   |  2 +-
 .../generation/ignore.hpp                      |  0
 .../generation/list_tie.hpp                    |  2 +-
 .../generation/make_cons.hpp                   |  0
 .../generation/make_deque.hpp                  |  2 +-
 .../generation/make_list.hpp                   |  2 +-
 .../generation/make_map.hpp                    |  2 +-
 .../generation/make_set.hpp                    |  2 +-
 .../generation/make_vector.hpp                 |  2 +-
 .../generation/map_tie.hpp                     |  4 ++--
 .../generation/pair_tie.hpp                    |  0
 .../generation/vector_tie.hpp                  |  2 +-
 include/boost/fusion/include/cons_tie.hpp      |  2 +-
 include/boost/fusion/include/deque_tie.hpp     |  2 +-
 include/boost/fusion/include/generation.hpp    |  2 +-
 include/boost/fusion/include/ignore.hpp        |  2 +-
 include/boost/fusion/include/list_tie.hpp      |  2 +-
 include/boost/fusion/include/make_cons.hpp     |  2 +-
 include/boost/fusion/include/make_deque.hpp    |  2 +-
 include/boost/fusion/include/make_list.hpp     |  2 +-
 include/boost/fusion/include/make_map.hpp      |  2 +-
 include/boost/fusion/include/make_set.hpp      |  2 +-
 include/boost/fusion/include/make_vector.hpp   |  2 +-
 include/boost/fusion/include/map_tie.hpp       |  2 +-
 include/boost/fusion/include/pair_tie.hpp      |  2 +-
 include/boost/fusion/include/vector_tie.hpp    |  2 +-
 include/boost/fusion/sequence.hpp              |  2 +-
 include/boost/fusion/sequence/generation.hpp   | 18 +++++++++---------
 include/boost/fusion/tuple.hpp                 |  2 +-
 .../fusion/view/ext_/segmented_iterator.hpp    |  2 +-
 31 files changed, 36 insertions(+), 36 deletions(-)
 rename include/boost/fusion/{sequence => container}/generation/cons_tie.hpp (100%)
 rename include/boost/fusion/{sequence => container}/generation/deque_tie.hpp (96%)
 rename include/boost/fusion/{sequence => container}/generation/ignore.hpp (100%)
 rename include/boost/fusion/{sequence => container}/generation/list_tie.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/make_cons.hpp (100%)
 rename include/boost/fusion/{sequence => container}/generation/make_deque.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/make_list.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/make_map.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/make_set.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/make_vector.hpp (97%)
 rename include/boost/fusion/{sequence => container}/generation/map_tie.hpp (96%)
 rename include/boost/fusion/{sequence => container}/generation/pair_tie.hpp (100%)
 rename include/boost/fusion/{sequence => container}/generation/vector_tie.hpp (96%)

diff --git a/include/boost/fusion/sequence/generation/cons_tie.hpp b/include/boost/fusion/container/generation/cons_tie.hpp
similarity index 100%
rename from include/boost/fusion/sequence/generation/cons_tie.hpp
rename to include/boost/fusion/container/generation/cons_tie.hpp
diff --git a/include/boost/fusion/sequence/generation/deque_tie.hpp b/include/boost/fusion/container/generation/deque_tie.hpp
similarity index 96%
rename from include/boost/fusion/sequence/generation/deque_tie.hpp
rename to include/boost/fusion/container/generation/deque_tie.hpp
index 4eeef1a2..bc5e52e2 100644
--- a/include/boost/fusion/sequence/generation/deque_tie.hpp
+++ b/include/boost/fusion/container/generation/deque_tie.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
 
 #define BOOST_FUSION_REF(z, n, data) BOOST_PP_CAT(T, n)&
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/deque_tie.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/deque_tie.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
     
diff --git a/include/boost/fusion/sequence/generation/ignore.hpp b/include/boost/fusion/container/generation/ignore.hpp
similarity index 100%
rename from include/boost/fusion/sequence/generation/ignore.hpp
rename to include/boost/fusion/container/generation/ignore.hpp
diff --git a/include/boost/fusion/sequence/generation/list_tie.hpp b/include/boost/fusion/container/generation/list_tie.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/list_tie.hpp
rename to include/boost/fusion/container/generation/list_tie.hpp
index b23cee93..a6c546a4 100644
--- a/include/boost/fusion/sequence/generation/list_tie.hpp
+++ b/include/boost/fusion/container/generation/list_tie.hpp
@@ -33,7 +33,7 @@ namespace boost { namespace fusion
 // $$$ shouldn't we remove_reference first to allow references? $$$
 #define BOOST_FUSION_REF(z, n, data) BOOST_PP_CAT(T, n)&
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/list_tie.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/list_tie.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE)
 #include BOOST_PP_ITERATE()
     
diff --git a/include/boost/fusion/sequence/generation/make_cons.hpp b/include/boost/fusion/container/generation/make_cons.hpp
similarity index 100%
rename from include/boost/fusion/sequence/generation/make_cons.hpp
rename to include/boost/fusion/container/generation/make_cons.hpp
diff --git a/include/boost/fusion/sequence/generation/make_deque.hpp b/include/boost/fusion/container/generation/make_deque.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/make_deque.hpp
rename to include/boost/fusion/container/generation/make_deque.hpp
index 6d6fc372..ee33b2fe 100644
--- a/include/boost/fusion/sequence/generation/make_deque.hpp
+++ b/include/boost/fusion/container/generation/make_deque.hpp
@@ -52,7 +52,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data)                               \
     typename detail::as_fusion_element<BOOST_PP_CAT(T, n)>::type
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/make_deque.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_deque.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/make_list.hpp b/include/boost/fusion/container/generation/make_list.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/make_list.hpp
rename to include/boost/fusion/container/generation/make_list.hpp
index c2c4d521..6e765f87 100644
--- a/include/boost/fusion/sequence/generation/make_list.hpp
+++ b/include/boost/fusion/container/generation/make_list.hpp
@@ -45,7 +45,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data)                               \
     typename detail::as_fusion_element<BOOST_PP_CAT(T, n)>::type
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/make_list.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_list.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/make_map.hpp b/include/boost/fusion/container/generation/make_map.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/make_map.hpp
rename to include/boost/fusion/container/generation/make_map.hpp
index 2ab3abb0..54a3ddb1 100644
--- a/include/boost/fusion/sequence/generation/make_map.hpp
+++ b/include/boost/fusion/container/generation/make_map.hpp
@@ -53,7 +53,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_MAKE_PAIR(z, n, data)                                      \
     fusion::make_pair<BOOST_PP_CAT(K, n)>(BOOST_PP_CAT(_, n))                   \
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/make_map.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_map.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/make_set.hpp b/include/boost/fusion/container/generation/make_set.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/make_set.hpp
rename to include/boost/fusion/container/generation/make_set.hpp
index 7dd9f3ab..ec12f833 100644
--- a/include/boost/fusion/sequence/generation/make_set.hpp
+++ b/include/boost/fusion/container/generation/make_set.hpp
@@ -46,7 +46,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data)                               \
     typename detail::as_fusion_element<BOOST_PP_CAT(T, n)>::type
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/make_set.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_set.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/make_vector.hpp b/include/boost/fusion/container/generation/make_vector.hpp
similarity index 97%
rename from include/boost/fusion/sequence/generation/make_vector.hpp
rename to include/boost/fusion/container/generation/make_vector.hpp
index d70b4b02..6bec6848 100644
--- a/include/boost/fusion/sequence/generation/make_vector.hpp
+++ b/include/boost/fusion/container/generation/make_vector.hpp
@@ -45,7 +45,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_AS_FUSION_ELEMENT(z, n, data)                               \
     typename detail::as_fusion_element<BOOST_PP_CAT(T, n)>::type
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/make_vector.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/make_vector.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/map_tie.hpp b/include/boost/fusion/container/generation/map_tie.hpp
similarity index 96%
rename from include/boost/fusion/sequence/generation/map_tie.hpp
rename to include/boost/fusion/container/generation/map_tie.hpp
index 1431accc..a3cf3f9a 100644
--- a/include/boost/fusion/sequence/generation/map_tie.hpp
+++ b/include/boost/fusion/container/generation/map_tie.hpp
@@ -17,7 +17,7 @@
 #include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/container/map/limits.hpp>
 #include <boost/fusion/support/pair.hpp>
-#include <boost/fusion/sequence/generation/pair_tie.hpp>
+#include <boost/fusion/container/generation/pair_tie.hpp>
 #include <boost/type_traits/add_reference.hpp>
 
 namespace boost { namespace fusion
@@ -56,7 +56,7 @@ namespace boost { namespace fusion
 #define BOOST_FUSION_PAIR_TIE(z, n, data)                                      \
     fusion::pair_tie<BOOST_PP_CAT(K, n)>(BOOST_PP_CAT(_, n))                   \
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/map_tie.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/map_tie.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_SIZE)
 #include BOOST_PP_ITERATE()
 
diff --git a/include/boost/fusion/sequence/generation/pair_tie.hpp b/include/boost/fusion/container/generation/pair_tie.hpp
similarity index 100%
rename from include/boost/fusion/sequence/generation/pair_tie.hpp
rename to include/boost/fusion/container/generation/pair_tie.hpp
diff --git a/include/boost/fusion/sequence/generation/vector_tie.hpp b/include/boost/fusion/container/generation/vector_tie.hpp
similarity index 96%
rename from include/boost/fusion/sequence/generation/vector_tie.hpp
rename to include/boost/fusion/container/generation/vector_tie.hpp
index f5fe8572..f5c1cfe6 100644
--- a/include/boost/fusion/sequence/generation/vector_tie.hpp
+++ b/include/boost/fusion/container/generation/vector_tie.hpp
@@ -32,7 +32,7 @@ namespace boost { namespace fusion
 
 #define BOOST_FUSION_REF(z, n, data) BOOST_PP_CAT(T, n)&
 
-#define BOOST_PP_FILENAME_1 <boost/fusion/sequence/generation/vector_tie.hpp>
+#define BOOST_PP_FILENAME_1 <boost/fusion/container/generation/vector_tie.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE)
 #include BOOST_PP_ITERATE()
     
diff --git a/include/boost/fusion/include/cons_tie.hpp b/include/boost/fusion/include/cons_tie.hpp
index 0fa5a592..740e1739 100644
--- a/include/boost/fusion/include/cons_tie.hpp
+++ b/include/boost/fusion/include/cons_tie.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_CONS_TIE)
 #define FUSION_INCLUDE_CONS_TIE
 
-#include <boost/fusion/sequence/generation/cons_tie.hpp>
+#include <boost/fusion/container/generation/cons_tie.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/deque_tie.hpp b/include/boost/fusion/include/deque_tie.hpp
index 20ab1958..8adbc4c0 100644
--- a/include/boost/fusion/include/deque_tie.hpp
+++ b/include/boost/fusion/include/deque_tie.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_GENERATION)
 #define FUSION_INCLUDE_GENERATION
 
-#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/functional/generation.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/generation.hpp b/include/boost/fusion/include/generation.hpp
index 20ab1958..8adbc4c0 100644
--- a/include/boost/fusion/include/generation.hpp
+++ b/include/boost/fusion/include/generation.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_GENERATION)
 #define FUSION_INCLUDE_GENERATION
 
-#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/functional/generation.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/ignore.hpp b/include/boost/fusion/include/ignore.hpp
index 20ab1958..8adbc4c0 100644
--- a/include/boost/fusion/include/ignore.hpp
+++ b/include/boost/fusion/include/ignore.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_GENERATION)
 #define FUSION_INCLUDE_GENERATION
 
-#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/functional/generation.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/list_tie.hpp b/include/boost/fusion/include/list_tie.hpp
index 20ab1958..8adbc4c0 100644
--- a/include/boost/fusion/include/list_tie.hpp
+++ b/include/boost/fusion/include/list_tie.hpp
@@ -7,7 +7,7 @@
 #if !defined(FUSION_INCLUDE_GENERATION)
 #define FUSION_INCLUDE_GENERATION
 
-#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/functional/generation.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_cons.hpp b/include/boost/fusion/include/make_cons.hpp
index a0181953..76c4caa5 100644
--- a/include/boost/fusion/include/make_cons.hpp
+++ b/include/boost/fusion/include/make_cons.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_CONS)
 #define FUSION_INCLUDE_MAKE_CONS
 
-#include <boost/fusion/sequence/generation/make_cons.hpp>
+#include <boost/fusion/container/generation/make_cons.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_deque.hpp b/include/boost/fusion/include/make_deque.hpp
index 73ee13d5..35520e8d 100644
--- a/include/boost/fusion/include/make_deque.hpp
+++ b/include/boost/fusion/include/make_deque.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_DEQUE)
 #define FUSION_INCLUDE_MAKE_DEQUE
 
-#include <boost/fusion/sequence/generation/make_deque.hpp>
+#include <boost/fusion/container/generation/make_deque.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_list.hpp b/include/boost/fusion/include/make_list.hpp
index 2fb5d12e..7adb3507 100644
--- a/include/boost/fusion/include/make_list.hpp
+++ b/include/boost/fusion/include/make_list.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_LIST)
 #define FUSION_INCLUDE_MAKE_LIST
 
-#include <boost/fusion/sequence/generation/make_list.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_map.hpp b/include/boost/fusion/include/make_map.hpp
index d5e05c94..90d59921 100644
--- a/include/boost/fusion/include/make_map.hpp
+++ b/include/boost/fusion/include/make_map.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_MAP)
 #define FUSION_INCLUDE_MAKE_MAP
 
-#include <boost/fusion/sequence/generation/make_map.hpp>
+#include <boost/fusion/container/generation/make_map.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_set.hpp b/include/boost/fusion/include/make_set.hpp
index a2470ade..19f344f6 100644
--- a/include/boost/fusion/include/make_set.hpp
+++ b/include/boost/fusion/include/make_set.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_SET)
 #define FUSION_INCLUDE_MAKE_SET
 
-#include <boost/fusion/sequence/generation/make_set.hpp>
+#include <boost/fusion/container/generation/make_set.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/make_vector.hpp b/include/boost/fusion/include/make_vector.hpp
index d2a90cb4..b165ba3e 100644
--- a/include/boost/fusion/include/make_vector.hpp
+++ b/include/boost/fusion/include/make_vector.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAKE_VECTOR)
 #define FUSION_INCLUDE_MAKE_VECTOR
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/map_tie.hpp b/include/boost/fusion/include/map_tie.hpp
index 87e4130f..89aeb716 100644
--- a/include/boost/fusion/include/map_tie.hpp
+++ b/include/boost/fusion/include/map_tie.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_MAP_TIE)
 #define FUSION_INCLUDE_MAP_TIE
 
-#include <boost/fusion/sequence/generation/map_tie.hpp>
+#include <boost/fusion/container/generation/map_tie.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/pair_tie.hpp b/include/boost/fusion/include/pair_tie.hpp
index 5096ef4f..ac192cad 100644
--- a/include/boost/fusion/include/pair_tie.hpp
+++ b/include/boost/fusion/include/pair_tie.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_PAIR_TIE)
 #define FUSION_INCLUDE_PAIR_TIE
 
-#include <boost/fusion/sequence/generation/pair_tie.hpp>
+#include <boost/fusion/container/generation/pair_tie.hpp>
 
 #endif
diff --git a/include/boost/fusion/include/vector_tie.hpp b/include/boost/fusion/include/vector_tie.hpp
index 35f4abed..3a0431c1 100644
--- a/include/boost/fusion/include/vector_tie.hpp
+++ b/include/boost/fusion/include/vector_tie.hpp
@@ -7,6 +7,6 @@
 #if !defined(FUSION_INCLUDE_VECTOR_TIE)
 #define FUSION_INCLUDE_VECTOR_TIE
 
-#include <boost/fusion/sequence/generation/vector_tie.hpp>
+#include <boost/fusion/container/generation/vector_tie.hpp>
 
 #endif
diff --git a/include/boost/fusion/sequence.hpp b/include/boost/fusion/sequence.hpp
index e60fdd7d..b1145c3a 100644
--- a/include/boost/fusion/sequence.hpp
+++ b/include/boost/fusion/sequence.hpp
@@ -9,7 +9,7 @@
 
 #include <boost/fusion/sequence/sequence_facade.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
-#include <boost/fusion/sequence/generation.hpp>
+#include <boost/fusion/container/generation.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/sequence/io.hpp>
 #include <boost/fusion/sequence/convert.hpp>
diff --git a/include/boost/fusion/sequence/generation.hpp b/include/boost/fusion/sequence/generation.hpp
index 2afad632..7d92bb2f 100644
--- a/include/boost/fusion/sequence/generation.hpp
+++ b/include/boost/fusion/sequence/generation.hpp
@@ -7,14 +7,14 @@
 #if !defined(FUSION_SEQUENCE_GENERATION_10022005_0615)
 #define FUSION_SEQUENCE_GENERATION_10022005_0615
 
-#include <boost/fusion/sequence/generation/cons_tie.hpp>
-#include <boost/fusion/sequence/generation/ignore.hpp>
-#include <boost/fusion/sequence/generation/list_tie.hpp>
-#include <boost/fusion/sequence/generation/make_cons.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/generation/make_map.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/generation/vector_tie.hpp>
-#include <boost/fusion/sequence/generation/make_set.hpp>
+#include <boost/fusion/container/generation/cons_tie.hpp>
+#include <boost/fusion/container/generation/ignore.hpp>
+#include <boost/fusion/container/generation/list_tie.hpp>
+#include <boost/fusion/container/generation/make_cons.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/generation/make_map.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/vector_tie.hpp>
+#include <boost/fusion/container/generation/make_set.hpp>
 
 #endif
diff --git a/include/boost/fusion/tuple.hpp b/include/boost/fusion/tuple.hpp
index c4b56b9e..affcecca 100644
--- a/include/boost/fusion/tuple.hpp
+++ b/include/boost/fusion/tuple.hpp
@@ -10,6 +10,6 @@
 #include <boost/fusion/tuple/tuple.hpp>
 #include <boost/fusion/tuple/make_tuple.hpp>
 #include <boost/fusion/tuple/tuple_tie.hpp>
-#include <boost/fusion/sequence/generation/ignore.hpp>
+#include <boost/fusion/container/generation/ignore.hpp>
 
 #endif
diff --git a/include/boost/fusion/view/ext_/segmented_iterator.hpp b/include/boost/fusion/view/ext_/segmented_iterator.hpp
index 2216929b..ad099bed 100755
--- a/include/boost/fusion/view/ext_/segmented_iterator.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator.hpp
@@ -19,7 +19,7 @@
 #include <boost/fusion/support/is_sequence.hpp>
 #include <boost/fusion/view/filter_view.hpp>
 #include <boost/fusion/container/list/cons.hpp> // for nil
-#include <boost/fusion/sequence/generation/make_cons.hpp>
+#include <boost/fusion/container/generation/make_cons.hpp>
 #include <boost/fusion/iterator/distance.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>