diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
index 397140c38de68ea36896c379178d915214c4d818..0ee5de4d9ab6856937f25ed52b61346e597f21ff 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRDataSourceWrapper.h
@@ -504,15 +504,13 @@ public:
     return m_DataSource ? &boolean::i : 0;
     }
 
-  /*otb::ogr::*
-   * Flushes all changes to disk.
+  /** Flushes all changes to disk.
    * \throw itd::ExceptionObject in case the flush operation failed.
    * \sa OGRDataSource::SyncToDisk
    */
   void SyncToDisk();
 
-  /**
-   * Returns whether a capability is avalaible.
+  /** Returns whether a capability is avalaible.
    * \param[in] capabilityName  name of the capability to check.
    * \throw None
    * \sa OGRDataSource::TestCapability
@@ -578,6 +576,8 @@ private:
 } } // end namespace otb::ogr
 
 #if 0
+// Either this, or inheriting from noncopyable is required for DataSource to be
+// compatible with BOOST_FOREACH
 namespace boost { namespace foreach {
   template<typename T> struct is_noncopyable; // forward declaration
   template <>
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h
index 6b113fb444915c33fcdbacfcf246e10770f94618..aa706662fc0996be95d20430683469c4cf2049ee 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.h
@@ -234,7 +234,7 @@ public:
     assert(m_Definition.GetType() == Kind::value);
     typedef typename boost::mpl::at<metaprog::FieldGetters_Map, Kind>::type GetterType;
     BOOST_STATIC_ASSERT(!(boost::is_same<GetterType, boost::mpl::void_>::value));
-    assert(m_index >= 0 && m_index < m_Feature->GetFieldCount());
+    assert(m_index >= 0 && int(m_index) < m_Feature->GetFieldCount());
     return GetterType::call(*m_Feature, m_index);
     }
 
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx
index a15587b6ee5cb03de0d784be0142aa3e9b7ef56a..6f87b1eb548a5979b73770b767cca6a9c8f587cc 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRGeometryWrapper.cxx
@@ -22,6 +22,10 @@
 #include "otbOGRGeometryWrapper.h"
 #include "ogr_geometry.h"
 
+#ifdef _MSC_VER
+// warning convertion int -> bool
+#pragma warning ( disable : 4800 )
+#endif
 /*===========================================================================*/
 /*================================[ Deleter ]================================*/
 /*===========================================================================*/
diff --git a/Code/UtilitiesAdapters/otbOGR.h b/Code/UtilitiesAdapters/otbOGR.h
index e5d566824e30f75959d7f0cf1f45e9e471002358..a69e7dd8c71caf978c74ed90aed6a92ab0f1738e 100644
--- a/Code/UtilitiesAdapters/otbOGR.h
+++ b/Code/UtilitiesAdapters/otbOGR.h
@@ -33,6 +33,10 @@ namespace otb {
 
 #include "otbOGRDriversInit.h"
 #include "otbOGRDataSourceWrapper.h"
+// #include "otbOGRLayerWrapper.h" // implicit
+// #include "otbOGRFeatureWrapper.h" // implicit
+// #include "otbOGRFieldWrapper.h" // implicit
+// #include "otbOGRGeometryWrapper.h" // implicit
 
 /**\ingroup Geometry
  * \file    otbOGR.h