diff --git a/doc/container.qbk b/doc/container.qbk
index 69df6f8f..d6b16c35 100644
--- a/doc/container.qbk
+++ b/doc/container.qbk
@@ -846,7 +846,7 @@ Create a __deque__ from one or more values.
 
 For C++11 compilers, the variadic function interface has no upper bound.
 
-For C++11 compilers, the variadic function accepts `0` to
+For C++03 compilers, the variadic function accepts `0` to
 `FUSION_MAX_DEQUE_SIZE` elements, where `FUSION_MAX_DEQUE_SIZE` is a
 user definable predefined maximum that defaults to `10`. You may define
 the preprocessor constant `FUSION_MAX_DEQUE_SIZE` before including any
@@ -950,7 +950,9 @@ Create a __map__ from one or more key/data pairs.
     typename __result_of_make_map__<K0, K0,... KN, T0, T1,... TN>::type
     make_map(T0 const& x0, T1 const& x1... TN const& xN);
 
-The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
+For C++11 compilers, the variadic function interface has no upper bound.
+
+For C++03 compilers, the variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
 where `FUSION_MAX_MAP_SIZE` is a user definable predefined maximum that
 defaults to `10`. You may define the preprocessor constant
 `FUSION_MAX_MAP_SIZE` before including any Fusion header to change the
@@ -1475,7 +1477,9 @@ Returns the result type of __make_map__.
       , typename T0, typename T1,... typename TN>
     struct make_map;
 
-The variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
+For C++11 compilers, the variadic function interface has no upper bound.
+
+For C++03 compilers, the variadic function accepts `0` to `FUSION_MAX_MAP_SIZE` elements,
 where `FUSION_MAX_MAP_SIZE` is a user definable predefined maximum that
 defaults to `10`. You may define the preprocessor constant
 `FUSION_MAX_MAP_SIZE` before including any Fusion header to change the
diff --git a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
index 843ae759..dccf13a6 100644
--- a/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
+++ b/include/boost/fusion/container/generation/detail/pp_make_deque.hpp
@@ -66,9 +66,6 @@ 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_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/container/generation/detail/pp_make_deque.hpp>
 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE)
 #include BOOST_PP_ITERATE()
diff --git a/include/boost/fusion/container/generation/make_deque.hpp b/include/boost/fusion/container/generation/make_deque.hpp
index 20246f78..18e41304 100644
--- a/include/boost/fusion/container/generation/make_deque.hpp
+++ b/include/boost/fusion/container/generation/make_deque.hpp
@@ -27,7 +27,7 @@ namespace boost { namespace fusion
         template <typename ...T>
         struct make_deque
         {
-            typedef deque<T...> type;
+            typedef deque<typename detail::as_fusion_element<T>::type...> type;
         };
     }
 
diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
index 7d5d139d..b9f45d0c 100644
--- a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
+++ b/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp
@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 
-#if !defined(BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED)
-#define BOOST_FUSION_REPETITIVE_VIEW_HPP_ITERATOR_INCLUDED
+#ifndef BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED
+#define BOOST_FUSION_REPETITIVE_VIEW_ITERATOR_HPP_INCLUDED
 
 #include <boost/fusion/support/config.hpp>
 #include <boost/fusion/support/iterator_base.hpp>
diff --git a/preprocess/wave.cfg b/preprocess/wave.cfg
index 3cde502f..d6744de0 100644
--- a/preprocess/wave.cfg
+++ b/preprocess/wave.cfg
@@ -12,6 +12,7 @@
 -NBOOST_FORCEINLINE
 -NBOOST_CONSTEXPR
 -NBOOST_CXX14_CONSTEXPR
+-NBOOST_NO_CXX11_RVALUE_REFERENCES
 -NBOOST_MPL_ASSERT
 -NBOOST_MPL_ASSERT_MSG
 -NBOOST_MPL_ASSERT_RELATION