diff --git a/CMake/otbIncludeDirectories.cmake b/CMake/otbIncludeDirectories.cmake
index 6e013f115fca2f7b6a5167b658a72d30fafc5120..5df8f958a59cfc79d2ee1b07724ff03e2c0bd128 100644
--- a/CMake/otbIncludeDirectories.cmake
+++ b/CMake/otbIncludeDirectories.cmake
@@ -71,16 +71,6 @@ IF(BUILD_APPLICATIONS)
     ${OTB_SOURCE_DIR}/Code/Wrappers/CommandLine )
 ENDIF(BUILD_APPLICATIONS)
 
-IF(NOT OTB_USE_EXTERNAL_OSSIM)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-  ${OTB_SOURCE_DIR}/Utilities/otbossim/include
-  ${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim
-  ${OTB_BINARY_DIR}/Utilities/otbossim/include/ossim)
-ELSE(NOT OTB_USE_EXTERNAL_OSSIM)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-    ${OSSIM_INCLUDE_DIR})
-ENDIF(NOT OTB_USE_EXTERNAL_OSSIM)
-
 IF(OTB_USE_PQXX)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
     ${OTB_SOURCE_DIR}/Code/GeospatialAnalysis ${PQXX_INCLUDE_DIR})
diff --git a/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt b/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
index caf62536261959ad0962408133a42fcb5d9c48dc..361fef50b70c1fe7210cf5a0b04bfc923db8ec48 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
+++ b/Code/UtilitiesAdapters/OssimAdapters/CMakeLists.txt
@@ -2,6 +2,13 @@
 
 FILE(GLOB OTBOssimAdapters_SRCS "*.cxx" )
 
+IF(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OSSIM_INCLUDE_DIR} )
+ELSE(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OTB_SOURCE_DIR}/Utilities/otbossim/include
+                       ${OTB_BINARY_DIR}/Utilities/otbossim/include )
+ENDIF(OTB_USE_EXTERNAL_OSSIM)
+
 ADD_LIBRARY(OTBOssimAdapters ${OTBOssimAdapters_SRCS})
 TARGET_LINK_LIBRARIES (OTBOssimAdapters ${OSSIM_LIBRARY} otbossimplugins ITKCommon)
 IF(OTB_LIBRARY_PROPERTIES)
diff --git a/Testing/Utilities/CMakeLists.txt b/Testing/Utilities/CMakeLists.txt
index f166477c0285c3b9ba06b7cdc9515b61cdea5b8f..1e6072859c46f0549e9ab8cb147b7230b1e35e76 100644
--- a/Testing/Utilities/CMakeLists.txt
+++ b/Testing/Utilities/CMakeLists.txt
@@ -394,6 +394,13 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}")
 
+IF(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OSSIM_INCLUDE_DIR} )
+ELSE(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OTB_SOURCE_DIR}/Utilities/otbossim/include
+                       ${OTB_BINARY_DIR}/Utilities/otbossim/include )
+ENDIF(OTB_USE_EXTERNAL_OSSIM)
+
 IF(NOT BUILD_SHARED_LIBS)
   ADD_DEFINITIONS(-DOPJ_STATIC)
 ENDIF(NOT BUILD_SHARED_LIBS)