diff --git a/Testing/Code/IO/otbImageKeywordlist.cxx b/Testing/Code/IO/otbImageKeywordlist.cxx
index c2dc82fe1d1360daea56f2f01bbeb7830a0258ec..c2209342486515f8a6b4f399e2cbeaf037a1fa2f 100644
--- a/Testing/Code/IO/otbImageKeywordlist.cxx
+++ b/Testing/Code/IO/otbImageKeywordlist.cxx
@@ -23,11 +23,12 @@
 #include "otbMacro.h"
 #include "otbImageKeywordlist.h"
 
-#include "base/ossimKeywordlist.h"
-#include "projection/ossimProjection.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/projection/ossimProjection.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/base/ossimFilename.h"
+
 #include "ossim/ossimPluginProjectionFactory.h"
-#include "base/ossimFilename.h"
 
 int otbImageKeywordlist(int argc, char* argv[])
 {
diff --git a/Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx b/Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx
index 5163cd4683273401485c8ae88383d3072a0f1451..43764790e766e98a525fb7842a011c1007fe0374 100644
--- a/Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx
+++ b/Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx
@@ -15,12 +15,13 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include <imaging/ossimImageHandler.h>
-#include <imaging/ossimImageHandlerRegistry.h>
-#include <base/ossimFilename.h>
 #include <stdlib.h>
 #include <iostream>
 
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/base/ossimFilename.h>
+
 // This test demonstrate that handler->close() does not release the file descriptor for jpeg files.
 
 int otbOssimJpegFileRessourceLeakTest(int argc, char * argv[])
diff --git a/Testing/Code/Projections/CMakeLists.txt b/Testing/Code/Projections/CMakeLists.txt
index dc0af32a6facc1609a8b761fa9a54213c6db3d76..d55dbf55cd6610e58ba78ea14ffb52724b94c45c 100644
--- a/Testing/Code/Projections/CMakeLists.txt
+++ b/Testing/Code/Projections/CMakeLists.txt
@@ -1642,6 +1642,13 @@ otbCreateProjectionWithOTB.cxx
 )
 ENDIF(NOT OTB_TESTING_STANDALONE)
 
+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)
+
 OTB_ADD_EXECUTABLE(otbProjectionsTests1 "${Projections_SRCS1}" "OTBProjections;OTBIO;OTBTesting")
 OTB_ADD_EXECUTABLE(otbProjectionsTests2 "${Projections_SRCS2}" "OTBProjections;OTBIO;OTBTesting")
 OTB_ADD_EXECUTABLE(otbProjectionsTests3 "${Projections_SRCS3}" "OTBProjections;OTBIO;OTBTesting")
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
index b2a42342999a9b4351ed0a675edcf5157713a211..daac8d0c78a6a883b847c3de61d7bab8f75b81d8 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
@@ -45,10 +45,10 @@
 
 #include "otbInverseSensorModel.h"
 
-#include "imaging/ossimImageHandler.h"
-#include "base/ossimKeywordlist.h"
-#include "imaging/ossimImageHandlerRegistry.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/imaging/ossimImageHandler.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/imaging/ossimImageHandlerRegistry.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
 
 int otbCreateProjectionWithOSSIM(int argc, char* argv[])
 {
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
index 85e402b9ec871abeb8219afa5bfc4ce869c3ef46..11ca71ec5257afd6c4d2e78510063c529d647761 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
@@ -45,10 +45,10 @@
 
 #include "otbInverseSensorModel.h"
 
-#include "base/ossimKeywordlist.h"
-#include "base/ossimGpt.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
-#include "imaging/ossimImageHandlerRegistry.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/base/ossimGpt.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/imaging/ossimImageHandlerRegistry.h"
 
 int otbCreateProjectionWithOTB(int argc, char* argv[])
 {
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest.cxx b/Testing/Code/Projections/otbOssimElevManagerTest.cxx
index 44df7e022238691a003be39e7dbc7b5790585038..caaf8ccffc071997c4d2b23b90f35999816d2904 100644
--- a/Testing/Code/Projections/otbOssimElevManagerTest.cxx
+++ b/Testing/Code/Projections/otbOssimElevManagerTest.cxx
@@ -14,11 +14,11 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
 
 #include "otbImage.h"
 #include "otbImageFileWriter.h"
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
 #include "itkImageRegionIteratorWithIndex.h"
 
 int otbOssimElevManagerTest(int argc, char* argv[])
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest2.cxx b/Testing/Code/Projections/otbOssimElevManagerTest2.cxx
index f8ef7236a336d1be91cde3354d49a4fc9549e2ae..93a0baa4689e97201fca7d839a3b0e59c2440266 100644
--- a/Testing/Code/Projections/otbOssimElevManagerTest2.cxx
+++ b/Testing/Code/Projections/otbOssimElevManagerTest2.cxx
@@ -19,8 +19,9 @@
 #include <fstream>
 #include <cstdlib>
 
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
+
 #include "itkPoint.h"
 
 int otbOssimElevManagerTest2(int argc, char* argv[])
diff --git a/Testing/Code/Projections/otbOssimElevManagerTest4.cxx b/Testing/Code/Projections/otbOssimElevManagerTest4.cxx
index 46212a87757d2cd3a329dfe5a66e96676032942a..3ae4b6203739d3d30cfb568af6731db9d7e67320 100644
--- a/Testing/Code/Projections/otbOssimElevManagerTest4.cxx
+++ b/Testing/Code/Projections/otbOssimElevManagerTest4.cxx
@@ -20,8 +20,8 @@
 #include <fstream>
 #include <sstream>
 
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
 
 int otbOssimElevManagerTest4(int argc, char* argv[])
 {