diff --git a/CMake/ImportGdal.cmake b/CMake/ImportGdal.cmake
index 95441f29632c9e85d83778bad8b2da746d38e189..ebd500eed4368674b391f4047fbd3eca74aa4974 100644
--- a/CMake/ImportGdal.cmake
+++ b/CMake/ImportGdal.cmake
@@ -89,7 +89,6 @@ IF(OTB_USE_EXTERNAL_GDAL)
   IF (NOT JPEG_INCLUDE_DIRS)
     MESSAGE(FATAL_ERROR "Cannot find jpeg headers. Please set JPEG_INCLUDE_DIRS.")
   ENDIF (NOT JPEG_INCLUDE_DIRS)
-  INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIRS})
 
   # Find ogr headers
   FIND_PATH(OGR_INCLUDE_DIRS ogrsf_frmts.h
@@ -98,7 +97,6 @@ IF(OTB_USE_EXTERNAL_GDAL)
   IF (NOT OGR_INCLUDE_DIRS)
     MESSAGE(FATAL_ERROR "Cannot find ogr headers. Please set OGR_INCLUDE_DIRS.")
   ENDIF (NOT OGR_INCLUDE_DIRS)
-  INCLUDE_DIRECTORIES(${OGR_INCLUDE_DIRS})
 
   # Check if ${GDAL_LIBRARY} has tiff library
   TRY_COMPILE(GDAL_HAS_TIFF
diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index c667371de87a90e6bb6c0454e3fcd9512bb81000..d8ddfb032d1431ef47c3a1e2a344df4260d0bada 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -68,7 +68,9 @@ ELSE(OTB_USE_EXTERNAL_BOOST)
 ENDIF(OTB_USE_EXTERNAL_BOOST)
 
 SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-    ${GDAL_INCLUDE_DIRS} )
+    ${GDAL_INCLUDE_DIRS}
+    ${JPEG_INCLUDE_DIRS}
+    ${OGR_INCLUDE_DIRS})
 
 IF(WIN32)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
@@ -302,7 +304,9 @@ ENDIF(WIN32)
 
 #For GDAL header file
 SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
-  		${GDAL_INCLUDE_DIRS} )
+    ${GDAL_INCLUDE_DIRS}
+    ${JPEG_INCLUDE_DIRS}
+    ${OGR_INCLUDE_DIRS})
 
 #For EXPAT header file
 IF(OTB_USE_EXTERNAL_EXPAT)