diff --git a/Code/Common/otbFilterWatcherBase.cxx b/Code/Common/otbFilterWatcherBase.cxx
index d7769d5daef0cedcae54f4a9ec9f4c474605388d..a85051f172a4e443e5c25805a97eac698f48975b 100644
--- a/Code/Common/otbFilterWatcherBase.cxx
+++ b/Code/Common/otbFilterWatcherBase.cxx
@@ -69,18 +69,7 @@ FilterWatcherBase
   // Remove any observers we have on the old process object
   if (m_Process)
   {
-    if (m_StartFilterCommand)
-    {
-      m_Process->RemoveObserver(m_StartTag);
-    }
-    if (m_EndFilterCommand)
-    {
-      m_Process->RemoveObserver(m_EndTag);
-    }
-    if (m_ProgressFilterCommand)
-    {
-      m_Process->RemoveObserver(m_ProgressTag);
-    }
+  m_Process->RemoveAllObservers(); 
   }
 
   // Initialize state
@@ -122,18 +111,7 @@ FilterWatcherBase
   // Remove any observers we have on the old process object
   if (m_Process)
   {
-    if (m_StartFilterCommand)
-    {
-      m_Process->RemoveObserver(m_StartTag);
-    }
-    if (m_EndFilterCommand)
-    {
-      m_Process->RemoveObserver(m_EndTag);
-    }
-    if (m_ProgressFilterCommand)
-    {
-      m_Process->RemoveObserver(m_ProgressTag);
-    }
+  m_Process->RemoveAllObservers(); 
   }
 
   // Initialize state
