diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6804f52783dad0674df9f18c22b9380b7c0ac908..f7a855b6804772ef46120d2e11aabba44fec5819 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -523,7 +523,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
   MESSAGE(FATAL_ERROR
            "Cannot find geotiff headers. Please set GEOTIFF_INCLUDE_DIRS.")
   ENDIF (NOT GEOTIFF_INCLUDE_DIRS)
-  INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
+#  INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
 
   # Find tiff headers
   FIND_PATH(TIFF_INCLUDE_DIRS tiffio.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} /usr/include)
@@ -531,7 +531,7 @@ IF(OTB_USE_EXTERNAL_GDAL)
   MESSAGE(FATAL_ERROR
            "Cannot find libtiff headers. Please set TIFF_INCLUDE_DIRS.")
   ENDIF (NOT TIFF_INCLUDE_DIRS)
-  INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
+#  INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
 
   # Find jpeg headers
   FIND_PATH(JPEG_INCLUDE_DIRS jpeglib.h $ENV{GDAL_INCLUDE_DIR} ${GDAL_INCLUDE_DIR} /usr/include)
diff --git a/Code/IO/CMakeLists.txt b/Code/IO/CMakeLists.txt
index 6ee7fbf2294edcd0c5ba5f85006c72809876d7e3..a76534722a87ea8ee93bbeed93d557397f15ff3d 100644
--- a/Code/IO/CMakeLists.txt
+++ b/Code/IO/CMakeLists.txt
@@ -34,7 +34,7 @@ ADD_LIBRARY(OTBIO ${OTBIO_SRCS})
 #    PROPERTIES
 #    LINK_INTERFACE_LIBRARIES ""
 #  )
-TARGET_LINK_LIBRARIES (OTBIO ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY} OTBCommon)
+TARGET_LINK_LIBRARIES (OTBIO  ${TIFF_LIBRARY} ${GEOTIFF_LIBRARY}  ${GDAL_LIBRARY} ${OGR_LIBRARY} ${JPEG_LIBRARY} OTBCommon)
 TARGET_LINK_LIBRARIES (OTBIO otbossim otbossimplugins ITKIO ITKCommon dxf otbkml tinyXML)
 
 IF (OTB_USE_LIBLAS)
diff --git a/Utilities/otbossim/CMakeLists.txt b/Utilities/otbossim/CMakeLists.txt
index 1d69ad00fa4f89bd1cf9088d66e1d04d3e2e8f92..703ea9a18a1415ac781274b742802e9fdc3c8453 100644
--- a/Utilities/otbossim/CMakeLists.txt
+++ b/Utilities/otbossim/CMakeLists.txt
@@ -15,6 +15,9 @@ CHECK_INCLUDE_FILE("dbmalloc.h" CMAKE_HAVE_DBMALLOC_H)
 CHECK_INCLUDE_FILE("malloc.h" CMAKE_HAVE_MALLOC_H)
 CHECK_INCLUDE_FILE("dlfcn.h" CMAKE_HAVE_DLFCN_H)
 
+INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIRS})
+
 INCLUDE_DIRECTORIES(${OTB_SOURCE_DIR}/Utilities/otbossim/include)
 INCLUDE_DIRECTORIES(${OTB_BINARY_DIR}/Utilities/otbossim/include)
 
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 7a7bf67033eaa78c41e97455c9b4db642f71e239..e4032412320d9330bce5309456517b426ad1c52d 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -9,6 +9,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
   ${OTB_SOURCE_DIR}/Utilities/otbossim/include
   ${OTB_BINARY_DIR}/Utilities/otbossim/include
 )
+INCLUDE_DIRECTORIES(AFTER ${GEOTIFF_INCLUDE_DIRS})
 
 SET(ossimplugins_SOURCES_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
@@ -21,7 +22,7 @@ SET(ossimplugins_SOURCES
 )
 
 ADD_LIBRARY(otbossimplugins ${ossimplugins_SOURCES} )
-TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} ${OGR_LIBRARY} otbossim)
+TARGET_LINK_LIBRARIES(otbossimplugins ${GDAL_LIBRARY} ${OGR_LIBRARY} ${GEOTIFF_LIBRARY} otbossim)
 #TARGET_LINK_LIBRARIES(otbossimplugins otbossim)
 
 IF(OTB_LIBRARY_PROPERTIES)