diff --git a/Code/IO/otbImageIOFactory.cxx b/Code/IO/otbImageIOFactory.cxx
index 30a23fcc74d07996013724b663f65bf14321d188..85c215fa7f7676db9915b571839f4464c3598a65 100644
--- a/Code/IO/otbImageIOFactory.cxx
+++ b/Code/IO/otbImageIOFactory.cxx
@@ -19,9 +19,9 @@
 
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
-#include "otbCurlHelperInterface.h"
 
 #include "otbImageIOFactory.h"
+#include "otbConfigure.h"
 
 #include "otbONERAImageIOFactory.h"
 #include "otbMSTARImageIOFactory.h"
@@ -101,10 +101,9 @@ ImageIOFactory::RegisterBuiltInFactories()
 #ifdef OTB_USE_JPEG2000
       itk::ObjectFactoryBase::RegisterFactory(JPEG2000ImageIOFactory::New());
 #endif
-      if (CurlHelperInterface::IsCurlAvailable())
-        {
-        itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
-        }
+#ifdef OTB_CURL_MULTI_AVAILABLE
+      itk::ObjectFactoryBase::RegisterFactory(TileMapImageIOFactory::New());
+#endif
       itk::ObjectFactoryBase::RegisterFactory(GDALImageIOFactory::New());
       itk::ObjectFactoryBase::RegisterFactory(MWImageIOFactory::New());
       itk::ObjectFactoryBase::RegisterFactory(ONERAImageIOFactory::New());
diff --git a/Code/Simulation/otbSpatialisationFilter.txx b/Code/Simulation/otbSpatialisationFilter.txx
index 8037143a3dd2ff8a6830b7ce4b0c1b023479ecba..b6832c57a845c2a3248877d9a83e245a7c43e2d3 100644
--- a/Code/Simulation/otbSpatialisationFilter.txx
+++ b/Code/Simulation/otbSpatialisationFilter.txx
@@ -20,7 +20,6 @@
 
 #include "itkNumericTraits.h"
 
-#include "otbVectorDataProperties.h"
 #include "otbSpatialisationFilter.h"
 
 namespace otb