diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
index 5ef99dc5a42ba7971e1f4aa0e88d1dfcef28428e..820c74e13604d308bce01e3c2531dd5f871d8936 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.txx
@@ -27,10 +27,16 @@
 #   include <boost/move/move.hpp> // since 1.48
 #else
 #   include <boost/interprocess/detail/move.hpp>
-namespace boost {
+#endif
+
+namespace otb
+{
+#if BOOST_VERSION >= 104800
+using boost::move;
+#else
 using boost::interprocess::move;
-} // boost namespace
 #endif
+}
 
 /*===========================================================================*/
 /*================================[ Feature ]================================*/
@@ -138,7 +144,7 @@ void otb::ogr::Feature::SetGeometryDirectly(UniqueGeometryPtr geometry)
 {
   CheckInvariants();
   OGRGeometry * g = geometry.get();
-  UncheckedSetGeometryDirectly(boost::move(geometry));
+  UncheckedSetGeometryDirectly(otb::move(geometry));
   assert(m_Feature->GetGeometryRef() == g && "The new geometry hasn't been set as expected");
   assert(! geometry && "UniqueGeometryPtr hasn't released its pointer");
 }
@@ -149,7 +155,7 @@ otb::ogr::UniqueGeometryPtr otb::ogr::Feature::StealGeometry()
   CheckInvariants();
   UniqueGeometryPtr res = UncheckedStealGeometry();
   assert(! m_Feature->GetGeometryRef() && "Geometry hasn't been properly stolen");
-  return boost::move(res);
+  return otb::move(res);
 }
 
 inline