diff --git a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
index 650cd704..173a4924 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/as_deque.hpp
@@ -23,6 +23,8 @@
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
     template <int size>
     struct as_deque;
 
@@ -43,6 +45,8 @@ namespace boost { namespace fusion { namespace detail
             return deque<>();
         }
     };
+
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
@@ -67,6 +71,8 @@ namespace boost { namespace fusion { namespace detail
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
 #define BOOST_FUSION_NEXT_ITERATOR(z, n, data)                                  \
     typedef typename fusion::result_of::next<BOOST_PP_CAT(I, n)>::type          \
         BOOST_PP_CAT(I, BOOST_PP_INC(n));
@@ -87,6 +93,7 @@ namespace boost { namespace fusion { namespace detail
 #undef BOOST_FUSION_NEXT_CALL_ITERATOR
 #undef BOOST_FUSION_VALUE_OF_ITERATOR
 
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
diff --git a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
index e573efb7..159995e9 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque10.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_deque<1>
     {
@@ -218,4 +219,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
index b3b7f158..abdbd8ca 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque20.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_deque<1>
     {
@@ -428,4 +429,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
index 18b4662c..b85f3beb 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque30.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_deque<1>
     {
@@ -638,4 +639,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
index ec44a2b0..eab845f1 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque40.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_deque<1>
     {
@@ -848,4 +849,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
index 6c83aed4..e3c8376e 100644
--- a/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
+++ b/include/boost/fusion/container/deque/detail/cpp03/preprocessed/as_deque50.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_deque<1>
     {
@@ -1058,4 +1059,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39 , *i40 , *i41 , *i42 , *i43 , *i44 , *i45 , *i46 , *i47 , *i48 , *i49);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
index 62748be1..4af79522 100644
--- a/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/as_map.hpp
@@ -22,6 +22,8 @@
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
     template <int size, bool is_assoc>
     struct as_map;
 
@@ -42,6 +44,8 @@ namespace boost { namespace fusion { namespace detail
             return map<>();
         }
     };
+
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
@@ -66,6 +70,8 @@ namespace boost { namespace fusion { namespace detail
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
 #define BOOST_FUSION_NEXT_ITERATOR(z, n, data)                                  \
     typedef typename fusion::result_of::next<BOOST_PP_CAT(I, n)>::type          \
         BOOST_PP_CAT(I, BOOST_PP_INC(n));
@@ -90,6 +96,7 @@ namespace boost { namespace fusion { namespace detail
 #undef BOOST_FUSION_PAIR_FROM_ITERATOR
 #undef BOOST_FUSION_DREF_CALL_ITERATOR
 
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
diff --git a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
index c5273214..d39a27be 100644
--- a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map10.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <bool is_assoc>
     struct as_map<1, is_assoc>
     {
@@ -218,4 +219,5 @@ namespace boost { namespace fusion { namespace detail
             return result(gen::D0::call(i0) , gen::D1::call(i1) , gen::D2::call(i2) , gen::D3::call(i3) , gen::D4::call(i4) , gen::D5::call(i5) , gen::D6::call(i6) , gen::D7::call(i7) , gen::D8::call(i8) , gen::D9::call(i9));
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
index b62cf675..9caafd34 100644
--- a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map20.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <bool is_assoc>
     struct as_map<1, is_assoc>
     {
@@ -428,4 +429,5 @@ namespace boost { namespace fusion { namespace detail
             return result(gen::D0::call(i0) , gen::D1::call(i1) , gen::D2::call(i2) , gen::D3::call(i3) , gen::D4::call(i4) , gen::D5::call(i5) , gen::D6::call(i6) , gen::D7::call(i7) , gen::D8::call(i8) , gen::D9::call(i9) , gen::D10::call(i10) , gen::D11::call(i11) , gen::D12::call(i12) , gen::D13::call(i13) , gen::D14::call(i14) , gen::D15::call(i15) , gen::D16::call(i16) , gen::D17::call(i17) , gen::D18::call(i18) , gen::D19::call(i19));
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
index bb2c6d53..7c96b271 100644
--- a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map30.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <bool is_assoc>
     struct as_map<1, is_assoc>
     {
@@ -638,4 +639,5 @@ namespace boost { namespace fusion { namespace detail
             return result(gen::D0::call(i0) , gen::D1::call(i1) , gen::D2::call(i2) , gen::D3::call(i3) , gen::D4::call(i4) , gen::D5::call(i5) , gen::D6::call(i6) , gen::D7::call(i7) , gen::D8::call(i8) , gen::D9::call(i9) , gen::D10::call(i10) , gen::D11::call(i11) , gen::D12::call(i12) , gen::D13::call(i13) , gen::D14::call(i14) , gen::D15::call(i15) , gen::D16::call(i16) , gen::D17::call(i17) , gen::D18::call(i18) , gen::D19::call(i19) , gen::D20::call(i20) , gen::D21::call(i21) , gen::D22::call(i22) , gen::D23::call(i23) , gen::D24::call(i24) , gen::D25::call(i25) , gen::D26::call(i26) , gen::D27::call(i27) , gen::D28::call(i28) , gen::D29::call(i29));
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
index 1c4d7c60..ec5c3d64 100644
--- a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map40.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <bool is_assoc>
     struct as_map<1, is_assoc>
     {
@@ -848,4 +849,5 @@ namespace boost { namespace fusion { namespace detail
             return result(gen::D0::call(i0) , gen::D1::call(i1) , gen::D2::call(i2) , gen::D3::call(i3) , gen::D4::call(i4) , gen::D5::call(i5) , gen::D6::call(i6) , gen::D7::call(i7) , gen::D8::call(i8) , gen::D9::call(i9) , gen::D10::call(i10) , gen::D11::call(i11) , gen::D12::call(i12) , gen::D13::call(i13) , gen::D14::call(i14) , gen::D15::call(i15) , gen::D16::call(i16) , gen::D17::call(i17) , gen::D18::call(i18) , gen::D19::call(i19) , gen::D20::call(i20) , gen::D21::call(i21) , gen::D22::call(i22) , gen::D23::call(i23) , gen::D24::call(i24) , gen::D25::call(i25) , gen::D26::call(i26) , gen::D27::call(i27) , gen::D28::call(i28) , gen::D29::call(i29) , gen::D30::call(i30) , gen::D31::call(i31) , gen::D32::call(i32) , gen::D33::call(i33) , gen::D34::call(i34) , gen::D35::call(i35) , gen::D36::call(i36) , gen::D37::call(i37) , gen::D38::call(i38) , gen::D39::call(i39));
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
index e9cec05b..3f347b03 100644
--- a/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
+++ b/include/boost/fusion/container/map/detail/cpp03/preprocessed/as_map50.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <bool is_assoc>
     struct as_map<1, is_assoc>
     {
@@ -1058,4 +1059,5 @@ namespace boost { namespace fusion { namespace detail
             return result(gen::D0::call(i0) , gen::D1::call(i1) , gen::D2::call(i2) , gen::D3::call(i3) , gen::D4::call(i4) , gen::D5::call(i5) , gen::D6::call(i6) , gen::D7::call(i7) , gen::D8::call(i8) , gen::D9::call(i9) , gen::D10::call(i10) , gen::D11::call(i11) , gen::D12::call(i12) , gen::D13::call(i13) , gen::D14::call(i14) , gen::D15::call(i15) , gen::D16::call(i16) , gen::D17::call(i17) , gen::D18::call(i18) , gen::D19::call(i19) , gen::D20::call(i20) , gen::D21::call(i21) , gen::D22::call(i22) , gen::D23::call(i23) , gen::D24::call(i24) , gen::D25::call(i25) , gen::D26::call(i26) , gen::D27::call(i27) , gen::D28::call(i28) , gen::D29::call(i29) , gen::D30::call(i30) , gen::D31::call(i31) , gen::D32::call(i32) , gen::D33::call(i33) , gen::D34::call(i34) , gen::D35::call(i35) , gen::D36::call(i36) , gen::D37::call(i37) , gen::D38::call(i38) , gen::D39::call(i39) , gen::D40::call(i40) , gen::D41::call(i41) , gen::D42::call(i42) , gen::D43::call(i43) , gen::D44::call(i44) , gen::D45::call(i45) , gen::D46::call(i46) , gen::D47::call(i47) , gen::D48::call(i48) , gen::D49::call(i49));
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/set/detail/as_set.hpp b/include/boost/fusion/container/set/detail/as_set.hpp
index 26a719e3..a1e8cb7b 100644
--- a/include/boost/fusion/container/set/detail/as_set.hpp
+++ b/include/boost/fusion/container/set/detail/as_set.hpp
@@ -22,6 +22,8 @@
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
     template <int size>
     struct as_set;
 
@@ -42,6 +44,8 @@ namespace boost { namespace fusion { namespace detail
             return set<>();
         }
     };
+
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
@@ -66,6 +70,8 @@ namespace boost { namespace fusion { namespace detail
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
 #define BOOST_FUSION_NEXT_ITERATOR(z, n, data)                                  \
     typedef typename fusion::result_of::next<BOOST_PP_CAT(I, n)>::type          \
         BOOST_PP_CAT(I, BOOST_PP_INC(n));
@@ -86,6 +92,7 @@ namespace boost { namespace fusion { namespace detail
 #undef BOOST_FUSION_NEXT_CALL_ITERATOR
 #undef BOOST_FUSION_VALUE_OF_ITERATOR
 
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
diff --git a/include/boost/fusion/container/set/detail/preprocessed/as_set10.hpp b/include/boost/fusion/container/set/detail/preprocessed/as_set10.hpp
index f285cd5a..dda71499 100644
--- a/include/boost/fusion/container/set/detail/preprocessed/as_set10.hpp
+++ b/include/boost/fusion/container/set/detail/preprocessed/as_set10.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_set<1>
     {
@@ -218,4 +219,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/set/detail/preprocessed/as_set20.hpp b/include/boost/fusion/container/set/detail/preprocessed/as_set20.hpp
index b7ad7fa3..8ecb2b7f 100644
--- a/include/boost/fusion/container/set/detail/preprocessed/as_set20.hpp
+++ b/include/boost/fusion/container/set/detail/preprocessed/as_set20.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_set<1>
     {
@@ -428,4 +429,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/set/detail/preprocessed/as_set30.hpp b/include/boost/fusion/container/set/detail/preprocessed/as_set30.hpp
index 7a97a8e5..d91566d0 100644
--- a/include/boost/fusion/container/set/detail/preprocessed/as_set30.hpp
+++ b/include/boost/fusion/container/set/detail/preprocessed/as_set30.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_set<1>
     {
@@ -638,4 +639,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/set/detail/preprocessed/as_set40.hpp b/include/boost/fusion/container/set/detail/preprocessed/as_set40.hpp
index 8e98f68a..1facc1d3 100644
--- a/include/boost/fusion/container/set/detail/preprocessed/as_set40.hpp
+++ b/include/boost/fusion/container/set/detail/preprocessed/as_set40.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_set<1>
     {
@@ -848,4 +849,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/set/detail/preprocessed/as_set50.hpp b/include/boost/fusion/container/set/detail/preprocessed/as_set50.hpp
index 6cefd9a1..fd0848a3 100644
--- a/include/boost/fusion/container/set/detail/preprocessed/as_set50.hpp
+++ b/include/boost/fusion/container/set/detail/preprocessed/as_set50.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_set<1>
     {
@@ -1058,4 +1059,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39 , *i40 , *i41 , *i42 , *i43 , *i44 , *i45 , *i46 , *i47 , *i48 , *i49);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/vector/detail/as_vector.hpp b/include/boost/fusion/container/vector/detail/as_vector.hpp
index 2224fcc6..368557d0 100644
--- a/include/boost/fusion/container/vector/detail/as_vector.hpp
+++ b/include/boost/fusion/container/vector/detail/as_vector.hpp
@@ -22,6 +22,8 @@
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
+
     template <int size>
     struct as_vector;
 
@@ -42,6 +44,8 @@ namespace boost { namespace fusion { namespace detail
             return vector0<>();
         }
     };
+
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if !defined(BOOST_FUSION_DONT_USE_PREPROCESSED_FILES)
@@ -66,6 +70,7 @@ namespace boost { namespace fusion { namespace detail
 
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
 
 #define BOOST_FUSION_NEXT_ITERATOR(z, n, data)                                  \
     typedef typename fusion::result_of::next<BOOST_PP_CAT(I, n)>::type          \
@@ -87,6 +92,7 @@ namespace boost { namespace fusion { namespace detail
 #undef BOOST_FUSION_NEXT_CALL_ITERATOR
 #undef BOOST_FUSION_VALUE_OF_ITERATOR
 
+BOOST_FUSION_BARRIER_END
 }}}
 
 #if defined(__WAVE__) && defined(BOOST_FUSION_CREATE_PREPROCESSED_FILES)
diff --git a/include/boost/fusion/container/vector/detail/preprocessed/as_vector10.hpp b/include/boost/fusion/container/vector/detail/preprocessed/as_vector10.hpp
index 8a48beda..53f2f164 100644
--- a/include/boost/fusion/container/vector/detail/preprocessed/as_vector10.hpp
+++ b/include/boost/fusion/container/vector/detail/preprocessed/as_vector10.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_vector<1>
     {
@@ -218,4 +219,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/vector/detail/preprocessed/as_vector20.hpp b/include/boost/fusion/container/vector/detail/preprocessed/as_vector20.hpp
index 63bb0d58..c42a60cc 100644
--- a/include/boost/fusion/container/vector/detail/preprocessed/as_vector20.hpp
+++ b/include/boost/fusion/container/vector/detail/preprocessed/as_vector20.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_vector<1>
     {
@@ -428,4 +429,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/vector/detail/preprocessed/as_vector30.hpp b/include/boost/fusion/container/vector/detail/preprocessed/as_vector30.hpp
index 8888b2d8..fd94d1f3 100644
--- a/include/boost/fusion/container/vector/detail/preprocessed/as_vector30.hpp
+++ b/include/boost/fusion/container/vector/detail/preprocessed/as_vector30.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_vector<1>
     {
@@ -638,4 +639,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/vector/detail/preprocessed/as_vector40.hpp b/include/boost/fusion/container/vector/detail/preprocessed/as_vector40.hpp
index cfd7b055..8a712cf8 100644
--- a/include/boost/fusion/container/vector/detail/preprocessed/as_vector40.hpp
+++ b/include/boost/fusion/container/vector/detail/preprocessed/as_vector40.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_vector<1>
     {
@@ -848,4 +849,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/container/vector/detail/preprocessed/as_vector50.hpp b/include/boost/fusion/container/vector/detail/preprocessed/as_vector50.hpp
index ea42ba2f..761ca9cc 100644
--- a/include/boost/fusion/container/vector/detail/preprocessed/as_vector50.hpp
+++ b/include/boost/fusion/container/vector/detail/preprocessed/as_vector50.hpp
@@ -8,6 +8,7 @@
 ==============================================================================*/
 namespace boost { namespace fusion { namespace detail
 {
+BOOST_FUSION_BARRIER_BEGIN
     template <>
     struct as_vector<1>
     {
@@ -1058,4 +1059,5 @@ namespace boost { namespace fusion { namespace detail
             return result(*i0 , *i1 , *i2 , *i3 , *i4 , *i5 , *i6 , *i7 , *i8 , *i9 , *i10 , *i11 , *i12 , *i13 , *i14 , *i15 , *i16 , *i17 , *i18 , *i19 , *i20 , *i21 , *i22 , *i23 , *i24 , *i25 , *i26 , *i27 , *i28 , *i29 , *i30 , *i31 , *i32 , *i33 , *i34 , *i35 , *i36 , *i37 , *i38 , *i39 , *i40 , *i41 , *i42 , *i43 , *i44 , *i45 , *i46 , *i47 , *i48 , *i49);
         }
     };
+BOOST_FUSION_BARRIER_END
 }}}
diff --git a/include/boost/fusion/support/config.hpp b/include/boost/fusion/support/config.hpp
index 16e38f95..5bee7df8 100644
--- a/include/boost/fusion/support/config.hpp
+++ b/include/boost/fusion/support/config.hpp
@@ -1,5 +1,6 @@
 /*=============================================================================
     Copyright (c) 2014 Eric Niebler
+    Copyright (c) 2014 Kohei Takahashi
 
     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)
@@ -13,4 +14,29 @@
 #define BOOST_FUSION_GPU_ENABLED BOOST_GPU_ENABLED
 #endif
 
+// Enclose with inline namespace because unqualified lookup of GCC < 4.5 is broken.
+//
+//      namespace detail {
+//          struct foo;
+//          struct X { };
+//      }
+//
+//      template <typename T> void foo(T) { }
+//
+//      int main()
+//      {
+//            foo(detail::X());
+//            // prog.cc: In function 'int main()':
+//            // prog.cc:2: error: 'struct detail::foo' is not a function,
+//            // prog.cc:6: error: conflict with 'template<class T> void foo(T)'
+//            // prog.cc:10: error: in call to 'foo'
+//      }
+namespace boost { namespace fusion { namespace detail
+{
+    namespace barrier { }
+    using namespace barrier;
+}}}
+#define BOOST_FUSION_BARRIER_BEGIN namespace barrier {
+#define BOOST_FUSION_BARRIER_END   }
+
 #endif
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index d6744de0..3fd87116 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -21,6 +21,8 @@
 -NBOOST_FUSION_HAS_VARIADIC_MAP
 -NBOOST_FUSION_VECTOR_COPY_INIT
 -NBOOST_FUSION_VECTOR_CTOR_HELPER
+-NBOOST_FUSION_BARRIER_BEGIN
+-NBOOST_FUSION_BARRIER_END
 -S..\include
 -S..\..\..
 -S"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\INCLUDE"