diff --git a/include/boost/move/algorithm.hpp b/include/boost/move/algorithm.hpp
index da2f186..f5f4b81 100644
--- a/include/boost/move/algorithm.hpp
+++ b/include/boost/move/algorithm.hpp
@@ -271,4 +271,4 @@ inline F copy_or_move(I f, I l, F r
 
 #include <boost/move/detail/config_end.hpp>
 
-#endif //#ifndef BOOST_MOVE_MOVE_HPP
+#endif //#ifndef BOOST_MOVE_ALGORITHM_HPP
diff --git a/include/boost/move/core.hpp b/include/boost/move/core.hpp
index b420875..e2b13cd 100644
--- a/include/boost/move/core.hpp
+++ b/include/boost/move/core.hpp
@@ -87,7 +87,9 @@
 
    template <class T>
    struct is_rv
-      : ::boost::move_detail::is_rv_impl<T>
+        //Derive from integral constant because some Boost code assummes it has
+        //a "type" internal typedef
+      : integral_constant<bool, ::boost::move_detail::is_rv_impl<T>::value >
    {};
 
    }  //namespace move_detail {