@@ -173,19 +151,8 @@ FilterWatcherBase
 {
   // Remove any observers we have on the old process object
   if (m_Process)
-  {
-    if (m_StartFilterCommand)
-    {
-      m_Process->RemoveObserver(m_StartTag);
-    }
-    if (m_EndFilterCommand)
-    {
-      m_Process->RemoveObserver(m_EndTag);
-    }
-    if (m_ProgressFilterCommand)
-    {
-      m_Process->RemoveObserver(m_ProgressTag);
-    }
+  {   
+  m_Process->RemoveAllObservers();
   }
 }
 
diff --git a/Code/Visualization/otbRenderingFunction.h b/Code/Visualization/otbRenderingFunction.h
index f5b634d57002d755c26f74fbd130572f630587e9..2b2c358050c50540a90eb23d29a4f4cd14ad3940 100644
--- a/Code/Visualization/otbRenderingFunction.h
+++ b/Code/Visualization/otbRenderingFunction.h
@@ -115,6 +115,10 @@ public:
   {
     itkExceptionMacro(<<"Subclasses should override this method");
   }
+  virtual ParametersType GetParameters() const
+  {
+    itkExceptionMacro(<<"Subclasses should override this method");
+  }
 
   virtual void SetChannelList(std::vector<unsigned int>& /*channels*/)
   {
diff --git a/Examples/OBIA/ShapeAttributeComputation.cxx b/Examples/OBIA/ShapeAttributeComputation.cxx
index 3409517e448400c6876f0e3c41f2a34771b693eb..b8d94a8ab14fa5d371d0ed6392e67518f69fab3d 100644
--- a/Examples/OBIA/ShapeAttributeComputation.cxx
+++ b/Examples/OBIA/ShapeAttributeComputation.cxx
@@ -85,7 +85,7 @@ int main(int argc, char * argv[])
   // Here the \doxygen{itk}{ShapeLabelObject} type
   // is chosen in order to read some attribute related to the shape
   // of the objects (by opposition to the content of the object, with
-  // the \doxygen{itk}{StatisticsLabelObject).
+  // the \doxygen{itk}{StatisticsLabelObject}.
   //
   // Software Guide : EndLatex
 
@@ -127,7 +127,7 @@ int main(int argc, char * argv[])
 
   //  Software Guide : BeginLatex
   //
-  // Then, we can read the attribute values we're interested in. The \doxygen{itk}{BinaryImageToShapeLabelMapFilter
+  // Then, we can read the attribute values we're interested in. The \doxygen{itk}{BinaryImageToShapeLabelMapFilter}
   // produce consecutive labels, so we can use a for loop and GetLabelObject() method to retrieve
   // the label objects. If the labels are not consecutive, the GetNthLabelObject() method must be
   // use instead of GetLabelObject(), or an iterator on the label
@@ -153,3 +153,4 @@ int main(int argc, char * argv[])
 
   return EXIT_SUCCESS;
 }       
+
diff --git a/Examples/Projections/EstimateRPCSensorModelExample.cxx b/Examples/Projections/EstimateRPCSensorModelExample.cxx
index 7e750ebf70bd17876d24933b9daa009c15358520..9d6fce988a13a5bfc8ec7a0f997728246fe7c2c4 100644
--- a/Examples/Projections/EstimateRPCSensorModelExample.cxx
+++ b/Examples/Projections/EstimateRPCSensorModelExample.cxx
@@ -37,7 +37,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-//#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
@@ -91,7 +90,7 @@ int main( int argc, char* argv[] )
   
   // Software Guide : BeginLatex
   // We retrieve the command line parameters and put them in the
-  // correct variables. Firstl, We determine the number of GCPs 
+  // correct variables. Firstly, We determine the number of GCPs 
   // set from the command line parameters and they are stored in:
   // \begin{itemize}
   // \item \doxygen{otb}{Point3DType} : Store the sensor point (3D ground point)
@@ -103,11 +102,12 @@ int main( int argc, char* argv[] )
   // \end{itemize}
   // Software Guide : EndLatex
 
-  // Software Guide : BeginCodeSnippet
+  
   unsigned int nbGCPs = (argc-3)/5;
   
   std::cout<<"Receiving "<<nbGCPs<<" from command line."<<std::endl;
   
+  // Software Guide : BeginCodeSnippet
   for(unsigned int gcpId = 0;gcpId<nbGCPs;++gcpId)
     {
     Point2DType sensorPoint;
@@ -123,6 +123,8 @@ int main( int argc, char* argv[] )
 
     rpcEstimator->AddGCP(sensorPoint,geoPoint);
     }
+  
+  // Software Guide : EndCodeSnippet
 
   // Software Guide : BeginLatex
   // Note that the \doxygen{otb}{GCPsToRPCSensorModelImageFilter} needs 
diff --git a/Testing/Fa/CMakeLists.txt b/Testing/Fa/CMakeLists.txt
index 5ab0f97292423f4af96ae4bfec9b69c1b1de38d7..74cce0766a2209715fd3d7f7e255a8a03b069614 100644
--- a/Testing/Fa/CMakeLists.txt
+++ b/Testing/Fa/CMakeLists.txt
@@ -244,7 +244,7 @@ TARGET_LINK_LIBRARIES(0000041-mean_shift OTBIO OTBCommon OTBBasicFilters)
 
 IF(OTB_USE_VISU_GUI)
 ADD_EXECUTABLE(0000132-jpg 0000132-jpg.cxx )
-TARGET_LINK_LIBRARIES(0000132-jpg OTBIO OTBVisu)
+TARGET_LINK_LIBRARIES(0000132-jpg OTBIO OTBVisualization)
 ENDIF(OTB_USE_VISU_GUI)
 
 ADD_EXECUTABLE(PolygonsVectorization PolygonsVectorization.cxx)
diff --git a/Utilities/otbossimplugins/CMakeLists.txt b/Utilities/otbossimplugins/CMakeLists.txt
index 29fd08825b0f5d53fddfc9835c2c611d957aff51..b1459c991266455101679a87b948872fdd8d3b84 100644
--- a/Utilities/otbossimplugins/CMakeLists.txt
+++ b/Utilities/otbossimplugins/CMakeLists.txt
@@ -4,7 +4,9 @@ SET(ossimplugins_VERSION_MAJOR "1")
 SET(ossimplugins_VERSION_MINOR "7")
 SET(ossimplugins_VERSION_PATCH "15")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ossim ${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} 
+${CMAKE_CURRENT_SOURCE_DIR}/ossim 
+#${CMAKE_CURRENT_SOURCE_DIR}/ossim/otb
 ${OTB_SOURCE_DIR}/Utilities/otbossim/include
 ${OTB_BINARY_DIR}/Utilities/otbossim/include
 # ${CMAKE_CURRENT_SOURCE_DIR}/../otbossim/include/ossim/projection
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.cpp
index 21304b5b330157cfa7718800c16b7ea375c53983..321bf9d18416ca056274925477fb5eb7c4b83b8e 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.cpp
@@ -48,7 +48,7 @@ std::istream& operator>>(std::istream& is, AntennaElevationPatterns& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1]; // avoid not used warning
 
 	is.read(buf12,12);
 	data._zero_doppler_time = buf12;
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.h
index 2b4fe1e999d42abc2e62b5e5fad36b5f866939be..36ac4fe544045c140e79b8608ca820656bd5b4dd 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/AntennaElevationPatterns.h
@@ -33,7 +33,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~AntennaElevationPatterns();
+  virtual ~AntennaElevationPatterns();
 
   /**
    * @brief This function writes the AntennaElevationPatterns in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.cpp
index 3697d9b8e2bb08dca90120577337698dccd89864..a2f1fa1827a000baccf765a87e41d0801f37f1f0 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.cpp
@@ -98,7 +98,7 @@ std::istream& operator>>(std::istream& is, ChirpParameters& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1]; // not used avoid warning
 
 	is.read(buf12,12);
 	data._zero_doppler_time = buf12;
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.h
index ac14a5fc85e22b86d260b75b6c43c0d36a4fe674..ec8ac89fd3c42120792db9f55d4b695ed09c3ec4 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/ChirpParameters.h
@@ -32,7 +32,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~ChirpParameters();
+  virtual ~ChirpParameters();
 
   /**
    * @brief This function writes the ChirpParameters in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.cpp
index baae112ef84e6429c2459877a224c6f33337f249..4b2b080185e3799a510e900ab35f6de86d70a4a1 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.cpp
@@ -90,7 +90,7 @@ std::istream& operator>>(std::istream& is, DopplerCentroidParameters& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1];  // Not used avoid warning
 
 	is.read(buf12,12);
 	data._zero_doppler_time = buf12;
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.h
index 2056664d4d7f6ff6bd1700da3843722d05052be4..78053b3a8f20f547edc493d956569776e655c91a 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/DopplerCentroidParameters.h
@@ -32,7 +32,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~DopplerCentroidParameters();
+  virtual ~DopplerCentroidParameters();
 
   /**
    * @brief This function writes the DopplerCentroidParameters in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/EnvisatAsarRecord.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/EnvisatAsarRecord.h
index 9b3d7938527373256e7ac9091e9a255c498ee146..e653bb85894f43b35557e94c403993dc54c43f9e 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/EnvisatAsarRecord.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/EnvisatAsarRecord.h
@@ -38,7 +38,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~EnvisatAsarRecord();
+  virtual ~EnvisatAsarRecord();
 
   /**
    * @brief Copy constructor
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.cpp
index 0d170085ef7dbbf8fad368ab65fc583df448e004..e12e7e169fbc655abdd7d81b35b27cad01b03bcd 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.cpp
@@ -106,7 +106,7 @@ std::istream& operator>>(std::istream& is, GeolocationGrid& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1]; // not used avoid warning
 
 	is.read((char*)&(data._first_zero_doppler_time_day),4);
 	data.SwitchEndian(data._first_zero_doppler_time_day);
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.h
index 2defefeeec0ab0bedb231c08c2e5ab27301356e5..cfa40992331a56780cbdf6e39a219d7436fb48e4 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/GeolocationGrid.h
@@ -32,7 +32,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~GeolocationGrid();
+  virtual ~GeolocationGrid();
 
   /**
    * @brief This function writes the GeolocationGrid in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.cpp
index 6f9a89798eabc986769142b87b4092da259861c7..673e739ce9f2483507b94cd29dd4dc9456fb3fb5 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.cpp
@@ -307,9 +307,9 @@ std::istream& operator>>(std::istream& is, MainProcessingParameters& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1]; // not used avoid warning
 
-	int * var_long;
+//	int * var_long; // not used avoid warning
 
 	is.read(buf12,12);
 	data._first_zero_doppler_time = buf12;
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.h
index c2f713fb41fd89d343b2801a86eab24083efd4ea..493eb095e4412b77153c2798b1f33791f352d2b3 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/MainProcessingParameters.h
@@ -33,7 +33,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~MainProcessingParameters();
+  virtual ~MainProcessingParameters();
 
   /**
    * @brief This function writes the MainProcessingParameters in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.cpp b/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.cpp
index 0c0add21e140630d84b99bf3735dee116f034714..23fdca14c152309405a10d797094c6547efd9cb6 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.cpp
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.cpp
@@ -145,7 +145,7 @@ std::istream& operator>>(std::istream& is, SQ_ADSR& data)
 	buf3[3] = '\0';
 	char buf2[3];
 	buf2[2] = '\0';
-	char buf1[1];
+//	char buf1[1]; // not used avoid warning
 
 	is.read(buf12,12);
 	data._zero_doppler_time = buf12;
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.h
index a71c295d8a72654dbb131ede934771fdf61690f1..5b449c94190fe8f8cf5c3b23237d7e676c269f17 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/SQ_ADSR.h
@@ -32,7 +32,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~SQ_ADSR();
+  virtual ~SQ_ADSR();
 
   /**
    * @brief This function write the SQ_ADSR in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/SRGRConversionParameters.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/SRGRConversionParameters.h
index beccd5f51783966a598be28db7da14c898c58128..f507cd63757f38de8d9bb2401469022db856a05c 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/SRGRConversionParameters.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/SRGRConversionParameters.h
@@ -33,7 +33,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~SRGRConversionParameters();
+  virtual ~SRGRConversionParameters();
 
   /**
    * @brief This function writes the SRGRConversionParameters in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/dsd.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/dsd.h
index ce7ca9aa15448d1e204ac161dd3946974c261e95..3ad04a15c19dd491e64a057f04dc09efdc50204d 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/dsd.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/dsd.h
@@ -32,7 +32,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~dsd();
+  virtual ~dsd();
 
   /**
    * @brief This function write the dsd in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/mph.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/mph.h
index c56e6aab658f6d185ee7d9e0e4ec6c543c4d22ea..fd021e300c68863b0253ff6a6dc0f2dd30494be3 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/mph.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/mph.h
@@ -33,7 +33,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~mph();
+  virtual ~mph();
 
   /**
    * @brief This function write the mph in a stream
diff --git a/Utilities/otbossimplugins/ossim/EnvisatAsar/sph.h b/Utilities/otbossimplugins/ossim/EnvisatAsar/sph.h
index 19b45a85006fc6cc2c6cc0b06d7da1dbe3377741..66a621a6acddec4f1ac06b4f0774f72c95914652 100644
--- a/Utilities/otbossimplugins/ossim/EnvisatAsar/sph.h
+++ b/Utilities/otbossimplugins/ossim/EnvisatAsar/sph.h
@@ -39,7 +39,7 @@ public:
   /**
    * @brief Destructor
    */
-  ~sph();
+  virtual ~sph();
 
   /**
    * @brief This function write the sph in a stream
diff --git a/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
index 62468d391728f94f874248eaa3265f64c0092aa3..400a488320ed1d6f0ecb07a98a45d477ac9dbbce 100644
--- a/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/CivilDateTime.cpp
@@ -9,10 +9,10 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <JulianDate.h>
-#include <CivilDateTime.h>
-#include <JSDDateTime.h>
-#include <GMSTDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JSDDateTime.h>
+#include <otb/GMSTDateTime.h>
 
 #include <cmath>
 #include <cstring>
diff --git a/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp b/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
index 00ea2ee48f3a1e97d555c4cc6fc02b441a7b117c..9716545bf11ac2fc50a9b97639a8ef6b87d98fc4 100644
--- a/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Coordinate.cpp
@@ -10,7 +10,7 @@
 // $Id$
 
 
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp b/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
index dad0ee288ba0d291d756f571f30db4995d6fa91c..84b2be94d90e3fdb3da3e26c8ffcd162445c602e 100644
--- a/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Ephemeris.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
 #include <ossim/base/ossimDpt3d.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
index 95ecd86ce8d37bc0b34685e8d694e36e0833e0b3..8f1060fabf955e865f3f1925d7e36cd21a8dac11 100644
--- a/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/Ephemeris.h
@@ -12,7 +12,7 @@
 #ifndef Ephemeride_h
 #define Ephemeride_h
 
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
 
 class ossimKeywordlist;
 
diff --git a/Utilities/otbossimplugins/ossim/otb/Equation.cpp b/Utilities/otbossimplugins/ossim/otb/Equation.cpp
index 511457e8767d87b855702cd26bc0d7ab184094ba..10249b248f1fe7896eda4737c020a9ce966a9a3c 100644
--- a/Utilities/otbossimplugins/ossim/otb/Equation.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Equation.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <Equation.h>
+#include <otb/Equation.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
index e293e7aeef06b6ae9c8bf01824fd8ca6e2de7f2c..a67b1707e26df7265f74af3dcf7f7858213bbe30 100644
--- a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.cpp
@@ -9,8 +9,8 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <GMSTDateTime.h>
-#include <CivilDateTime.h>
+#include <otb/GMSTDateTime.h>
+#include <otb/CivilDateTime.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
index a6a3abee29e1091bb2c87ed36ffbfe633a93a4ef..046d5ba36499a2fddfbae1ad6174db4d77692d3e 100644
--- a/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
+++ b/Utilities/otbossimplugins/ossim/otb/GMSTDateTime.h
@@ -11,7 +11,7 @@
 
 #ifndef GMSTDateTime_h
 #define GMSTDateTime_h
-#include <JulianDate.h>
+#include <otb/JulianDate.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
index 0564aaebbf98eb1409cd0b8b048b3e8249a623d5..3d585bdc32307562e1e4959ad4287476899a97f1 100644
--- a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.cpp
@@ -9,10 +9,10 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <GalileanEphemeris.h>
-#include <GeographicEphemeris.h>
+#include <otb/GalileanEphemeris.h>
+#include <otb/GeographicEphemeris.h>
 
-#include <GMSTDateTime.h>
+#include <otb/GMSTDateTime.h>
 
 #include <cmath>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
index f88b0c33b60e8828f7c907608771e6d75c95fad7..363b3db2fe0ac21eddf18b2a9976b13acea8ec66 100644
--- a/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GalileanEphemeris.h
@@ -12,7 +12,7 @@
 #ifndef GalileanEphemeride_h
 #define GalileanEphemeride_h
 
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
index d76fd9eabd58a145a7e0d4aae0e0fbb43f509ed4..3a2c66218c1dc7cc24bd2911528129a0d2b06815 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <GeodesicCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
index 40b64fe8173245e62a5365b15aa7449dd210f1e7..f4eef06a855c55fe4b8ffbf38ab7c4032db4ea68 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
+++ b/Utilities/otbossimplugins/ossim/otb/GeodesicCoordinate.h
@@ -12,7 +12,7 @@
 #ifndef GeodesicCoordinate_h
 #define GeodesicCoordinate_h
 
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
index 7ce121f3fb0998d87d8cec79a72164425a7053f8..1274dd12df32ced4d8a250ab0cf04784eab22763 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.cpp
@@ -9,10 +9,10 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <GeographicEphemeris.h>
-#include <GalileanEphemeris.h>
+#include <otb/GeographicEphemeris.h>
+#include <otb/GalileanEphemeris.h>
 
-#include <GMSTDateTime.h>
+#include <otb/GMSTDateTime.h>
 
 #include <cmath>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
index 2776e6080b67b8910a89702770a31e57c20089e1..7575ff8c3a32f175c8bda112e24e41033ab7e98e 100644
--- a/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
+++ b/Utilities/otbossimplugins/ossim/otb/GeographicEphemeris.h
@@ -12,7 +12,7 @@
 #ifndef GeographicEphemeride_h
 #define GeographicEphemeride_h
 
-#include <Ephemeris.h>
+#include <otb/Ephemeris.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
index 6899b483167c08b145ebca451770c5c573c8a3cc..b0eef0007c0f9a634b3de3fe22341ecb8a3ab59d 100644
--- a/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/HermiteInterpolator.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <HermiteInterpolator.h>
+#include <otb/HermiteInterpolator.h>
 
 #include <string>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp b/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
index b4cfd6a6dc2a5d90fcdc56a5350b6432aaa22ed2..7a398f3e26c558743119cebeda9244637689643a 100644
--- a/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/ImageNoise.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <ImageNoise.h>
+#include <otb/ImageNoise.h>
 #include <ossim/base/ossimDpt3d.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
index f81c6181d71f9017845c4387d91d5fae64f2af38..34d8d5557eea981600d6f1020cc0faae470240d5 100644
--- a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <IncidenceAngles.h>
+#include <otb/IncidenceAngles.h>
 #include <ossim/base/ossimDpt3d.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
index 9e0dac19f2cf4aaaf489c5982cdfb5b18b5b19ef..d204fc10f7032f65fda1441b73619c29a32723fd 100644
--- a/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
+++ b/Utilities/otbossimplugins/ossim/otb/IncidenceAngles.h
@@ -12,7 +12,7 @@
 #ifndef IncidenceAngles_h
 #define IncidenceAngles_h
 
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
 #include <otb/InfoIncidenceAngle.h>
 #include <ossim/base/ossimConstants.h>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp b/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
index 2c0648617cd47a61843475f7d0878a2188f4f546..a391af906d3b586446d2443013e1a4a2bdb8c4b0 100644
--- a/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/InfoIncidenceAngle.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <InfoIncidenceAngle.h>
+#include <otb/InfoIncidenceAngle.h>
 #include <ossim/base/ossimDpt3d.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
index b73f97576c247a4a9f717e82879c68b87af503f6..a17eb926e072e625e52363fa7c47d06a47a92b2a 100644
--- a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.cpp
@@ -9,12 +9,12 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <JSDDateTime.h>
-#include <CivilDateTime.h>
-#include <JulianDate.h>
-#include <GMSTDateTime.h>
+#include <otb/JSDDateTime.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/GMSTDateTime.h>
 
-#include <Arithmetic.h>
+#include <otb/Arithmetic.h>
 
 #include <cmath>
 #include <cstring>
diff --git a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
index ce134cf55864af3492345256b3a3d6507d019e30..8f2c001c3f7b361342904570efa9657958e3dd48 100644
--- a/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
+++ b/Utilities/otbossimplugins/ossim/otb/JSDDateTime.h
@@ -11,8 +11,8 @@
 
 #ifndef JSDDateTime_h
 #define JSDDateTime_h
-#include <JulianDate.h>
-#include <MJDDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/MJDDateTime.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp b/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
index edd3f095fed3617083028ab889de69c002676e1d..9a061a6358e199fa9eb34abda5dcbcf7e2a72f9f 100644
--- a/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/JulianDate.cpp
@@ -9,10 +9,10 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <CivilDateTime.h>
-#include <JulianDate.h>
-#include <JSDDateTime.h>
-#include <GMSTDateTime.h>
+#include <otb/CivilDateTime.h>
+#include <otb/JulianDate.h>
+#include <otb/JSDDateTime.h>
+#include <otb/GMSTDateTime.h>
 
 
 #include <cmath>
diff --git a/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp b/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
index f762e8a5253aa030bf26663ac09053a340ec0d16..334fb2f67af78b0bbd600d97c699ee4ef78e346e 100644
--- a/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/MJDDateTime.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <MJDDateTime.h>
+#include <otb/MJDDateTime.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/Noise.cpp b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
index ea12fa0d26dd7931cd2a2c884cf93db70027dd1c..991900e14c2c40d748314e5c0b910346b8a093ed 100644
--- a/Utilities/otbossimplugins/ossim/otb/Noise.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Noise.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <Noise.h>
+#include <otb/Noise.h>
 #include <ossim/base/ossimDpt3d.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimNotify.h>
diff --git a/Utilities/otbossimplugins/ossim/otb/Noise.h b/Utilities/otbossimplugins/ossim/otb/Noise.h
index f6d6ff303b74e55b65e393a7102c37ea5f214eef..cf0fc644a2f15d782960efcfebe87161000a7467 100644
--- a/Utilities/otbossimplugins/ossim/otb/Noise.h
+++ b/Utilities/otbossimplugins/ossim/otb/Noise.h
@@ -12,7 +12,7 @@
 #ifndef Noise_h
 #define Noise_h
 
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
 #include <otb/ImageNoise.h>
 #include <ossim/base/ossimConstants.h>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
index 242f5fa08b95d510379f8d60addd456f2a27c503..22fa9c7e3c58848db739013ec6d77ac53f5982af 100644
--- a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.cpp
@@ -10,9 +10,9 @@
 // $Id$
 
 
-#include <PlatformPosition.h>
-#include <Ephemeris.h>
-#include <HermiteInterpolator.h>
+#include <otb/PlatformPosition.h>
+#include <otb/Ephemeris.h>
+#include <otb/HermiteInterpolator.h>
 #include <ossim/base/ossimKeywordlist.h>
 
 #include <iostream>
diff --git a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
index 5fb5f829421240aefea947db7f2a6efcecbc3961..a557c050790bd09cf8ef9e206e3e59c138a2ce5e 100644
--- a/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
+++ b/Utilities/otbossimplugins/ossim/otb/PlatformPosition.h
@@ -12,7 +12,7 @@
 #ifndef PlatformPosition_h
 #define PlatformPosition_h
 
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
 
 class ossimKeywordlist;
 
diff --git a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
index 74d944c4a3f6389fd8b9aa32876015bec0ec7ee6..0000aa0be49bad34de1bf5ff6b865800362c059a 100644
--- a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.cpp
@@ -9,8 +9,8 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <RectangularCoordinate.h>
-#include <GeodesicCoordinate.h>
+#include <otb/RectangularCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
 
 #include <cmath>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
index 4b7c2162b908027971495df1f4e764ae593f5b48..840b80b5c8f767b2dc5c40c0f4be26411c030fcd 100644
--- a/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
+++ b/Utilities/otbossimplugins/ossim/otb/RectangularCoordinate.h
@@ -12,7 +12,7 @@
 #ifndef RectangularCoordinate_h
 #define RectangularCoordinate_h
 
-#include <Coordinate.h>
+#include <otb/Coordinate.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp b/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
index abe9e52352c2347393dcfb15f0000e126e57a9be..10ff3817982a3c5e86d9f56d2b430feed676fafa 100644
--- a/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/RefPoint.cpp
@@ -9,8 +9,8 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <RefPoint.h>
-#include <Ephemeris.h>
+#include <otb/RefPoint.h>
+#include <otb/Ephemeris.h>
 #include <cstring>
 #include <ossim/base/ossimKeywordlist.h>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp b/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
index 8aebed47065d4060e4cae9b246597a2483deb2f7..8c29d1f782a36c6f9dbc299d119e7860ba323884 100644
--- a/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/SarSensor.cpp
@@ -9,16 +9,16 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <SarSensor.h>
-#include <JSDDateTime.h>
-#include <Ephemeris.h>
-#include <GeographicEphemeris.h>
-#include <Sensor.h>
-#include <SensorParams.h>
-#include <PlatformPosition.h>
-#include <Equation.h>
-#include <RectangularCoordinate.h>
-#include <GeodesicCoordinate.h>
+#include <otb/SarSensor.h>
+#include <otb/JSDDateTime.h>
+#include <otb/Ephemeris.h>
+#include <otb/GeographicEphemeris.h>
+#include <otb/Sensor.h>
+#include <otb/SensorParams.h>
+#include <otb/PlatformPosition.h>
+#include <otb/Equation.h>
+#include <otb/RectangularCoordinate.h>
+#include <otb/GeodesicCoordinate.h>
 #include <complex>
 
 namespace ossimplugins
diff --git a/Utilities/otbossimplugins/ossim/otb/SarSensor.h b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
index 1ca778e2568a76973970f24cf61ed4b370dcf3d1..28dc42c7b5e2da0419b197b82b311b3f135e97bb 100644
--- a/Utilities/otbossimplugins/ossim/otb/SarSensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/SarSensor.h
@@ -12,7 +12,7 @@
 #ifndef SarSensor_h
 #define SarSensor_h
 
-#include <Sensor.h>
+#include <otb/Sensor.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/Sensor.cpp b/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
index 6e676c7a92aee5c41b712e54bf0a3e339e2811ff..433b7e7fb81768d5916da56ef87261228decbe82 100644
--- a/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/Sensor.cpp
@@ -9,9 +9,9 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <Sensor.h>
-#include <SensorParams.h>
-#include <PlatformPosition.h>
+#include <otb/Sensor.h>
+#include <otb/SensorParams.h>
+#include <otb/PlatformPosition.h>
 
 #include <cstring>
 
diff --git a/Utilities/otbossimplugins/ossim/otb/Sensor.h b/Utilities/otbossimplugins/ossim/otb/Sensor.h
index 1f3a1d2291912ffdb9f887b814fcbde1b755482f..f76e6fb4f32ef5debbffd46c51a7c4121f273f53 100644
--- a/Utilities/otbossimplugins/ossim/otb/Sensor.h
+++ b/Utilities/otbossimplugins/ossim/otb/Sensor.h
@@ -12,7 +12,7 @@
 #ifndef Services_h
 #define Services_h
 
-#include <JSDDateTime.h>
+#include <otb/JSDDateTime.h>
 
 namespace ossimplugins
 {
diff --git a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
index 37c2df41783b187851808c58d6d83f533e304cbe..0f924fd67940c151bd02a5d2e74e23958a048d42 100644
--- a/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
+++ b/Utilities/otbossimplugins/ossim/otb/SensorParams.cpp
@@ -9,7 +9,7 @@
 //----------------------------------------------------------------------------
 // $Id$
 
-#include <SensorParams.h>
+#include <otb/SensorParams.h>
 #include <ossim/base/ossimKeywordlist.h>
 #include <ossim/base/ossimString.h>
 
diff --git a/otbIncludeDirectories.cmake b/otbIncludeDirectories.cmake
index 98fe0a733a26619791a670589d6f2ed242ee1bf1..594f5bb6c05cf0d07ba2845c1bba2ea4c8c27c33 100644
--- a/otbIncludeDirectories.cmake
+++ b/otbIncludeDirectories.cmake
@@ -56,7 +56,7 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
 #   ${OTB_SOURCE_DIR}/Utilities/otbossim/include/ossim/projection
 # Add otbossimplugins/ossim/otb into the include directories path
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
-  ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim/otb
+#  ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim/otb
   ${OTB_SOURCE_DIR}/Utilities/dxflib
   ${OTB_SOURCE_DIR}/Utilities/InsightJournal
   ${OTB_SOURCE_DIR}/Utilities/otb6S