diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
index 891b5ae37824461705b6a1dc0319257b02e815b0..51e17751fa024faccaea35086bfe95383eb01fb9 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.txx
@@ -42,6 +42,12 @@ using boost::interprocess::move;
 /*===========================================================================*/
 /*================================[ Feature ]================================*/
 /*===========================================================================*/
+inline
+void otb::ogr::Feature::CheckInvariants() const
+{
+  assert(m_Feature && "OGRFeature can't be null");
+}
+
 inline
 otb::ogr::Feature otb::ogr::Feature::Clone() const
 {
@@ -199,11 +205,4 @@ void otb::ogr::Feature::PrintSelf(std::ostream & os, itk::Indent indent) const
   UncheckedPrintSelf(os, indent);
 }
 
-
-inline
-void otb::ogr::Feature::CheckInvariants() const
-{
-  assert(m_Feature && "OGRFeature can't be null");
-}
-
 #endif // otbOGRFeatureWrapper_txx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index 4f328fee2113ed9e24324a1eed6f8bb6dabdc4ed..36b408d86ad85d745d03291b369ac3bff467d7fa 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -506,7 +506,11 @@ public:
    */
   OGRwkbGeometryType GetGeomType() const;
 
-  friend bool otb::ogr::operator==(Layer const& lhs, Layer const& rhs);
+  friend bool operator==(Layer const& lhs, Layer const& rhs)
+  {
+    const bool equal = lhs.m_Layer.get() == rhs.m_Layer.get();
+    return equal;
+  }
 
 private:
   /**
diff --git a/Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx b/Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx
index 58c3b503d25c08bf38bf88426793ab14e0e0fca7..185edf72898df8ab0076bdb89d27265f0775f9ba 100644
--- a/Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx
+++ b/Modules/Adapters/GdalAdapters/src/otbOGRLayerWrapper.cxx
@@ -448,8 +448,3 @@ OGRwkbGeometryType otb::ogr::Layer::GetGeomType() const
 #endif
 }
 
-bool otb::ogr::operator==(Layer const& lhs, Layer const& rhs)
-{
-  const bool equal = lhs.m_Layer.get() == rhs.m_Layer.get();
-  return equal;
-}