--- boost/optional/optional.hpp.orig	2014-12-03 08:59:19.253386834 +0100
+++ boost/optional/optional.hpp	2014-12-03 09:46:36.163510525 +0100
@@ -262,7 +262,7 @@
       :
       m_initialized(false)
     {
-      construct( boost::move(val) );
+      construct( types::move(val) );
     }
 #endif
 
@@ -410,8 +410,8 @@
     void assign ( rval_reference_type val )
     {
       if (is_initialized())
-           assign_value( boost::move(val), is_reference_predicate() );
-      else construct( boost::move(val) );
+           assign_value( types::move(val), is_reference_predicate() );
+      else construct( types::move(val) );
     }
 #endif
 
@@ -805,7 +805,7 @@
       base()
     {
       if ( rhs.is_initialized() )
-        this->construct( boost::move(rhs.get()) );
+        this->construct( optional<U>::types::move(rhs.get()) );
     }
 #endif
 
@@ -935,7 +935,7 @@
     optional& operator= ( rval_reference_type val )
       {
         optional_detail::prevent_binding_rvalue_ref_to_optional_lvalue_ref<T, rval_reference_type>();
-        this->assign( boost::move(val) ) ;
+        this->assign( base::types::move(val) ) ;
         return *this ;
       }
 #endif
@@ -1007,7 +1007,7 @@
 #ifndef BOOST_NO_CXX11_REF_QUALIFIERS
     reference_const_type operator *() const& { return this->get() ; }
     reference_type       operator *() &      { return this->get() ; }
-    reference_type_of_temporary_wrapper operator *() && { return boost::move(this->get()) ; }
+    reference_type_of_temporary_wrapper operator *() && { return base::types::move(this->get()) ; }
 #else
     reference_const_type operator *() const { return this->get() ; }
     reference_type       operator *()       { return this->get() ; }
@@ -1033,7 +1033,7 @@
     reference_type_of_temporary_wrapper value() &&
       { 
         if (this->is_initialized())
-          return boost::move(this->get()) ;
+          return base::types::move(this->get()) ;
         else
           throw_exception(bad_optional_access());
       }
@@ -1071,7 +1071,7 @@
     value_type value_or ( U&& v ) && 
       { 
         if (this->is_initialized())
-          return boost::move(get());
+          return base::types::move(get());
         else
           return boost::forward<U>(v);
       }
@@ -1110,7 +1110,7 @@
     value_type value_or_eval ( F f ) &&
       {
         if (this->is_initialized())
-          return boost::move(get());
+          return base::types::move(get());
         else
           return f();
       }