diff --git a/Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx b/Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx
index 332c8c19951449a2e3dc1de09218fdcb53614d68..20d88ae15a66ddbda86c3fe354f37ff69f38dbc4 100644
--- a/Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx
+++ b/Applications/CartographicDBValidation/otbComputePolylineFeatureFromImage.cxx
@@ -19,17 +19,14 @@
 
 #include "otbVectorImage.h"
 
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 #include "itkPreOrderTreeIterator.h"
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
-#include "otbVectorDataProjectionFilter.h"
 #include "otbVectorDataTransformFilter.h"
 #include "itkAffineTransform.h"
 
diff --git a/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx b/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx
index 6e2cb6899ff2c67ebed3bafe27b199ee3065dbea..e2920b37e747f99cb4353b4b9ee5f2268a2456f0 100644
--- a/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx
+++ b/Applications/CartographicDBValidation/otbDSFuzzyModelEstimation.cxx
@@ -21,13 +21,10 @@
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperStringListParameter.h"
-#include "otbVectorData.h"
 #include "otbImageToEnvelopeVectorDataFilter.h"
 #include "otbVectorDataToRandomLineGenerator.h"
 #include "itkAmoebaOptimizer.h"
-#include "otbVectorDataToDSValidatedVectorDataFilter.h"
 #include "otbStandardDSCostFunction.h"
-#include "otbFuzzyDescriptorsModelManager.h"
 
 
 namespace otb
diff --git a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
index bdba23634719f23dc9e9428f81ce9541d312db37..25eab600f3dcd631fca35f8aa212bb483d9c35b0 100644
--- a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
+++ b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
@@ -21,7 +21,6 @@
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperStringListParameter.h"
 
-#include "otbVectorData.h"
 #include "otbFuzzyDescriptorsModelManager.h"
 
 
diff --git a/Applications/Classification/otbComputeConfusionMatrix.cxx b/Applications/Classification/otbComputeConfusionMatrix.cxx
index 1912f50acf32bb01a3b64692031f5c54c9c26242..ffaafbaabf36e88466df55cdce42908091081f94 100644
--- a/Applications/Classification/otbComputeConfusionMatrix.cxx
+++ b/Applications/Classification/otbComputeConfusionMatrix.cxx
@@ -21,12 +21,10 @@
 
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "itkImageRegionConstIterator.h"
-#include "otbOGRDataSourceWrapper.h"
 
 #include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 
-#include "itkVariableSizeMatrix.h"
 
 #include "otbConfusionMatrixMeasurements.h"
 
diff --git a/Applications/Classification/otbFusionOfClassifications.cxx b/Applications/Classification/otbFusionOfClassifications.cxx
index e4328d6fd5d43f967feafce7ea59a5f5718f87e5..7b9b62c7c601dabf4fc3b94ce5ef9731bab00fc3 100644
--- a/Applications/Classification/otbFusionOfClassifications.cxx
+++ b/Applications/Classification/otbFusionOfClassifications.cxx
@@ -27,7 +27,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageList.h"
 
diff --git a/Applications/Classification/otbImageClassifier.cxx b/Applications/Classification/otbImageClassifier.cxx
index 11a75f90a9cd12abe58410a84817e32f64329860..07a8a352d7622e29bed60592a69fed040ad53a8c 100644
--- a/Applications/Classification/otbImageClassifier.cxx
+++ b/Applications/Classification/otbImageClassifier.cxx
@@ -18,7 +18,6 @@
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
-#include "itkVariableLengthVector.h"
 #include "otbChangeLabelImageFilter.h"
 #include "otbStandardWriterWatcher.h"
 #include "otbStatisticsXMLFileReader.h"
diff --git a/Applications/Classification/otbKMeansClassification.cxx b/Applications/Classification/otbKMeansClassification.cxx
index 072956b9afb54491d8388bd736fdda0c4ba1a07e..633eec8e8c4a283f456c8938bb258a2a0b97a508 100644
--- a/Applications/Classification/otbKMeansClassification.cxx
+++ b/Applications/Classification/otbKMeansClassification.cxx
@@ -19,9 +19,7 @@
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
-#include "itkMersenneTwisterRandomVariateGenerator.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "itkEuclideanDistanceMetric.h"
 #include "otbStreamingTraits.h"
 #include "itkImageRegionConstIterator.h"
@@ -29,7 +27,6 @@
 #include "itkWeightedCentroidKdTreeGenerator.h"
 #include "itkKdTreeBasedKmeansEstimator.h"
 #include "otbStreamingShrinkImageFilter.h"
-#include "itkUnaryFunctorImageFilter.h"
 #include "otbChangeLabelImageFilter.h"
 #include "otbRAMDrivenStrippedStreamingManager.h"
 
@@ -37,7 +34,6 @@
 #include "itkLabelToRGBImageFilter.h"
 #include "otbReliefColormapFunctor.h"
 #include "itkScalarToRGBColormapImageFilter.h"
-#include "otbWrapperTypes.h"
 
 
 namespace otb
diff --git a/Applications/Classification/otbSOMClassification.cxx b/Applications/Classification/otbSOMClassification.cxx
index 5f4bebfa4f88a5ff49a18dcc7f34a64e3cac20f7..2357708832d24393b075adc3d7889d9f6cc49356 100644
--- a/Applications/Classification/otbSOMClassification.cxx
+++ b/Applications/Classification/otbSOMClassification.cxx
@@ -21,7 +21,6 @@
 #include "otbSOMMap.h"
 #include "otbSOM.h"
 #include "otbSOMImageClassificationFilter.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Applications/Classification/otbTrainImagesClassifier.h b/Applications/Classification/otbTrainImagesClassifier.h
index 0f94d9f0211842844dca03c78243773e4ec02d0f..1c723ddbd88ae997db1a833dce27a896ce86a6ab 100644
--- a/Applications/Classification/otbTrainImagesClassifier.h
+++ b/Applications/Classification/otbTrainImagesClassifier.h
@@ -15,22 +15,18 @@
 
  =========================================================================*/
 
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include <iostream>
 #include "otbConfigurationFile.h"
 
 //Image
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbVectorData.h"
 #include "otbListSampleGenerator.h"
 
 // ListSample
-#include "itkListSample.h"
 #include "itkVariableLengthVector.h"
-#include "itkFixedArray.h"
 
 //Estimator
 #include "otbMachineLearningModelFactory.h"
@@ -67,7 +63,6 @@
 #include "otbListSampleToBalancedListSampleFilter.h"
 
 // VectorData projection filter
-#include "otbVectorDataProjectionFilter.h"
 
 // Extract a ROI of the vectordata
 #include "otbVectorDataIntoImageProjectionFilter.h"
diff --git a/Applications/DisparityMap/otbBlockMatching.cxx b/Applications/DisparityMap/otbBlockMatching.cxx
index 5f2bc6c2142b6038f86eef4e20cc903816ef5fba..51fcada2b68dad2b797b2d02f10e4edae4980dfa 100644
--- a/Applications/DisparityMap/otbBlockMatching.cxx
+++ b/Applications/DisparityMap/otbBlockMatching.cxx
@@ -18,7 +18,6 @@
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
-#include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "otbVarianceImageFilter.h"
 #include "otbBandMathImageFilter.h"
 #include "otbImageList.h"
diff --git a/Applications/DisparityMap/otbDisparityMapToElevationMap.cxx b/Applications/DisparityMap/otbDisparityMapToElevationMap.cxx
index 93c4c7ef7aab02c179a4f7a813abb475c257a40f..76d6e67ddc6179b35022828b5d6682dfd008e2ff 100644
--- a/Applications/DisparityMap/otbDisparityMapToElevationMap.cxx
+++ b/Applications/DisparityMap/otbDisparityMapToElevationMap.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbDisparityMapToDEMFilter.h"
diff --git a/Applications/DisparityMap/otbGeneratePlyFile.cxx b/Applications/DisparityMap/otbGeneratePlyFile.cxx
index 12fc7ad415bb56cef11f47c4c22c7a4717a99ad6..c6422776ea8dbed59195c0bc595bbe49e8dd5954 100644
--- a/Applications/DisparityMap/otbGeneratePlyFile.cxx
+++ b/Applications/DisparityMap/otbGeneratePlyFile.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Applications/DisparityMap/otbStereoFramework.cxx b/Applications/DisparityMap/otbStereoFramework.cxx
index c54eb137e61ec19a9b952f68838a14b16a2df960..b6aadd14461465b159c3502215d6602044074f82 100644
--- a/Applications/DisparityMap/otbStereoFramework.cxx
+++ b/Applications/DisparityMap/otbStereoFramework.cxx
@@ -15,12 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbStereorectificationDisplacementFieldSource.h"
 #include "otbStreamingWarpImageFilter.h"
-#include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "otbBandMathImageFilter.h"
 #include "otbSubPixelDisparityImageFilter.h"
 #include "otbDisparityMapMedianFilter.h"
diff --git a/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx b/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx
index 3687ca1b72ed5b4eab862a91e8838aaa0ac270bb..a54476c5f05216024f927d45e1e204d840e00089 100644
--- a/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx
+++ b/Applications/DisparityMap/otbStereoRectificationGridGenerator.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbStereorectificationDisplacementFieldSource.h"
diff --git a/Applications/FeatureExtraction/otbDimensionalityReduction.cxx b/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
index 0e9dffd039fb16778197778f6a35335ee98d22ef..e9202bf238bbd94401dbd7fecec67b2ddf3090f9 100644
--- a/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
+++ b/Applications/FeatureExtraction/otbDimensionalityReduction.cxx
@@ -19,15 +19,12 @@
 #include "otbWrapperApplicationFactory.h"
 
 
-#include "itkImageToImageFilter.h"
 
 #include "otbMaximumAutocorrelationFactorImageFilter.h"
-#include "otbPCAImageFilter.h"
 #include "otbNAPCAImageFilter.h"
 #include "otbLocalActivityVectorImageFilter.h"
 #include "otbMaximumAutocorrelationFactorImageFilter.h"
 #include "otbFastICAImageFilter.h"
-#include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 //#include "otbVirtualDimensionality.h"
 
diff --git a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
index 9dc5286dd02232e4072184192fd3f977a8aca86d..c4617c143f17a101d5e3f829a30cf8f5f89e0efe 100644
--- a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
+++ b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 // Elevation handler
@@ -31,7 +30,6 @@
 #include "otbMultiToMonoChannelExtractROI.h"
 #include "otbKeyPointSetsMatchingFilter.h"
 
-#include "itkPointSet.h"
 #include "itkEuclideanDistanceMetric.h"
 #include "otbGenericRSTransform.h"
 #include "otbOGRDataSourceWrapper.h"
diff --git a/Applications/FeatureExtraction/otbLineSegmentDetection.cxx b/Applications/FeatureExtraction/otbLineSegmentDetection.cxx
index f26538ecb980e1b584db5efaa6fb425856aabfe7..03a3360a0061279f0d8d25efdb778944d6b2ccf9 100644
--- a/Applications/FeatureExtraction/otbLineSegmentDetection.cxx
+++ b/Applications/FeatureExtraction/otbLineSegmentDetection.cxx
@@ -15,13 +15,11 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbStreamingLineSegmentDetector.h"
 
 #include "otbVectorImageToAmplitudeImageFilter.h"
-#include "otbVectorData.h"
 #include "otbStreamingStatisticsImageFilter.h"
 #include "itkShiftScaleImageFilter.h"
 
diff --git a/Applications/FeatureExtraction/otbRadiometricIndices.cxx b/Applications/FeatureExtraction/otbRadiometricIndices.cxx
index a046fcbf0b27f9322ac858d82c5959c3ff6d9901..46ae1737eb9077caa39c9e9b389c2d4a75b26ff0 100644
--- a/Applications/FeatureExtraction/otbRadiometricIndices.cxx
+++ b/Applications/FeatureExtraction/otbRadiometricIndices.cxx
@@ -24,7 +24,6 @@
 #include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
 #include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
 #include "otbWaterIndicesFunctor.h"
-#include "otbSoilIndicesFunctor.h"
 #include "otbBuiltUpIndicesFunctor.h"
 
 #include "otbImageList.h"
diff --git a/Applications/Fusion/otbPansharpening.cxx b/Applications/Fusion/otbPansharpening.cxx
index b994acfa56dce27874abb413957240dff70242a2..d12482eb5e89eaca3ed82746b4061aab491fc87a 100644
--- a/Applications/Fusion/otbPansharpening.cxx
+++ b/Applications/Fusion/otbPansharpening.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "itkVectorIndexSelectionCastImageFilter.h"
diff --git a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
index 41f9305980a8c4e3bbdfb693ce73cbc0d7a43ab0..3d941c9c57027fc1ffd7385cadd14f7045686819 100644
--- a/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
+++ b/Applications/Hyperspectral/otbHyperspectralUnmixing.cxx
@@ -25,7 +25,6 @@
 //#include "otbFCLSUnmixingImageFilter.h"
 #include "otbMDMDNMFImageFilter.h"
 
-#include "otbVectorImageToMatrixImageFilter.h"
 
 namespace otb
 {
diff --git a/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx b/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
index 06682589290d6c73b28d90795dabe565d2c1e054..34a521e47d32831d114c5c3404d09bea832d4f91 100644
--- a/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
+++ b/Applications/Hyperspectral/otbVertexComponentAnalysis.cxx
@@ -19,7 +19,6 @@
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbVcaImageFilter.h"
-#include "otbVectorImageToMatrixImageFilter.h"
 
 namespace otb
 {
diff --git a/Applications/Projections/otbBundleToPerfectSensor.cxx b/Applications/Projections/otbBundleToPerfectSensor.cxx
index f1140a59e4b37f8b165983a0be2b7fb7dc881ff2..d6258105571cd9d5e7b6c517761fe8a0863ba1c9 100644
--- a/Applications/Projections/otbBundleToPerfectSensor.cxx
+++ b/Applications/Projections/otbBundleToPerfectSensor.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbMultiToMonoChannelExtractROI.h"
@@ -27,7 +26,6 @@
 // Elevation handler
 #include "otbWrapperElevationParametersHandler.h"
 
-#include "otbStreamingResampleImageFilter.h"
 #include "otbPleiadesPToXSAffineTransformCalculator.h"
 
 namespace otb
diff --git a/Applications/Projections/otbConvertCartoToGeoPoint.cxx b/Applications/Projections/otbConvertCartoToGeoPoint.cxx
index fcff11957bfde81516a4aea712227d250fad0ff5..dfed5067597784ad16809fcb8609d24ae94f31c4 100644
--- a/Applications/Projections/otbConvertCartoToGeoPoint.cxx
+++ b/Applications/Projections/otbConvertCartoToGeoPoint.cxx
@@ -15,7 +15,6 @@
      PURPOSE,  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include <iostream>
@@ -25,7 +24,6 @@
 #include "otbWrapperMapProjectionParametersHandler.h"
 
 #include "otbImageToGenericRSOutputParameters.h"
-#include "otbGenericRSTransform.h"
 
 namespace otb
 {
diff --git a/Applications/Projections/otbConvertSensorToGeoPoint.cxx b/Applications/Projections/otbConvertSensorToGeoPoint.cxx
index 752a22c51a22ef5f69faea11201e44659ad27a6f..91efb2578febe9a2538e4269c58f254d3d5e25a2 100644
--- a/Applications/Projections/otbConvertSensorToGeoPoint.cxx
+++ b/Applications/Projections/otbConvertSensorToGeoPoint.cxx
@@ -20,7 +20,6 @@
 
 #include "otbForwardSensorModel.h"
 #include "otbCoordinateToName.h"
-#include "otbMacro.h"
 
 namespace otb
 {
diff --git a/Applications/Projections/otbGenerateRPCSensorModel.cxx b/Applications/Projections/otbGenerateRPCSensorModel.cxx
index 10667d508f44e9c4d780bc998d82d3afd93c4d02..1b02d7b34aa6ed0b43046f3a210b6b4d5ef5c8e5 100644
--- a/Applications/Projections/otbGenerateRPCSensorModel.cxx
+++ b/Applications/Projections/otbGenerateRPCSensorModel.cxx
@@ -16,14 +16,12 @@
 
   =========================================================================*/
 // Wrappers
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperChoiceParameter.h"
 #include "otbWrapperElevationParametersHandler.h"
 #include "otbWrapperMapProjectionParametersHandler.h"
 #include "otbSensorModelAdapter.h"
 #include "otbRPCSolverAdapter.h"
-#include "itkPoint.h"
 #include "itkEuclideanDistanceMetric.h"
 #include "otbGenericRSTransform.h"
 #include "otbOGRDataSourceWrapper.h"
diff --git a/Applications/Projections/otbImageEnvelope.cxx b/Applications/Projections/otbImageEnvelope.cxx
index 26823c26818bb4ad05523b21b2ddcec6898177b9..11653420aa7920e8f74b5d8d3d56078f245847dd 100644
--- a/Applications/Projections/otbImageEnvelope.cxx
+++ b/Applications/Projections/otbImageEnvelope.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbImageToEnvelopeVectorDataFilter.h"
diff --git a/Applications/Projections/otbOrthoRectification.cxx b/Applications/Projections/otbOrthoRectification.cxx
index f039cb2b2cc325cdbb90752a08ce80ef3b72874e..d513b589d23f0623aa2ec4aa6d69df39e0c05932 100644
--- a/Applications/Projections/otbOrthoRectification.cxx
+++ b/Applications/Projections/otbOrthoRectification.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperNumericalParameter.h"
 
diff --git a/Applications/Projections/otbRefineSensorModel.cxx b/Applications/Projections/otbRefineSensorModel.cxx
index b269b2b52c9f8959db12d1c7a586553e532d525f..08da67f43a751200dd520d1e038aa8fdcd6698a8 100644
--- a/Applications/Projections/otbRefineSensorModel.cxx
+++ b/Applications/Projections/otbRefineSensorModel.cxx
@@ -16,7 +16,6 @@
 
   =========================================================================*/
 // Wrappers
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperChoiceParameter.h"
 #include "otbWrapperElevationParametersHandler.h"
diff --git a/Applications/Projections/otbRigidTransformResample.cxx b/Applications/Projections/otbRigidTransformResample.cxx
index 91532f1164ab0942037fce07c078737567dbfc11..ff58fc136586d3f10a1025f4b2a69c52238b1897 100644
--- a/Applications/Projections/otbRigidTransformResample.cxx
+++ b/Applications/Projections/otbRigidTransformResample.cxx
@@ -18,7 +18,6 @@
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbBCOInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 
diff --git a/Applications/Projections/otbSuperimpose.cxx b/Applications/Projections/otbSuperimpose.cxx
index 15fe9cff34367f7060472727e3d56f7b903de221..15d74bd729ac9f05bd795d20eb9c6536e63746b9 100644
--- a/Applications/Projections/otbSuperimpose.cxx
+++ b/Applications/Projections/otbSuperimpose.cxx
@@ -15,18 +15,15 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbGenericRSResampleImageFilter.h"
 
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbBCOInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 
 // Elevation handler
 #include "otbWrapperElevationParametersHandler.h"
-#include "otbStreamingResampleImageFilter.h"
 #include "otbPleiadesPToXSAffineTransformCalculator.h"
 
 namespace otb
diff --git a/Applications/Projections/otbVectorDataReprojection.cxx b/Applications/Projections/otbVectorDataReprojection.cxx
index 9df45149b32e439fa7558b437abb70f261716ccd..7e7a7d8a82c2fcf36365a50d7493e33c2759eb5f 100644
--- a/Applications/Projections/otbVectorDataReprojection.cxx
+++ b/Applications/Projections/otbVectorDataReprojection.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperNumericalParameter.h"
 #include "otbGeometriesProjectionFilter.h"
diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx
index 1a8b7957089c27a3e5cfc10b1524c8a4576bbac8..05c4640a744d707199f6138190827e6d0e2d8903 100644
--- a/Applications/Radiometry/otbOpticalCalibration.cxx
+++ b/Applications/Radiometry/otbOpticalCalibration.cxx
@@ -29,9 +29,7 @@
 #include "otbGroundSpacingImageFunction.h"
 #include "vnl/vnl_random.h"
 
-#include "itkMetaDataDictionary.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 #include <fstream>
 #include <sstream>
diff --git a/Applications/Rasterization/otbRasterization.cxx b/Applications/Rasterization/otbRasterization.cxx
index b61f90817da314d526157afa95bcac9fc93cd3df..8b66ad3b14afe9389a3bbec14b535a16f63c9426 100644
--- a/Applications/Rasterization/otbRasterization.cxx
+++ b/Applications/Rasterization/otbRasterization.cxx
@@ -20,7 +20,6 @@
 
 #include "otbGeoInformationConversion.h"
 
-#include "otbOGRDataSourceWrapper.h"
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "otbGenericRSTransform.h"
 
diff --git a/Applications/Segmentation/otbConnectedComponentSegmentation.cxx b/Applications/Segmentation/otbConnectedComponentSegmentation.cxx
index 83674d5b5ecce55e506a0ddb534705aaaaff84d3..fc6a15c69c088ca561dc4bd7b0c6cf135f2d69b0 100644
--- a/Applications/Segmentation/otbConnectedComponentSegmentation.cxx
+++ b/Applications/Segmentation/otbConnectedComponentSegmentation.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbImage.h"
diff --git a/Applications/Segmentation/otbHooverCompareSegmentation.cxx b/Applications/Segmentation/otbHooverCompareSegmentation.cxx
index 5b16859411b646a85d6ea6366ed5dc1865020886..edce4e5afcbd61ed1eaf1ae1de2992b4610f93fe 100644
--- a/Applications/Segmentation/otbHooverCompareSegmentation.cxx
+++ b/Applications/Segmentation/otbHooverCompareSegmentation.cxx
@@ -22,7 +22,6 @@
 #include "otbHooverInstanceFilter.h"
 #include "otbLabelMapToAttributeImageFilter.h"
 
-#include "itkLabelMap.h"
 #include "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Applications/Segmentation/otbLSMSSegmentation.cxx b/Applications/Segmentation/otbLSMSSegmentation.cxx
index b0fa2fcf290721fec9cd13963cfd7443ea5d628f..0a10563a9459b61b346255f8fb6a03386a24daaa 100644
--- a/Applications/Segmentation/otbLSMSSegmentation.cxx
+++ b/Applications/Segmentation/otbLSMSSegmentation.cxx
@@ -20,7 +20,6 @@
 #include "otbMultiChannelExtractROI.h"
 #include "otbExtractROI.h"
 #include "otbConnectedComponentMuParserFunctor.h"
-#include "itkConnectedComponentFunctorImageFilter.h"
 #include "otbBandMathImageFilter.h"
 #include "itkStatisticsImageFilter.h"
 #include "itkChangeLabelImageFilter.h"
diff --git a/Applications/Segmentation/otbLSMSVectorization.cxx b/Applications/Segmentation/otbLSMSVectorization.cxx
index 7b22a70db620a2f1a5b344fb736f69f9a49c035d..9b2703461f962d6cb8c0df53060ecd2c2e658e3f 100644
--- a/Applications/Segmentation/otbLSMSVectorization.cxx
+++ b/Applications/Segmentation/otbLSMSVectorization.cxx
@@ -23,7 +23,6 @@
 
 #include "otbStreamingStatisticsImageFilter.h"
 #include "otbLabelImageToOGRDataSourceFilter.h"
-#include "otbOGRDataSourceWrapper.h"
 #include "otbOGRFeatureWrapper.h"
 
 #include <time.h>
diff --git a/Applications/Segmentation/otbSegmentation.cxx b/Applications/Segmentation/otbSegmentation.cxx
index 5b07a5c168e53ab6ccd336e1d1958a0c322d4aac..0b0a7432b5e2e6b030803535ffaea7780f2f1563 100644
--- a/Applications/Segmentation/otbSegmentation.cxx
+++ b/Applications/Segmentation/otbSegmentation.cxx
@@ -21,10 +21,8 @@
 #include "otbWrapperChoiceParameter.h"
 
 // Segmentation filters includes
-#include "otbMeanShiftVectorImageFilter.h"
 #include "otbMeanShiftSegmentationFilter.h"
 #include "otbConnectedComponentMuParserFunctor.h"
-#include "itkConnectedComponentFunctorImageFilter.h"
 #include "otbMaskMuParserFilter.h"
 #include "otbVectorImageToAmplitudeImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
@@ -33,7 +31,6 @@
 
 // Large scale vectorization framework
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
-#include "otbOGRDataSourceWrapper.h"
 
 // Fusion filter
 #include "otbOGRLayerStreamStitchingFilter.h"
diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx
index cf1b9ecc51d7397a3dad66da78ed831284a88bf2..bb2e7e5f824b933bb87bf86793ac140b6e303462 100644
--- a/Applications/Utils/otbColorMapping.cxx
+++ b/Applications/Utils/otbColorMapping.cxx
@@ -28,7 +28,6 @@
 #include "itkScalarToRGBColormapImageFilter.h"
 #include "otbReliefColormapFunctor.h"
 
-#include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 
 #include "otbRAMDrivenStrippedStreamingManager.h"
@@ -36,11 +35,8 @@
 #include "itkListSample.h"
 #include "otbListSampleToHistogramListGenerator.h"
 
-#include "itkDenseFrequencyContainer2.h"
 #include "itkVariableLengthVector.h"
-#include "itkHistogram.h"
 #include "otbObjectList.h"
-#include "itkNumericTraitsVariableLengthVectorPixel.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Applications/Utils/otbConcatenateImages.cxx b/Applications/Utils/otbConcatenateImages.cxx
index 5e2d7f707a46823588c28c803d1fc77c28efb7d0..7712d608f45720c0ac8202a498a4f40c2f6a1a73 100644
--- a/Applications/Utils/otbConcatenateImages.cxx
+++ b/Applications/Utils/otbConcatenateImages.cxx
@@ -20,7 +20,6 @@
 
 #include "otbImageListToVectorImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
-#include "otbObjectList.h"
 #include "otbWrapperTypes.h"
 #include "otbImageList.h"
 
diff --git a/Applications/Utils/otbConvert.cxx b/Applications/Utils/otbConvert.cxx
index fbc1177a4976018cb8bf3a78399e3762053bb106..5d8cb9a5d48b37160f159c9cbc614baa2d73c5e9 100644
--- a/Applications/Utils/otbConvert.cxx
+++ b/Applications/Utils/otbConvert.cxx
@@ -29,7 +29,6 @@
 #include "otbListSampleToHistogramListGenerator.h"
 #include "itkImageRegionConstIterator.h"
 
-#include "otbWrapperTypes.h"
 
 namespace otb
 {
diff --git a/Applications/Utils/otbDEMConvert.cxx b/Applications/Utils/otbDEMConvert.cxx
index 921844e0f82f1828257e93e31988c0e4d2893aec..07cd63889e65e6730a63933f8938da8b621ff51d 100644
--- a/Applications/Utils/otbDEMConvert.cxx
+++ b/Applications/Utils/otbDEMConvert.cxx
@@ -20,7 +20,6 @@
 
 #include "otbDEMConvertAdapter.h"
 
-#include "itkImageIOBase.h"
 #include "itkImageIOFactory.h"
 
 namespace otb
diff --git a/Applications/Utils/otbKmzExport.cxx b/Applications/Utils/otbKmzExport.cxx
index ddb8b75c4c37361078879cce50c28361ec1c00e5..506d390dd7918b1ea3d38123b0e4e0d5b89bd339 100644
--- a/Applications/Utils/otbKmzExport.cxx
+++ b/Applications/Utils/otbKmzExport.cxx
@@ -15,7 +15,6 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbKmzProductWriter.h"
diff --git a/Applications/Utils/otbMultiResolutionPyramid.cxx b/Applications/Utils/otbMultiResolutionPyramid.cxx
index 3718feecb262b6629b4b28aae42758313e0ac596..dc4cef7e9a50ab010f3532c5a24b29b97ef9247f 100644
--- a/Applications/Utils/otbMultiResolutionPyramid.cxx
+++ b/Applications/Utils/otbMultiResolutionPyramid.cxx
@@ -22,7 +22,6 @@
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkShrinkImageFilter.h"
 
-#include "otbWrapperParameter.h"
 #include "otbWrapperOutputImageParameter.h"
 
 namespace otb
diff --git a/Applications/Utils/otbOSMDownloader.cxx b/Applications/Utils/otbOSMDownloader.cxx
index b20277f8308bc2878dc9367b3264ece221963683..d0c8e11e00c11837717320650a08867d45675f5f 100644
--- a/Applications/Utils/otbOSMDownloader.cxx
+++ b/Applications/Utils/otbOSMDownloader.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbImageToEnvelopeVectorDataFilter.h"
diff --git a/Applications/Utils/otbSplitImage.cxx b/Applications/Utils/otbSplitImage.cxx
index 7bbce90bd67f51580b8d07ecbb2487f525186c8a..eac25eaf3c42c0347b885e8f8b9bc1efcdb3a3a6 100644
--- a/Applications/Utils/otbSplitImage.cxx
+++ b/Applications/Utils/otbSplitImage.cxx
@@ -17,7 +17,6 @@
  =========================================================================*/
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
-#include "otbWrapperParameter.h"
 #include "otbWrapperOutputImageParameter.h"
 
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Code/ApplicationEngine/otbWrapperApplication.cxx b/Code/ApplicationEngine/otbWrapperApplication.cxx
index f6f648d03722ab1362abe3d527c8e13a7db75e08..604ad177ebeb01600bd7a1a87ef685eef8f22b5e 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplication.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperApplication.h"
 
 #include "otbWrapperChoiceParameter.h"
 #include "otbWrapperListViewParameter.h"
@@ -27,16 +26,13 @@
 #include "otbWrapperOutputProcessXMLParameter.h"
 #include "otbWrapperInputVectorDataParameter.h"
 #include "otbWrapperInputVectorDataListParameter.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperOutputVectorDataParameter.h"
 #include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
 #include "otbWrapperStringListParameter.h"
 #include "otbWrapperInputImageListParameter.h"
 #include "otbWrapperInputProcessXMLParameter.h"
 #include "otbWrapperRAMParameter.h"
 
-#include "otbWrapperParameterGroup.h"
 
 #include "otbWrapperAddProcessToWatchEvent.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperApplication.h b/Code/ApplicationEngine/otbWrapperApplication.h
index 97044f8b640d7e1da804b19803f7b828f0aca43a..24d2e1f3f6da76312db2e775f1bd35e54969f86f 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.h
+++ b/Code/ApplicationEngine/otbWrapperApplication.h
@@ -20,7 +20,6 @@
 
 #include <string>
 #include "otbMacro.h"
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 #include "otbWrapperTypes.h"
 #include "otbWrapperTags.h"
diff --git a/Code/ApplicationEngine/otbWrapperApplicationFactory.h b/Code/ApplicationEngine/otbWrapperApplicationFactory.h
index 51f3bc9ccc18f33dbc7221d425c24dfb0147ef71..318b97e1c5967efaa0850b88896a7e0a6371d747 100644
--- a/Code/ApplicationEngine/otbWrapperApplicationFactory.h
+++ b/Code/ApplicationEngine/otbWrapperApplicationFactory.h
@@ -18,7 +18,6 @@
 #ifndef __otbWrapperApplicationFactory_h
 #define __otbWrapperApplicationFactory_h
 
-#include "itkObjectFactory.h"
 #include "itkVersion.h"
 
 namespace otb
diff --git a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx b/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
index bc35bb58f671e24ff71a86b42ea5c257acec3f49..e5339e8bd4d779773fc18dd67489265f1262a092 100644
--- a/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
+++ b/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGenerator.cxx
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 #include "otbMacro.h"
-#include "otbWrapperParameterGroup.h"
 #include "otbWrapperChoiceParameter.h"
 
 namespace otb
diff --git a/Code/ApplicationEngine/otbWrapperApplicationRegistry.h b/Code/ApplicationEngine/otbWrapperApplicationRegistry.h
index fb493c7b86a4e29a86cfc3feba403e774fbd4d4c..f6b7a14252275f8ad55d9d6f2b3880f5a7f01225 100644
--- a/Code/ApplicationEngine/otbWrapperApplicationRegistry.h
+++ b/Code/ApplicationEngine/otbWrapperApplicationRegistry.h
@@ -19,9 +19,7 @@
 #define __otbWrapperApplicationRegistry_h
 
 #include <string>
-#include "otbMacro.h"
 #include "itkObject.h"
-#include "itkObjectFactory.h"
 
 #include "otbWrapperApplication.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperChoiceParameter.h b/Code/ApplicationEngine/otbWrapperChoiceParameter.h
index 98093628a0490fed1343f91c5162ac29cb04b6b0..4a3b09c689b888c7d9dc4079190332d93db215c2 100644
--- a/Code/ApplicationEngine/otbWrapperChoiceParameter.h
+++ b/Code/ApplicationEngine/otbWrapperChoiceParameter.h
@@ -18,7 +18,6 @@
 #ifndef __otbWrapperChoiceParameter_h
 #define __otbWrapperChoiceParameter_h
 
-#include "otbWrapperParameter.h"
 #include "otbWrapperParameterGroup.h"
 
 namespace otb
diff --git a/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx b/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx
index 9b19bf0acd38f38561add5e54f475748c0292a20..696367d9257e03781a63a6377295036d1a641c39 100644
--- a/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx
+++ b/Code/ApplicationEngine/otbWrapperComplexInputImageParameter.txx
@@ -20,7 +20,6 @@
 
 #include "otbWrapperComplexInputImageParameter.h"
 
-#include "otbImageFileReader.h"
 #include "itkCastImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperDocExampleStructure.h b/Code/ApplicationEngine/otbWrapperDocExampleStructure.h
index e6c38e225a7ba2b2796cc3514e533655c13aa22e..4f3ef2ce7afffc04cd37254e3871f2e6ed62ebe6 100644
--- a/Code/ApplicationEngine/otbWrapperDocExampleStructure.h
+++ b/Code/ApplicationEngine/otbWrapperDocExampleStructure.h
@@ -24,7 +24,6 @@
 #include <string>
 #include <iostream>
 #include <vector>
-#include "itkMacro.h"
 #include "otbConfigure.h"
 #include "itkFixedArray.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h b/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h
index dfd690a6d1fa76ec5f27a84b8230376ae624bfdc..bb3739ed1048a23d5c86680e45b339c18e705554 100644
--- a/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h
+++ b/Code/ApplicationEngine/otbWrapperInputFilenameListParameter.h
@@ -21,7 +21,6 @@
 #include <string>
 #include "otbWrapperStringParameter.h"
 
-#include "otbWrapperParameter.h"
 #include "otbObjectList.h"
 
 namespace otb
diff --git a/Code/ApplicationEngine/otbWrapperInputImageParameter.txx b/Code/ApplicationEngine/otbWrapperInputImageParameter.txx
index 89dde1c22670c326d8d45ea785323377a6aa64f8..5bdbb9aca5d2f7c4c9e9353949f87c708a951cac 100644
--- a/Code/ApplicationEngine/otbWrapperInputImageParameter.txx
+++ b/Code/ApplicationEngine/otbWrapperInputImageParameter.txx
@@ -20,7 +20,6 @@
 
 #include "otbWrapperInputImageParameter.h"
 
-#include "otbImageFileReader.h"
 #include "itkCastImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx b/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx
index 37f0d3dc10fef65fda6faabf76e32830436223ed..39cf3ddcd7b0bf0a1438f73a215eca26a1cf0c87 100644
--- a/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx
+++ b/Code/ApplicationEngine/otbWrapperInputProcessXMLParameter.cxx
@@ -10,10 +10,8 @@
 #include "otbWrapperOutputFilenameParameter.h"
 #include "otbWrapperInputVectorDataParameter.h"
 #include "otbWrapperInputVectorDataListParameter.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperOutputVectorDataParameter.h"
 #include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
 #include "otbWrapperStringListParameter.h"
 #include "otbWrapperInputImageParameter.h"
 #include "otbWrapperInputImageListParameter.h"
diff --git a/Code/ApplicationEngine/otbWrapperListViewParameter.h b/Code/ApplicationEngine/otbWrapperListViewParameter.h
index 66bed6fca2ef05e6412d14e14f7f9ad888583bed..ae2d1ca2b02c164e38a142c7c72e969b509ddbf5 100644
--- a/Code/ApplicationEngine/otbWrapperListViewParameter.h
+++ b/Code/ApplicationEngine/otbWrapperListViewParameter.h
@@ -18,7 +18,6 @@
 #ifndef __otbWrapperListViewParameter_h
 #define __otbWrapperListViewParameter_h
 
-#include "otbWrapperParameter.h"
 #include "otbWrapperParameterGroup.h"
 
 namespace otb
diff --git a/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx b/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx
index 5c049df3606f6a177f093bbb4cf5995a4fb3787d..5063b5fbe0d4e181f3f1862a2442f971548a6b79 100644
--- a/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx
+++ b/Code/ApplicationEngine/otbWrapperOutputProcessXMLParameter.cxx
@@ -10,10 +10,8 @@
 #include "otbWrapperOutputFilenameParameter.h"
 #include "otbWrapperInputVectorDataParameter.h"
 #include "otbWrapperInputVectorDataListParameter.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperOutputVectorDataParameter.h"
 #include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
 #include "otbWrapperStringListParameter.h"
 #include "otbWrapperInputImageParameter.h"
 #include "otbWrapperInputImageListParameter.h"
diff --git a/Code/ApplicationEngine/otbWrapperParameter.h b/Code/ApplicationEngine/otbWrapperParameter.h
index d8e0da92619d1a698a9df6110fe65f9cf4214bda..9506ecbc0ec1acb36141429089cff075f255b3c2 100644
--- a/Code/ApplicationEngine/otbWrapperParameter.h
+++ b/Code/ApplicationEngine/otbWrapperParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperParameter_h
 
 #include "otbMacro.h"
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 
 #include "otbWrapperTypes.h"
diff --git a/Code/ApplicationEngine/otbWrapperParameterGroup.cxx b/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
index b6015091453549441d14b485063a17d7a2e7bac5..3be49eb3d6d7bc376bf172995724acc5c0235cad 100644
--- a/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
+++ b/Code/ApplicationEngine/otbWrapperParameterGroup.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbWrapperParameterGroup.h"
 #include "otbWrapperChoiceParameter.h"
 #include "otbWrapperListViewParameter.h"
 #include "otbWrapperDirectoryParameter.h"
@@ -27,12 +26,10 @@
 #include "otbWrapperComplexInputImageParameter.h"
 #include "otbWrapperInputImageParameter.h"
 #include "otbWrapperInputVectorDataParameter.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperOutputImageParameter.h"
 #include "otbWrapperComplexOutputImageParameter.h"
 #include "otbWrapperOutputVectorDataParameter.h"
 #include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
 #include "otbWrapperStringListParameter.h"
 #include "otbWrapperInputImageListParameter.h"
 #include "otbWrapperInputVectorDataListParameter.h"
diff --git a/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h b/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
index 7e0eccc6a6fa463d4c634c48f84ef5bf65a6bd0d..ddf4fd3ba83e3925a1a928e80f3ea005b9021def 100644
--- a/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
+++ b/Code/BasicFilters/otbAmplitudePhaseToRGBFunctor.h
@@ -19,7 +19,6 @@
 #ifndef __otbAmplitudePhaseToRGBFunctor_h
 #define __otbAmplitudePhaseToRGBFunctor_h
 
-#include "itkRGBPixel.h"
 #include "otbScalarToRainbowRGBPixelFunctor.h"
 #include "otbMath.h"
 
diff --git a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx b/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx
index 376e79501a66b4979565918f94369e1f13373d13..5394421a766fcee4ae56057da44ab9cf1d2e2c98 100644
--- a/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx
+++ b/Code/BasicFilters/otbAngularProjectionBinaryImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include <vnl/vnl_math.h>
 
-#include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
 namespace otb {
diff --git a/Code/BasicFilters/otbAngularProjectionImageFilter.txx b/Code/BasicFilters/otbAngularProjectionImageFilter.txx
index f58b8150871e0cf44c50faa1d6668fad3bcbc3b3..670cdc208b63644de408e5b1a1b8ddeaccebc6ed 100644
--- a/Code/BasicFilters/otbAngularProjectionImageFilter.txx
+++ b/Code/BasicFilters/otbAngularProjectionImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include <vnl/vnl_math.h>
 
-#include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 #include <itkProgressAccumulator.h>
 
diff --git a/Code/BasicFilters/otbAngularProjectionSetImageFilter.txx b/Code/BasicFilters/otbAngularProjectionSetImageFilter.txx
index d2d78e989b94d33fb868f1ae98c8067cccf1f3ca..feb9a4f0295db130543bc30a1b593b15b99800d3 100644
--- a/Code/BasicFilters/otbAngularProjectionSetImageFilter.txx
+++ b/Code/BasicFilters/otbAngularProjectionSetImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include <vnl/vnl_math.h>
 
-#include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
 namespace otb {
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.h b/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
index 346e0a5ce604dbf7157d023ef7fa025dfa4617f6..4f87dc491cc8ad3256d08b92aaca3748209da54c 100644
--- a/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
+++ b/Code/BasicFilters/otbBSplineInterpolateImageFunction.h
@@ -20,7 +20,6 @@
 
 #include <vector>
 
-#include "itkImageLinearIteratorWithIndex.h"
 #include "itkInterpolateImageFunction.h"
 #include "vnl/vnl_matrix.h"
 
diff --git a/Code/BasicFilters/otbBandMathImageFilter.txx b/Code/BasicFilters/otbBandMathImageFilter.txx
index 759b188c140bb174ff0dd8b06dc5e6fd77c2ef5f..4c1950524656e5ceea24a225c4f1a12b5169c592 100644
--- a/Code/BasicFilters/otbBandMathImageFilter.txx
+++ b/Code/BasicFilters/otbBandMathImageFilter.txx
@@ -23,7 +23,6 @@
 #include "otbBandMathImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbBinaryImageDensityFunction.txx b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
index ea4b0449a3753d20b96de293e4e385f9d5e2869d..332adbdd10cd04351ad48eb6cf418a7d09b32b70 100644
--- a/Code/BasicFilters/otbBinaryImageDensityFunction.txx
+++ b/Code/BasicFilters/otbBinaryImageDensityFunction.txx
@@ -24,7 +24,6 @@
 
 #include "otbBinaryImageDensityFunction.h"
 
-#include "itkNumericTraits.h"
 #include "itkConstNeighborhoodIterator.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbChannelSelectorFunctor.h b/Code/BasicFilters/otbChannelSelectorFunctor.h
index 22b464b2f56dbf2b9434a734f5d3379688be3b3d..ae8ec86ad65997b5a2953de3656d2957acedcf75 100644
--- a/Code/BasicFilters/otbChannelSelectorFunctor.h
+++ b/Code/BasicFilters/otbChannelSelectorFunctor.h
@@ -19,7 +19,6 @@
 #define __otbChannelSelectorFunctor_h
 #include <cassert>
 
-#include "itkNumericTraits.h"
 #include "itkVariableLengthVector.h"
 #include "itkRGBPixel.h"
 #include "itkRGBAPixel.h"
diff --git a/Code/BasicFilters/otbClampImageFilter.txx b/Code/BasicFilters/otbClampImageFilter.txx
index e524c16148fd663e9a473edfdc560e6ff226a2ea..89abe23b2229df95e90592c2b1b8954297d1aeff 100644
--- a/Code/BasicFilters/otbClampImageFilter.txx
+++ b/Code/BasicFilters/otbClampImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbClampImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkObjectFactory.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbClampVectorImageFilter.txx b/Code/BasicFilters/otbClampVectorImageFilter.txx
index af54f4f5f6c5833df6f3721b7d8daac084b3daa1..e6893ab2138af0f9fed3b5e453e01a69d27b746b 100644
--- a/Code/BasicFilters/otbClampVectorImageFilter.txx
+++ b/Code/BasicFilters/otbClampVectorImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbClampVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkObjectFactory.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
index b50deca627b94e28761f2b5127d55c6661fa6fca..c6079d432e11e745bd23a5855a66765b140dc960 100644
--- a/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
+++ b/Code/BasicFilters/otbContinuousMinimumMaximumImageCalculator.txx
@@ -21,7 +21,6 @@
 
 #include "otbContinuousMinimumMaximumImageCalculator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
-#include "itkNumericTraits.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h b/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h
index f05d7d035280b281583f15d2eca1029d611ea614..4025e842e5ccbab5e29d8b121cafe0e20021f7a4 100644
--- a/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.h
@@ -20,7 +20,6 @@
 
 #include "otbDataNodeVectorDataFunction.h"
 
-#include "otbDataNode.h"
 #include "itkPreOrderTreeIterator.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbEdgeDensityImageFilter.h b/Code/BasicFilters/otbEdgeDensityImageFilter.h
index 6334bcfdba2f41543debf1a2daccb2cd717a7353..66b4f33b94328f1369befd6c0953ab383779f1b8 100644
--- a/Code/BasicFilters/otbEdgeDensityImageFilter.h
+++ b/Code/BasicFilters/otbEdgeDensityImageFilter.h
@@ -20,10 +20,8 @@
 #ifndef __otbEdgeDensityImageFilter_h
 #define __otbEdgeDensityImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbBinaryImageToDensityImageFilter.h"
 #include "itkProcessObject.h"
-#include "itkNumericTraits.h"
 
 
 namespace otb
diff --git a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
index 71f5533ebb1d311aa9bb291b5f426e314ca5989f..cdfdb09cee6db6806b5e82cab32fe23c2452bc8e 100644
--- a/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbEstimateInnerProductPCAImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbEstimateInnerProductPCAImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkVariableLengthVector.h"
 #include "otbStreamingInnerProductVectorImageFilter.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx b/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx
index 18b7c18c3528f102f66c423fd52051f270a7abe3..f83dcc3e59ce9ae73c267aaf521a845b2b9da12e 100644
--- a/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx
+++ b/Code/BasicFilters/otbEuclideanDistanceMetricWithMissingValuePow2.txx
@@ -21,7 +21,6 @@
 #ifndef __otbEuclideanDistanceMetricWithMissingValuePow2_txx
 #define __otbEuclideanDistanceMetricWithMissingValuePow2_txx
 
-#include "itkNumericTraits.h"
 #include "itkMeasurementVectorTraits.h"
 
 namespace otb {
diff --git a/Code/BasicFilters/otbFastICAImageFilter.h b/Code/BasicFilters/otbFastICAImageFilter.h
index 3a21746b4508854a2f3feee3eecffa4af30105fe..69cec68b74766b1ba6c148075353f0b1732016d3 100644
--- a/Code/BasicFilters/otbFastICAImageFilter.h
+++ b/Code/BasicFilters/otbFastICAImageFilter.h
@@ -18,10 +18,8 @@
 #ifndef __otbFastICAImageFilter_h
 #define __otbFastICAImageFilter_h
 
-#include "otbMacro.h"
 #include "itkImageToImageFilter.h"
 #include "otbPCAImageFilter.h"
-#include "otbMatrixImageFilter.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
diff --git a/Code/BasicFilters/otbFastICAImageFilter.txx b/Code/BasicFilters/otbFastICAImageFilter.txx
index 06540a8d66f8cf9fa04371afc418c54497ef66ad..6fea7819383b2589070b8a24e40d850c928731c4 100644
--- a/Code/BasicFilters/otbFastICAImageFilter.txx
+++ b/Code/BasicFilters/otbFastICAImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbFastICAImageFilter.h"
 
-#include "otbMacro.h"
 
 
 #include "itkNumericTraits.h"
diff --git a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h
index 4cd65fb4c99382c71cf04317edbfdef9c9fa2e16..b1502acada8e8e288e0e8c446cf50e7ed7a5e02c 100644
--- a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbFastICAInternalOptimizerVectorImageFilter_h
 
 #include "otbMacro.h"
-#include "itkImageToImageFilter.h"
 #include "otbMatrixImageFilter.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
 
diff --git a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
index 4c4f2923b21b390d6ef9bb1a6d68d1b38936692b..f3ada7eb7b58394c5547b5ba12624ba7aff66b97 100644
--- a/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
+++ b/Code/BasicFilters/otbFastICAInternalOptimizerVectorImageFilter.txx
@@ -20,7 +20,6 @@
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 #include <itkMacro.h>
-#include <itkImageRegionConstIterator.h>
 #include <itkImageRegionIterator.h>
 
 #include <vnl/vnl_math.h>
diff --git a/Code/BasicFilters/otbFrostImageFilter.txx b/Code/BasicFilters/otbFrostImageFilter.txx
index 39e6649c6023ffb1978c5e58a86e4451fdd9c369..17197ea98af8f4b3927e6b7d622cbe7956fd62d2 100644
--- a/Code/BasicFilters/otbFrostImageFilter.txx
+++ b/Code/BasicFilters/otbFrostImageFilter.txx
@@ -21,12 +21,10 @@
 #include "otbFrostImageFilter.h"
 
 #include "itkDataObject.h"
-#include "itkMacro.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkOffset.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.h b/Code/BasicFilters/otbFunctionToImageFilter.h
index e64a64faf4b6b300381e4c4313f03c9993560b22..02aa7bc26d0fe225a48e5b9d5c8396f981fd4c0b 100644
--- a/Code/BasicFilters/otbFunctionToImageFilter.h
+++ b/Code/BasicFilters/otbFunctionToImageFilter.h
@@ -24,7 +24,6 @@
 #include "itkInPlaceImageFilter.h"
 #include "itkImageFunction.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageToImageFilter.h"
 #include "itkSize.h"
 #include "itkSpatialFunction.h"
 
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.txx b/Code/BasicFilters/otbFunctionToImageFilter.txx
index a4cdd044835e99e27bc88d3e70f2e90a291c2a3d..e9110eb9b0fa47d5be3cfa5c4410de52f770416c 100644
--- a/Code/BasicFilters/otbFunctionToImageFilter.txx
+++ b/Code/BasicFilters/otbFunctionToImageFilter.txx
@@ -22,7 +22,6 @@
 #define __otbFunctionToImageFilter_txx
 
 #include "otbFunctionToImageFilter.h"
-#include "itkImageRegionIterator.h"
 #include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
index c3a39ac778e12672bca89d8e909b303929de6612..90ce20420c5dd05e079820011c36578f465e8fca 100644
--- a/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilter.h
@@ -22,7 +22,6 @@
 #define __otbFunctionWithNeighborhoodToImageFilter_h
 
 #include "otbFunctionToImageFilter.h"
-#include "itkInPlaceImageFilter.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbHillShadingFilter.h b/Code/BasicFilters/otbHillShadingFilter.h
index 8b5f5661c3ce4dcc46cf852b53503ac69d366b9d..110ef27f73a8c7f0b69e7bec81405415fb2b4b82 100644
--- a/Code/BasicFilters/otbHillShadingFilter.h
+++ b/Code/BasicFilters/otbHillShadingFilter.h
@@ -20,7 +20,6 @@
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "otbHillShadingFunctor.h"
-#include "itkConstNeighborhoodIterator.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbImageListToSingleImageFilter.h b/Code/BasicFilters/otbImageListToSingleImageFilter.h
index e2a7ffa0c66e4f2f220b35d866ac99fdf18356f5..093435c6769f67888f4f961805b8cb9b40e84f73 100644
--- a/Code/BasicFilters/otbImageListToSingleImageFilter.h
+++ b/Code/BasicFilters/otbImageListToSingleImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbImageListToSingleImageFilter_h
 
 #include "otbImageListToImageFilter.h"
-#include "otbImageList.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.h b/Code/BasicFilters/otbImageToPointSetFilter.h
index 1030708ad0c769e6215cbfc5be5fbe52774a6411..055a17d2edeee4a3b4f3e6468499a8090ccc4b4e 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.h
+++ b/Code/BasicFilters/otbImageToPointSetFilter.h
@@ -19,7 +19,6 @@
 #define __otbImageToPointSetFilter_h
 
 #include "otbPointSetSource.h"
-#include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
index efcb8db3bddab8b39ebddc3c7625d727be084d21..dbc11114c706a098ca730bb5dd70f67de3bce098 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
@@ -18,10 +18,8 @@
 #ifndef __otbImportGeoInformationImageFilter_txx
 #define __otbImportGeoInformationImageFilter_txx
 
-#include "itkDataObject.h"
 #include "otbImportGeoInformationImageFilter.h"
 #include "itkMetaDataObject.h"
-#include "itkMetaDataDictionary.h"
 #include "otbMetaDataKey.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbInnerProductPCAImageFilter.h b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
index eb915215adcf0aa7a20339ffc8a2392bcc853b79..f193445db1017ebf9c3a86a433d75bc50d066c80 100644
--- a/Code/BasicFilters/otbInnerProductPCAImageFilter.h
+++ b/Code/BasicFilters/otbInnerProductPCAImageFilter.h
@@ -18,13 +18,11 @@
 #ifndef __otbInnerProductPCAImageFilter_h
 #define __otbInnerProductPCAImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbImage.h"
 #include "otbMacro.h"
 #include "otbEstimateInnerProductPCAImageFilter.h"
 #include "otbNormalizeInnerProductPCAImageFilter.h"
 #include "otbMeanFunctor.h"
-#include "itkUnaryFunctorImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 #include "otbConcatenateVectorImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
diff --git a/Code/BasicFilters/otbKeyPointDensityImageFilter.h b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
index c413f7c9557fdc49d672c544c94c32bdc6530598..22aee973f6f5565accaa26288650b8fc256d92ff 100644
--- a/Code/BasicFilters/otbKeyPointDensityImageFilter.h
+++ b/Code/BasicFilters/otbKeyPointDensityImageFilter.h
@@ -21,7 +21,6 @@
 #define __otbKeyPointDensityImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkProcessObject.h"
 #include "otbPointSetToDensityImageFilter.h"
 #include "itkNumericTraits.h"
 
diff --git a/Code/BasicFilters/otbLabelImageRegionMergingFilter.txx b/Code/BasicFilters/otbLabelImageRegionMergingFilter.txx
index da53930eefbf609fccd6ac8007ec7912ffdf5d20..b202612570178ec273978811b13effbc19cbd052 100644
--- a/Code/BasicFilters/otbLabelImageRegionMergingFilter.txx
+++ b/Code/BasicFilters/otbLabelImageRegionMergingFilter.txx
@@ -20,7 +20,6 @@
 #define __otbLabelImageRegionMergingFilter_txx
 
 #include "otbLabelImageRegionMergingFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx b/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
index f0cbe9207fb0930ade46d0f9411985375f676126..5c91889762a146ef0424b4ea207318954afb0d5c 100644
--- a/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
+++ b/Code/BasicFilters/otbLabelImageRegionPruningFilter.txx
@@ -20,7 +20,6 @@
 #define __otbLabelImageRegionPruningFilter_txx
 
 #include "otbLabelImageRegionPruningFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
index 5ec30ddce2846849a5e4743bb5cf6c0225124a25..61f47cf0f082467d9a609e9e6357cb4fed1e7abf 100644
--- a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
+++ b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
@@ -29,7 +29,6 @@
 
 #include "itkArray.h"
 
-#include "otbParser.h"
 #include "otbMacro.h"
 
 
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
index b5e5e96544ea787f1c520fd87250585214c4eadb..cfa2060bb3b0eaa36e8aea5bbc3646deba327574 100644
--- a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
+++ b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.txx
@@ -23,9 +23,7 @@
 #include <string>
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
-#include "itkProgressReporter.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbLeeImageFilter.txx b/Code/BasicFilters/otbLeeImageFilter.txx
index 3d8a8b7b59262716bcf061eded4e17b318d8b2fe..0abcd2c52e46fbd141a8c29558ef3d4c96e9d3df 100644
--- a/Code/BasicFilters/otbLeeImageFilter.txx
+++ b/Code/BasicFilters/otbLeeImageFilter.txx
@@ -21,12 +21,10 @@
 #include "otbLeeImageFilter.h"
 
 #include "itkDataObject.h"
-#include "itkMacro.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkOffset.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbListSampleToHistogramListGenerator.h b/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
index e62a8af45cc4f58ab5d4859b54436defc8d7a219..4cead7e7ad4eb99698ae732cac8517259c1eed27 100644
--- a/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
+++ b/Code/BasicFilters/otbListSampleToHistogramListGenerator.h
@@ -25,7 +25,6 @@
 #include "itkHistogram.h"
 #include "otbObjectList.h"
 #include "itkStatisticsAlgorithm.h"
-#include "itkDenseFrequencyContainer2.h"
 #include "itkNumericTraits.h"
 
 namespace otb {
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
index 12efaea4ee45c3b4c231c8cd3ad3cba7609e70bf..edf9987d9aa19439cedc5b38d01446ffa47c09c4 100644
--- a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -24,7 +24,6 @@
 #include "itkProcessObject.h"
 #include "itkHistogram.h"
 #include "itkStatisticsAlgorithm.h"
-#include "itkDenseFrequencyContainer2.h"
 #include "itkNumericTraits.h"
 
 namespace otb {
diff --git a/Code/BasicFilters/otbMNFImageFilter.h b/Code/BasicFilters/otbMNFImageFilter.h
index 7d7850c596d42d8795c87d2a8415adf7b4d4516c..5007c0a0ae62b7af47b9cfd0d0e4af96468ebccb 100644
--- a/Code/BasicFilters/otbMNFImageFilter.h
+++ b/Code/BasicFilters/otbMNFImageFilter.h
@@ -18,11 +18,8 @@
 #ifndef __otbMNFImageFilter_h
 #define __otbMNFImageFilter_h
 
-#include "otbMacro.h"
 #include "itkImageToImageFilter.h"
-#include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbMatrixImageFilter.h"
-#include "otbNormalizeVectorImageFilter.h"
 #include "otbPCAImageFilter.h"
 
 
diff --git a/Code/BasicFilters/otbMaskMuParserFilter.h b/Code/BasicFilters/otbMaskMuParserFilter.h
index 7284869881c0c3205c206d12abc854872dfb856f..9f2b108329bd3d97d85c4620f963aebd046841c7 100644
--- a/Code/BasicFilters/otbMaskMuParserFilter.h
+++ b/Code/BasicFilters/otbMaskMuParserFilter.h
@@ -30,7 +30,6 @@
 
 #include "itkArray.h"
 
-#include "otbParser.h"
 #include "otbMacro.h"
 
 #include "otbMaskMuParserFunctor.h"
diff --git a/Code/BasicFilters/otbMaskMuParserFilter.txx b/Code/BasicFilters/otbMaskMuParserFilter.txx
index 6137ccde2ed53a9931cc065484aa1f56e803bd1f..391adfec7d9a74db1cf8479de3c6597be50be15f 100644
--- a/Code/BasicFilters/otbMaskMuParserFilter.txx
+++ b/Code/BasicFilters/otbMaskMuParserFilter.txx
@@ -23,9 +23,7 @@
 #include <string>
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
-#include "itkProgressReporter.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbMaskMuParserFunctor.h b/Code/BasicFilters/otbMaskMuParserFunctor.h
index 8d7c8ffc4f5d08091409451201ccd2ffaf263dd2..fa815cedfeea02f3e6ce4479c6349b278510596a 100644
--- a/Code/BasicFilters/otbMaskMuParserFunctor.h
+++ b/Code/BasicFilters/otbMaskMuParserFunctor.h
@@ -26,7 +26,6 @@
 #include "otbMacro.h"
 
 
-#include "itkLightObject.h"
 #include "itkObjectFactory.h"
 
 #include "otbBinarySpectralAngleFunctor.h"
diff --git a/Code/BasicFilters/otbMatrixImageFilter.txx b/Code/BasicFilters/otbMatrixImageFilter.txx
index 8333d0f9a7422e5140d13db482c53cdbfe3aad7d..c2146680b251546e6119b3788eeb2a5aae2ae161 100644
--- a/Code/BasicFilters/otbMatrixImageFilter.txx
+++ b/Code/BasicFilters/otbMatrixImageFilter.txx
@@ -19,7 +19,6 @@
 #define __otbMatrixImageFilter_txx
 
 #include "otbMatrixImageFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h b/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h
index 75e937a0f665a9fa587a798aea9ff8f97b79cd32..f0316148052f988c8872a6cbf06b39caf7089202 100644
--- a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.h
@@ -18,11 +18,9 @@
 #ifndef __otbMaximumAutocorrelationFactorImageFilter_h
 #define __otbMaximumAutocorrelationFactorImageFilter_h
 
-#include "itkImageToImageFilter.h"
 
 #include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbConcatenateVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "itkNumericTraits.h"
 
 #include "vnl/vnl_vector.h"
diff --git a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx b/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx
index f4b644230a94706c0ebd26f85b06d0f261a0cff8..1963ebb2e8424a342a90194630811e252c69a43e 100644
--- a/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx
+++ b/Code/BasicFilters/otbMaximumAutocorrelationFactorImageFilter.txx
@@ -27,7 +27,6 @@
 #include "vnl/algo/vnl_generalized_eigensystem.h"
 
 #include "itkChangeInformationImageFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbMeanShiftImageFilter.txx b/Code/BasicFilters/otbMeanShiftImageFilter.txx
index 0e577c06796932e6c475340a27074f46a958e7e4..0df64c867c7857f91e48b4ad70409ea3dd7a9f00 100644
--- a/Code/BasicFilters/otbMeanShiftImageFilter.txx
+++ b/Code/BasicFilters/otbMeanShiftImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include "otbMeanShiftImageFilter.h"
 
-#include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx b/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx
index 7a2f302570165fa533f9c7c9dd7c8b86887b9cee..88c61d557ceb568d8b3c7f9f214570e0579ed7fd 100644
--- a/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx
+++ b/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.txx
@@ -20,7 +20,6 @@
 #define __otbMeanShiftSmoothingImageFilter_txx
 
 #include "otbMeanShiftSmoothingImageFilter.h"
-#include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
 #include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h b/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h
index f2355fad1b0545f564c637f5b5d846de30315e84..39ed8a99909d7fa7c887adb18378b4f177515e62 100644
--- a/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h
+++ b/Code/BasicFilters/otbNDVIDataNodeFeatureFunction.h
@@ -21,7 +21,6 @@
 #include "otbDataNodeImageFunction.h"
 
 #include "otbVegetationIndicesFunctor.h"
-#include "otbDataNode.h"
 #include "otbPolyLineImageConstIterator.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
index 0bd2e5601bf792bc96d960ab4f86da1a3168c07b..46eabc8d37970cefa72a33d416bc4cd8f07d8fa4 100644
--- a/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
+++ b/Code/BasicFilters/otbNormalizeInnerProductPCAImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbNormalizeInnerProductPCAImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 #include "itkNumericTraits.h"
 
diff --git a/Code/BasicFilters/otbNormalizeVectorImageFilter.h b/Code/BasicFilters/otbNormalizeVectorImageFilter.h
index 6bb4d7cdafe41fd48d27398c5d7157dc1cf1e38d..d847f7a73fde30628e5927589c54dd78713dbed5 100644
--- a/Code/BasicFilters/otbNormalizeVectorImageFilter.h
+++ b/Code/BasicFilters/otbNormalizeVectorImageFilter.h
@@ -20,9 +20,7 @@
 
 #include <vnl/vnl_math.h>
 
-#include <itkNumericTraits.h>
 #include <itkMacro.h>
-#include <itkVariableLengthVector.h>
 #include <otbVectorImage.h>
 #include <otbUnaryFunctorVectorImageFilter.h>
 
diff --git a/Code/BasicFilters/otbOBIAMuParserFunctor.h b/Code/BasicFilters/otbOBIAMuParserFunctor.h
index a4edd571b1c39cd908d0c00afadecadf4c8f8109..022f03c1c56d8c10a7f8611c27ca6ef1790a3e0e 100644
--- a/Code/BasicFilters/otbOBIAMuParserFunctor.h
+++ b/Code/BasicFilters/otbOBIAMuParserFunctor.h
@@ -26,7 +26,6 @@
 #include "otbMacro.h"
 
 
-#include "itkLightObject.h"
 #include "itkObjectFactory.h"
 
 
diff --git a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
index 254ed85e2f7c853ea0045d4be4a39ff73e1060b6..aa5ed2b16c3461be484185fd51bbe8c1458ec476 100644
--- a/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
+++ b/Code/BasicFilters/otbOverlapSaveConvolutionImageFilter.txx
@@ -25,7 +25,6 @@
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkOffset.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbPCAImageFilter.h b/Code/BasicFilters/otbPCAImageFilter.h
index 75e87eff5d313cd4c9bba1746e576f424e2e5018..e0e10bb8140baa08c102ef4c5e0cb8428418f118 100644
--- a/Code/BasicFilters/otbPCAImageFilter.h
+++ b/Code/BasicFilters/otbPCAImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbPCAImageFilter_h
 
 #include "otbMacro.h"
-#include "itkImageToImageFilter.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbMatrixImageFilter.h"
 #include "otbNormalizeVectorImageFilter.h"
diff --git a/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h b/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h
index 56c4c8a5507b75f52a6cbe4dea377d699cff4ae0..749475f9ff50327ac5ac29a593a25dd40e002cdc 100644
--- a/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h
+++ b/Code/BasicFilters/otbParserConditionDataNodeFeatureFunction.h
@@ -19,7 +19,6 @@
 #define __otbParserConditionDataNodeFeatureFunction_h
 
 #include "otbDataNodeImageFunction.h"
-#include "otbDataNode.h"
 #include "otbPolyLineImageConstIterator.h"
 #include "otbMaskMuParserFunctor.h"
 
diff --git a/Code/BasicFilters/otbPointSetDensityFunction.h b/Code/BasicFilters/otbPointSetDensityFunction.h
index 846838d97cc3e5e0ba6c86a697739cb784940f28..c7a1300a0aa2ca89c25417c18f0fd64412ade945 100644
--- a/Code/BasicFilters/otbPointSetDensityFunction.h
+++ b/Code/BasicFilters/otbPointSetDensityFunction.h
@@ -19,7 +19,6 @@
 #define __otbPointSetDensityFunction_h
 
 #include "otbPointSetFunction.h"
-#include "itkPoint.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbPointSetFunction.h b/Code/BasicFilters/otbPointSetFunction.h
index 2e8e0d1cbab4a3786b5c74e92e3fc3bd5df6cd10..ff52a2114ccd3e2e3d7514b7423063de622a1f61 100644
--- a/Code/BasicFilters/otbPointSetFunction.h
+++ b/Code/BasicFilters/otbPointSetFunction.h
@@ -19,7 +19,6 @@
 #define __otbPointSetFunction_h
 
 #include "itkSpatialFunction.h"
-#include "itkPoint.h"
 #include "itkProcessObject.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbPointSetFunction.txx b/Code/BasicFilters/otbPointSetFunction.txx
index e99cfa80e2ca73c38e04b2654715c23625d99513..81e8dcc52dfe08e43fb954b3921b6e24ccaecff2 100644
--- a/Code/BasicFilters/otbPointSetFunction.txx
+++ b/Code/BasicFilters/otbPointSetFunction.txx
@@ -20,7 +20,6 @@
 
 #include "otbPointSetFunction.h"
 
-#include "itkProcessObject.h"
 #include "itkNumericTraits.h"
 #include "itkConstNeighborhoodIterator.h"
 
diff --git a/Code/BasicFilters/otbPointSetToPointSetFilter.h b/Code/BasicFilters/otbPointSetToPointSetFilter.h
index 59d1d02fbe0aecd9ddfae6a7700aeb651aa4b3fa..60f12a8c92d6b738bb6d4a05a3f695af18ae127e 100644
--- a/Code/BasicFilters/otbPointSetToPointSetFilter.h
+++ b/Code/BasicFilters/otbPointSetToPointSetFilter.h
@@ -19,7 +19,6 @@
 #define __otbPointSetToPointSetFilter_h
 
 #include "otbPointSetSource.h"
-#include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
index 6aea0735b3921172d969e48672c60319b5cdcfa8..b4d6cee9b700613ca5c0b681c2931ba46354fd56 100644
--- a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
+++ b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index b0cebe457957f4b7fbe10af62470b8c22d5f05d8..b7bcfda232b0078a6e319bd900af2e0ca4874f7b 100644
--- a/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Code/BasicFilters/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -21,7 +21,6 @@
 #include "otbDataNodeImageFunction.h"
 
 #include "otbBinarySpectralAngleFunctor.h"
-#include "otbDataNode.h"
 #include "otbPolyLineImageConstIterator.h"
 #include "itkLineConstIterator.h"
 #include "itkVariableLengthVector.h"
diff --git a/Code/BasicFilters/otbRasterizeVectorDataFilter.txx b/Code/BasicFilters/otbRasterizeVectorDataFilter.txx
index 4b417b0537d94f2f391e373ef0940aeae429bfd8..58f4945069a3b12ce65e7533b9decc8cbe1bd963 100644
--- a/Code/BasicFilters/otbRasterizeVectorDataFilter.txx
+++ b/Code/BasicFilters/otbRasterizeVectorDataFilter.txx
@@ -19,7 +19,6 @@
 #include "otbRasterizeVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
 #include "otbGdalDataTypeBridge.h"
-#include "otbMacro.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.h b/Code/BasicFilters/otbRelabelComponentImageFilter.h
index b8824a2f0d5fae0b208cb7b176ebd3d2e62e54dc..d18ba565d7c6a2e28d5d4b82d65d88bc254770d9 100644
--- a/Code/BasicFilters/otbRelabelComponentImageFilter.h
+++ b/Code/BasicFilters/otbRelabelComponentImageFilter.h
@@ -18,7 +18,6 @@
 #define __otbRelabelComponentImageFilter_h
 
 #include "itkRelabelComponentImageFilter.h"
-#include "itkImage.h"
 #include <vector>
 
 namespace otb
diff --git a/Code/BasicFilters/otbRelabelComponentImageFilter.txx b/Code/BasicFilters/otbRelabelComponentImageFilter.txx
index 4180ae4851347adcc66a720e055e03ca1c2ce248..926517686f0224e78137a7af5ce5cb607280fc77 100644
--- a/Code/BasicFilters/otbRelabelComponentImageFilter.txx
+++ b/Code/BasicFilters/otbRelabelComponentImageFilter.txx
@@ -19,7 +19,6 @@
 
 #include "otbRelabelComponentImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include <map>
diff --git a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
index 53aefd047d9af092c2f083725a4de33ce5609a02..ec17b60ad19c5e8d4068bfa61064f05c0165e493 100644
--- a/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Code/BasicFilters/otbScalarToRainbowRGBPixelFunctor.h
@@ -19,7 +19,6 @@
 #ifndef __otbScalarToRainbowRGBPixelFunctor_h
 #define __otbScalarToRainbowRGBPixelFunctor_h
 
-#include "itkRGBPixel.h"
 #include "itkColormapFunction.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h b/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h
index b730bf85b92e30edb701baf6977e292fcaa35e28..13c237888ae3d0e013d7cd5c13e36e636a14f869 100644
--- a/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h
+++ b/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.h
@@ -22,9 +22,7 @@
 #include "otbImageList.h"
 
 #include "itkProcessObject.h"
-#include "itkDataObject.h"
 #include "itkDataObjectDecorator.h"
-#include "itkNumericTraits.h"
 #include "itkImageRegionConstIterator.h"
 
 namespace otb {
diff --git a/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h b/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h
index 91a91467a7b38ecb0318060a76d27e7a65579b22..d6a35f9fc8268e6e8ff3708d241cc318bf8f6d58 100644
--- a/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Code/BasicFilters/otbSpectralAngleDataNodeFeatureFunction.h
@@ -21,7 +21,6 @@
 #include "otbDataNodeImageFunction.h"
 
 #include "otbBinarySpectralAngleFunctor.h"
-#include "otbDataNode.h"
 #include "otbPolyLineImageConstIterator.h"
 #include "itkLineConstIterator.h"
 #include "itkVariableLengthVector.h"
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
index 5fbba4eb69ca0ae938151ea8a66f1fdcb362f249..eaf37b64b3179c99206a458629839d4e3a3b8cac 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 #include "otbMath.h"
diff --git a/Code/BasicFilters/otbStreamingCompareImageFilter.txx b/Code/BasicFilters/otbStreamingCompareImageFilter.txx
index ecf4a0596c1474398894264429e470ff1ceb76bf..f6a37f73cc57f16c10443112c6a165dc0db719a3 100644
--- a/Code/BasicFilters/otbStreamingCompareImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingCompareImageFilter.txx
@@ -20,7 +20,6 @@
 #include "otbStreamingCompareImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h b/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h
index bdd179f8d0efc68df2d288e6f622adf15ef1ceb6..b962a2f88a82457148d9fad880e0501f70aa25db 100644
--- a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.h
@@ -26,7 +26,6 @@
 
 #include "otbObjectList.h"
 #include "itkStatisticsAlgorithm.h"
-#include "itkDenseFrequencyContainer2.h"
 #include "itkNumericTraits.h"
 #include "itkHistogram.h"
 
diff --git a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx b/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx
index 2b1bb2f027e0eb9e98cca88cb7083a0357986a72..4b06b82b0eb3e4084119547fbca1e75c8bea9dfd 100644
--- a/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingHistogramVectorImageFilter.txx
@@ -24,7 +24,6 @@ for details.
 
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
index cf5a4859ba8c1bb9c0f4ed7d3aa2d2d5feb7895f..d154e276391d8f65c2a28737efeac62552a61a5f 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkNumericTraits.h"
 #include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
index 391315a3204e226da35be5f43da27657d3852b21..012a902fe6cb4e5d124cbda82cbcd41036f43273 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -22,7 +22,6 @@
 #define __otbStreamingMatrixTransposeMatrixImageFilter_h
 
 #include "otbPersistentImageFilter.h"
-#include "itkNumericTraits.h"
 #include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "otbStreamingTraits.h"
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
index ac88a55c91f6ea19ed24a893df719a7ef805e494..df2f0758d410b12345186693054975bb842dd902 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
@@ -24,7 +24,6 @@
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx b/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
index ea5f0ff50814d1a0812af68fdc2c19aa5b213b84..1a2ac0000f71fea4077d4efad4dcf97aef8765bc 100644
--- a/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
@@ -24,7 +24,6 @@ for details.
 
 #include <algorithm>
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
index 6453e53ca939c1088b6622985fe9678a08071e41..4e115d4e976b159ee8f7e8fc44c219bab2d9ee82 100644
--- a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkNumericTraits.h"
 #include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.h b/Code/BasicFilters/otbStreamingResampleImageFilter.h
index f988ef17a56d071c0616cafd004cc073a144313a..2e98aac1a62ab3b09c41a3ee581395defb6f2c5a 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.h
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.h
@@ -22,7 +22,6 @@
 #include "otbStreamingWarpImageFilter.h"
 #include "itkTransformToDisplacementFieldSource.h"
 #include "itkLinearInterpolateImageFunction.h"
-#include "itkInterpolateImageFunction.h"
 #include "otbImage.h"
 #include "itkVector.h"
 
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.h b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
index bde5656940af1feee6886d533eaa4f39c397e2fb..bccbf639075d5447feb9763e4c27a9946fb17f45 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.h
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
@@ -18,9 +18,7 @@
 #ifndef __otbStreamingShrinkImageFilter_h
 #define __otbStreamingShrinkImageFilter_h
 
-#include "otbMacro.h"
 #include "itkImageToImageFilter.h"
-#include "itkDataObject.h"
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
index 243798c860a381fdd2702431b11ba9deb19ba4eb..d00cb208ba6f3dba70443eb82e8aa5bc57bca332 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
@@ -23,7 +23,6 @@ for details.
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
index 831752fefea14fc154d5cd743ce8db9ae5d1ecd9..8d3d50d4160745983dfd692ad73b094140752c26 100644
--- a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
@@ -24,7 +24,6 @@ for details.
 
 #include "itkInputDataObjectIterator.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
index 273ae7b2b6ee56959d13c199df93e04ce0323be1..372974a65112b76359ed2152f08d0e60fe0023b2 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkNumericTraits.h"
 #include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
index d916d5768e374ccbd87daeb2c0c0c973e019911f..0e94b330ae92bb1085e77e2f7046c2c4cacc1d24 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbThresholdVectorImageFilter.txx b/Code/BasicFilters/otbThresholdVectorImageFilter.txx
index 09d199c89de5e06fe71bd3248b888c23567b91df..51cb678bd794bd0b3834874cd24fe8f754217409 100644
--- a/Code/BasicFilters/otbThresholdVectorImageFilter.txx
+++ b/Code/BasicFilters/otbThresholdVectorImageFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbThresholdVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNumericTraits.h"
 #include "itkObjectFactory.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbTileImageFilter.txx b/Code/BasicFilters/otbTileImageFilter.txx
index 0049f913e980e24be437f1c4b112e74673671465..55dd3e5bec9f6bff845988ed1a169319a18f1f69 100644
--- a/Code/BasicFilters/otbTileImageFilter.txx
+++ b/Code/BasicFilters/otbTileImageFilter.txx
@@ -19,7 +19,6 @@
 #define __otbTileImageFilter_txx
 
 #include "otbTileImageFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx b/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
index 0c0fe5a022ea588a994bfe0e13ba22a083aeeea3..1784c56d2c7e9ec89565c6db1c93fe86ef1497af 100644
--- a/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Code/BasicFilters/otbUnaryFunctorNeighborhoodVectorImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx b/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx
index ea8100597ff6c3419ef026d089b90f2778d6dcbf..9a0b2287ffa7959f12c724cfd2fd69f7032e038f 100644
--- a/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx
+++ b/Code/BasicFilters/otbUnaryFunctorVectorImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbUnaryFunctorVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
index 4740b9e13960867a24493695bafe7570345d931a..8834e20892a38e805d260533fa72515b3c4911a6 100644
--- a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -21,12 +21,9 @@
 #ifndef __otbUnaryImageFunctorWithVectorImageFilter_h
 #define __otbUnaryImageFunctorWithVectorImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkNumericTraits.h"
 #include "itkVariableLengthVector.h"
 #include "itkUnaryFunctorImageFilter.h"
-#include "itkInPlaceImageFilter.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
index 278de685e548d62ae771cd90813c14501a7e27ee..29a376cb53e36ffec8d37b6fbfb6625eabc07a91 100644
--- a/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
+++ b/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.txx
@@ -20,9 +20,7 @@
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
-#include "itkNumericTraits.h"
 
 namespace otb
 {
diff --git a/Code/BasicFilters/otbVarianceImageFilter.txx b/Code/BasicFilters/otbVarianceImageFilter.txx
index 7fb3da5b944ceb1bb010e791aa8988a0c8142305..b104d6e4ea579b05ae5bb5869b75bf62aa4f7705 100644
--- a/Code/BasicFilters/otbVarianceImageFilter.txx
+++ b/Code/BasicFilters/otbVarianceImageFilter.txx
@@ -24,7 +24,6 @@
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkOffset.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/BasicFilters/otbVectorDataToLabelImageFilter.h b/Code/BasicFilters/otbVectorDataToLabelImageFilter.h
index 80c84c2e597f47bde4925b788eec169f7587e9ea..74ac0d17675f28bf2f93ff1ad665c2ed93ab6caf 100644
--- a/Code/BasicFilters/otbVectorDataToLabelImageFilter.h
+++ b/Code/BasicFilters/otbVectorDataToLabelImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbVectorDataToLabelImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkImageSource.h"
 #include "otbMacro.h"
 
 #include "otbVectorData.h"
diff --git a/Code/BasicFilters/otbVectorDataToLabelImageFilter.txx b/Code/BasicFilters/otbVectorDataToLabelImageFilter.txx
index 9e2eea4630b7ebc604ed0356c281247c2de0cf14..fa6759dd5eb34ffb2fe90b9f7f38d50caf519a0a 100644
--- a/Code/BasicFilters/otbVectorDataToLabelImageFilter.txx
+++ b/Code/BasicFilters/otbVectorDataToLabelImageFilter.txx
@@ -21,7 +21,6 @@
 #include "otbVectorDataToLabelImageFilter.h"
 #include "otbOGRIOHelper.h"
 #include "otbGdalDataTypeBridge.h"
-#include "otbMacro.h"
 
 #include "gdal_alg.h"
 #include "ogr_srs_api.h"
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
index 71dce76f13d587948418eb323ef527b23fce7797..e6d26066494af16700f8258f16d9407c44b192c9 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbVectorImageTo3DScalarImageFilter_h
 #define __otbVectorImageTo3DScalarImageFilter_h
 
-#include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageToImageFilter.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.txx b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
index ed794852dd923f4c63045a78988b1e19886d035a..46e1ddbb8eadac5d5bd1e24da6d9d37dcbc92ed6 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbVectorImageToImageListFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
-#include "itkImageRegionConstIteratorWithIndex.h"
 #include <vector>
 #include "otbMacro.h"
 #include "itkProgressReporter.h"
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
index b2fca20bcb3055a65ab74d2c258a3346aefac1a5..a4df410c7146c9a2de62e01b192d5fcfb3c8cbdb 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbVectorImageToIntensityImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 #include "otbMath.h"
diff --git a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
index 563e910b8bd28b54053cf109486ac4cd45b1b8ea..4bae2b9c6d9a8a2de69b81754a1a746dc693f9ea 100644
--- a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkNumericTraits.h"
 #include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx
index f373391212c0b23fcf076261d32049ea2d4c119e..f6e5d1ed28d818cffb61522ee6c7a286a0907f28 100644
--- a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.txx
@@ -24,7 +24,6 @@
 
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
index 50444a74eac7f47a755c76f9e557a003a2a5a30a..41409e7a95f5ec72a9686bee31fe093552bb37ec 100644
--- a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkSampleToHistogramFilter.h"
-#include "itkDenseFrequencyContainer2.h"
 #include "itkHistogram.h"
 #include "itkListSample.h"
 #include "otbObjectList.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
index b88e4b92581964b187428605e7866cd03fd5616d..876a3a1645d75d84ccf369bf3c24234ce0ab52c7 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageBlackmanFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
index 75ff1d103e95e086d5e237cf12d2e862e072ffa3..1b92fb5e48badcb31d0b6489a7a9cf5ab2d25b08 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageCosineFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
index 8bf79aa04172a2f9720a5960109e16a1ac047fa7..ec2595b08956b31b0c082d4325cd75e43a7c9e16 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageGaussianFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
index 5aed0df7db5bb2a6e6848f7f3c8c820484d7649c..c980915f2a5261903928dd7fb2c168682ed5cac7 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageHammingFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
index 93272c1da59da077348f21c9a533fd6dffcf1a4c..754b51b6bd8fc2f7aa4194733ba0f24d26707193 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageLanczosFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
index 7273cfaae5fd688b98ff643d0e89e7a64b72769e..fe65c7f936ca3cfe69971b1f20309d0330e6eeb1 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageWelchFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "itkSize.h"
 #include "otbMath.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
index b2491f8d87e2c8ff0372086ac048e720071ad4d9..edfa33fd8258439e9dc11b7a2c1f3dd58d7abff9 100644
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
index d1259bef647e8ea1837585074b5da77d19fd0961..6aaa4d5e0ddbb980005566cfc43d725bb03e9810 100644
--- a/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
+++ b/Code/ChangeDetection/otbJoinHistogramMIImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbJoinHistogramMIImageFilter_h
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
-#include "itkHistogram.h"
 #include "otbJoinHistogramMI.h"
 
 namespace otb
diff --git a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index f843294c9d4144a86564acd63ecbe76ff653a9e0..561d01d6f54be755b21ba243d689661c483475d3 100644
--- a/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Code/ChangeDetection/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -21,7 +21,6 @@
 #ifndef __otbKullbackLeiblerSupervizedDistanceImageFilter_h
 #define __otbKullbackLeiblerSupervizedDistanceImageFilter_h
 
-#include "itkVariableLengthVector.h"
 #include "otbKullbackLeiblerDistanceImageFilter.h"
 
 #include "otbROIdataConversion.h"
diff --git a/Code/ChangeDetection/otbMeanRatioImageFilter.h b/Code/ChangeDetection/otbMeanRatioImageFilter.h
index 1c345f8b1dc09f103dff28e28803fadb30cf8afa..cbc08d43d386d740328cec95a466f012907e534c 100644
--- a/Code/ChangeDetection/otbMeanRatioImageFilter.h
+++ b/Code/ChangeDetection/otbMeanRatioImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbMeanRatioImageFilter_h
 #define __otbMeanRatioImageFilter_h
 
-#include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "otbMeanRatio.h"
 
 namespace otb
diff --git a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h b/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h
index f2ca308157b083d4391267de2b4f1ead7c89e835..c8579c8c8d98fb395e9ab447515f3d07054ea360 100644
--- a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbMultivariateAlterationDetectorImageFilter_h
 #define __otbMultivariateAlterationDetectorImageFilter_h
 
-#include "itkImageToImageFilter.h"
 
 #include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbConcatenateVectorImageFilter.h"
diff --git a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx b/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx
index fb6881207a72ada0d86ed009d3b021902be99554..666ae3e0fe7b94f5cdd5a415154a11792d3ec3f9 100644
--- a/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx
+++ b/Code/ChangeDetection/otbMultivariateAlterationDetectorImageFilter.txx
@@ -24,7 +24,6 @@
 #include "vnl/algo/vnl_matrix_inverse.h"
 #include "vnl/algo/vnl_generalized_eigensystem.h"
 
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
index f914cb4613044eaf9d5df14f09ec5e38b73f0cf8..97fde0633e478757555e1992b4f5307efe8f44c4 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
index dbf1f1a2c78094ecf9905b6d8e71866887aa8a83..afcbfcce165b6f39edfb5613257cfdc095b086e5 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/Common/otbDataNode.h b/Code/Common/otbDataNode.h
index 07ba9f2d1fe78ccdb931593565c150e914b5bff0..f536f3a786b5968e8aaab83602ea26ef76cde04e 100644
--- a/Code/Common/otbDataNode.h
+++ b/Code/Common/otbDataNode.h
@@ -19,7 +19,6 @@
 #define __otbDataNode_h
 
 #include "itkPoint.h"
-#include "otbPolyLineParametricPathWithValue.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
 #include "otbVectorDataKeywordlist.h"
diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx
index bda55ac30d5e31aef57581cbffbe886cdd642b82..4d7402f2914fdd54b0b6dc0b4cb540a8b69a5cee 100644
--- a/Code/Common/otbDataNode.txx
+++ b/Code/Common/otbDataNode.txx
@@ -20,7 +20,6 @@
 
 #include "otbDataNode.h"
 #include "otbMetaDataKey.h"
-#include "otbVectorDataKeywordlist.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbDataNodeImageFunction.h b/Code/Common/otbDataNodeImageFunction.h
index 5bafc42304798e7b79b7bc10d9ccb4be3bbd9d94..0ee929c42b1b7d8d97210ee64c85d759ed944a69 100644
--- a/Code/Common/otbDataNodeImageFunction.h
+++ b/Code/Common/otbDataNodeImageFunction.h
@@ -20,7 +20,6 @@
 
 #include "otbDataNodeFunctionBase.h"
 #include "otbDataNode.h"
-#include "itkIndex.h"
 #include "itkContinuousIndex.h"
 #include "itkImageBase.h"
 
diff --git a/Code/Common/otbDataNodeVectorDataFunction.h b/Code/Common/otbDataNodeVectorDataFunction.h
index f557f1f153f202daa2507078376dd93919938772..122b0f006b1d8654514c3a312a21aff69836945b 100644
--- a/Code/Common/otbDataNodeVectorDataFunction.h
+++ b/Code/Common/otbDataNodeVectorDataFunction.h
@@ -19,7 +19,6 @@
 #define __otbDataNodeVectorDataFunction_h
 
 #include "otbDataNodeFunctionBase.h"
-#include "otbDataNode.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProperties.h"
 
diff --git a/Code/Common/otbDifferenceImageFilter.txx b/Code/Common/otbDifferenceImageFilter.txx
index 489570acc7ff9658cd7f8d8629a99b5ee6944f6c..0e24a9ac103d1a054ff2b883e727ce51827fff6f 100644
--- a/Code/Common/otbDifferenceImageFilter.txx
+++ b/Code/Common/otbDifferenceImageFilter.txx
@@ -4,11 +4,9 @@
 #include "otbDifferenceImageFilter.h"
 
 #include "itkConstNeighborhoodIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.h b/Code/Common/otbDrawLineSpatialObjectFilter.h
index 23c28598492df53aa5a03d152e83f4af255eceb0..af303497fcf1d1c6e3fbc9f1d459ab5199ae2c0e 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.h
@@ -19,7 +19,6 @@
 #define __otbDrawLineSpatialObjectFilter_h
 
 #include "itkSpatialObjectToImageFilter.h"
-#include "itkLineSpatialObject.h"
 #include "otbLineSpatialObjectList.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
 
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.txx b/Code/Common/otbDrawLineSpatialObjectFilter.txx
index 19dc2885c8b05e2a4bb045ac64573d912a2c21d3..0f25a3268e021cff340b27cfaed7873ef148d37f 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.txx
@@ -24,7 +24,6 @@
 #include "itkMacro.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageIteratorWithIndex.h"
-#include "itkImageConstIteratorWithIndex.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbDrawLineSpatialObjectListFilter.txx b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
index eff28f2d66d6861f6e2e5267a366e8a174b2557c..df8feaac3db870eddd9ede2c1940bd4a7549cdc2 100644
--- a/Code/Common/otbDrawLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbDrawLineSpatialObjectListFilter.txx
@@ -23,7 +23,6 @@
 #include "itkLineIterator.h"
 #include "itkDataObject.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbDrawPathListFilter.h b/Code/Common/otbDrawPathListFilter.h
index 96625524b4d3c2854e90dbf7d2de36f600bdd789..c3b4e459914cc88afae390889de0135fa85414e8 100644
--- a/Code/Common/otbDrawPathListFilter.h
+++ b/Code/Common/otbDrawPathListFilter.h
@@ -19,7 +19,6 @@
 #define __otbDrawPathListFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkConceptChecking.h"
 #include "otbObjectList.h"
 
 namespace otb
diff --git a/Code/Common/otbDrawPathListFilter.txx b/Code/Common/otbDrawPathListFilter.txx
index 19edca86a820a786518f61576d9bf2cbea17597e..ade94420a3a8f6fe430df2ed9413abd2be0a9f93 100644
--- a/Code/Common/otbDrawPathListFilter.txx
+++ b/Code/Common/otbDrawPathListFilter.txx
@@ -22,7 +22,6 @@
 #include "otbDrawPathListFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "otbPolyLineImageIterator.h"
 #include "itkMetaDataObject.h"
 
diff --git a/Code/Common/otbExtractROI.txx b/Code/Common/otbExtractROI.txx
index 1b16035187ff65fdcbd7a291faee7d81381ebad0..21f24f8a1fc890bd6ab8a15d96c6894d368b7e13 100644
--- a/Code/Common/otbExtractROI.txx
+++ b/Code/Common/otbExtractROI.txx
@@ -20,7 +20,6 @@
 
 #include "otbExtractROI.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 
 namespace otb
diff --git a/Code/Common/otbExtractROIBase.txx b/Code/Common/otbExtractROIBase.txx
index da4dbf9ff1b4f08185b780ca263601335c76c046..deb23dcd3b5488be12b078049e37d4520251aed5 100644
--- a/Code/Common/otbExtractROIBase.txx
+++ b/Code/Common/otbExtractROIBase.txx
@@ -20,9 +20,7 @@
 
 #include "otbExtractROIBase.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkObjectFactory.h"
-#include "itkExtractImageFilterRegionCopier.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/Common/otbGISTable.h b/Code/Common/otbGISTable.h
index f6d9527fb894d10ecc2ce4b2c9ceaf59e89cf691..7663e34e54aec651a6ddb447fd75d8b3b5fe56f5 100644
--- a/Code/Common/otbGISTable.h
+++ b/Code/Common/otbGISTable.h
@@ -18,10 +18,8 @@
 #ifndef __otbGISTable_h
 #define __otbGISTable_h
 
-#include "itkDataObject.h"
 #include "itkObjectFactory.h"
 #include "itkPoint.h"
-#include "otbPolyLineParametricPathWithValue.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
 
diff --git a/Code/Common/otbGISTableSource.h b/Code/Common/otbGISTableSource.h
index 418b45e2008398f27aa601fac94f1eec709e27ca..f5713e5672f884a4c924920261bf3c165456a7a9 100644
--- a/Code/Common/otbGISTableSource.h
+++ b/Code/Common/otbGISTableSource.h
@@ -21,7 +21,6 @@
 
 
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkMacro.h"
 
 namespace otb
diff --git a/Code/Common/otbGISTableToLabelMapFilter.h b/Code/Common/otbGISTableToLabelMapFilter.h
index 25cf0d829ca1e7759979c9c80f3c67ed955f9f02..d4cbb41adb3b37f5e96e3130791c61f9878b6047 100644
--- a/Code/Common/otbGISTableToLabelMapFilter.h
+++ b/Code/Common/otbGISTableToLabelMapFilter.h
@@ -19,9 +19,7 @@
 #define __otbGISTableToLabelMapFilter_h
 
 //#include "itkImageToImageFilter.h"
-#include "itkDataObject.h"
 #include "otbLabelMapSource.h"
-#include "otbGISTable.h"
 //include "otbLabelMap.h"
 #include "otbVectorData.h"
 #include "otbGISTableToVectorDataFilter.h"
diff --git a/Code/Common/otbGISTableToVectorDataFilter.h b/Code/Common/otbGISTableToVectorDataFilter.h
index 377568eac24625662fcba410a569c1d12ba5377d..a918c06214703d4cda7ccd1191a325e33694761c 100644
--- a/Code/Common/otbGISTableToVectorDataFilter.h
+++ b/Code/Common/otbGISTableToVectorDataFilter.h
@@ -19,7 +19,6 @@
 #define __otbGISTableToVectorDataFilter_h
 
 //#include "itkImageToImageFilter.h"
-#include "itkDataObject.h"
 #include "otbVectorDataSource.h"
 #include "otbGISTable.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Code/Common/otbGenericInterpolateImageFunction.h b/Code/Common/otbGenericInterpolateImageFunction.h
index 0095557a0297d2e0f58d4ea75f7484d0538c4650..7fd61dd31e0ae1ef825ae6435fc80cfe54d19807 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.h
+++ b/Code/Common/otbGenericInterpolateImageFunction.h
@@ -21,7 +21,6 @@
 #include "itkInterpolateImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkConstantBoundaryCondition.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbImageListToVectorImageFilter.txx b/Code/Common/otbImageListToVectorImageFilter.txx
index 08e09c707924cc3906195c68eb89918af64dfee5..d8ae323ea8cd558b0080217dba4f136bef788796 100644
--- a/Code/Common/otbImageListToVectorImageFilter.txx
+++ b/Code/Common/otbImageListToVectorImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbImageListToVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include <vector>
 #include "otbMacro.h"
 #include "itkProgressReporter.h"
diff --git a/Code/Common/otbImageRegionAdaptativeSplitter.h b/Code/Common/otbImageRegionAdaptativeSplitter.h
index b4a434548202ba3170db231ddaa604a1b7863eca..5578b660cb76bd71ee3fdb8d1e6bf4a2befa9d83 100644
--- a/Code/Common/otbImageRegionAdaptativeSplitter.h
+++ b/Code/Common/otbImageRegionAdaptativeSplitter.h
@@ -19,11 +19,8 @@
 #ifndef __otbImageRegionAdaptativeSplitter_h
 #define __otbImageRegionAdaptativeSplitter_h
 
-#include "itkObject.h"
 #include "itkRegion.h"
-#include "itkImageRegion.h"
 #include "itkImageRegionSplitter.h"
-#include "itkObjectFactory.h"
 #include "itkIndex.h"
 #include "itkSize.h"
 #include "itkFastMutexLock.h"
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
index e43b6b06cc9b0942d37bf92189d132dad3409ab4..cdfa1ed4aa44354c9ea02be6e15fee7b745cc7a5 100644
--- a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -21,7 +21,6 @@
 #ifndef __otbImageRegionNonUniformMultidimensionalSplitter_h
 #define __otbImageRegionNonUniformMultidimensionalSplitter_h
 
-#include "itkObject.h"
 #include "itkRegion.h"
 #include "itkObjectFactory.h"
 #include "itkIndex.h"
diff --git a/Code/Common/otbImageRegionSquareTileSplitter.h b/Code/Common/otbImageRegionSquareTileSplitter.h
index 10dd5b71e45436d6640a2e1f401d2a46d0ca59ed..8fe331d0e8654025c1220ec22fb00a4d077bc744 100644
--- a/Code/Common/otbImageRegionSquareTileSplitter.h
+++ b/Code/Common/otbImageRegionSquareTileSplitter.h
@@ -19,9 +19,7 @@
 #ifndef __otbImageRegionSquareTileSplitter_h
 #define __otbImageRegionSquareTileSplitter_h
 
-#include "itkObject.h"
 #include "itkRegion.h"
-#include "itkImageRegion.h"
 #include "itkImageRegionSplitter.h"
 #include "itkObjectFactory.h"
 #include "itkIndex.h"
diff --git a/Code/Common/otbImageRegionTileMapSplitter.h b/Code/Common/otbImageRegionTileMapSplitter.h
index ae942999f5bac4edb073527a3749191757699076..6f117c929b6c0dfe48e35288e5d790b4c007f06b 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.h
+++ b/Code/Common/otbImageRegionTileMapSplitter.h
@@ -19,9 +19,7 @@
 #ifndef __otbImageRegionTileMapSplitter_h
 #define __otbImageRegionTileMapSplitter_h
 
-#include "itkObject.h"
 #include "itkRegion.h"
-#include "itkImageRegion.h"
 #include "itkImageRegionSplitter.h"
 #include "itkObjectFactory.h"
 #include "itkIndex.h"
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.h b/Code/Common/otbImageToLineSpatialObjectListFilter.h
index e969d4c2c48d1425491735d55ddc2c32c9dafd1d..a6be5e3a5f3b69f0b19f2045b70dde0703e9f8ea 100644
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.h
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.h
@@ -21,7 +21,6 @@
 
 #include "itkProcessObject.h"
 #include "otbLineSpatialObjectList.h"
-#include "itkLineSpatialObject.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbLineSpatialObjectListToPointSetFilter.h b/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
index 193c06b140cf71c55a3dbbbd64c56562ddb264a7..7563c4c7646e5d4a18b581fd62945625d41d069a 100644
--- a/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Code/Common/otbLineSpatialObjectListToPointSetFilter.h
@@ -21,7 +21,6 @@
 
 #include "itkProcessObject.h"
 #include "otbLineSpatialObjectList.h"
-#include "itkLineSpatialObject.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbMultiChannelExtractROI.txx b/Code/Common/otbMultiChannelExtractROI.txx
index b9dfc6fd7d75b4ff4d1fc18ac9dbc22f2533e9a9..5d10b1ba715aa10e98ceee5f198c309dcc884093 100644
--- a/Code/Common/otbMultiChannelExtractROI.txx
+++ b/Code/Common/otbMultiChannelExtractROI.txx
@@ -21,7 +21,6 @@
 #include "otbMultiChannelExtractROI.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkObjectFactory.h"
 #include "itkExtractImageFilterRegionCopier.h"
 #include "itkProgressReporter.h"
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.h b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
index 6ff7fdfabe0b9cf74823b0b76873782156ce3a0e..6cd7a0648810c4a6375a2addff2443e821a5c9d4 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.h
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbOGRDataSourceToLabelImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkImageSource.h"
 #include "otbMacro.h"
 
 
diff --git a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
index 9174fefbab3649be2f9bae5fc97e6cb8e8f13ea5..ce9ac95aa156f965fea978c1ee06936c0d61813e 100644
--- a/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
+++ b/Code/Common/otbOGRDataSourceToLabelImageFilter.txx
@@ -19,7 +19,6 @@
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "otbOGRIOHelper.h"
 #include "otbGdalDataTypeBridge.h"
-#include "otbMacro.h"
 
 #include "gdal_alg.h"
 #include "stdint.h" //needed for uintptr_t
diff --git a/Code/Common/otbPathListToHistogramGenerator.h b/Code/Common/otbPathListToHistogramGenerator.h
index 14b233811ce10cba2d8888bc7cc952d3db79dffd..1f11cb38e93bd3b76e2161d40ed5ba7a989f446d 100644
--- a/Code/Common/otbPathListToHistogramGenerator.h
+++ b/Code/Common/otbPathListToHistogramGenerator.h
@@ -21,10 +21,8 @@
 
 #include "itkSampleToHistogramFilter.h"
 #include "itkHistogram.h"
-#include "itkProcessObject.h"
 #include "itkListSample.h"
 #include "itkVector.h"
-#include "itkDenseFrequencyContainer2.h"
 #include "otbObjectList.h"
 
 //TODO : write a HistogramSource when outputing Histogram
diff --git a/Code/Common/otbPersistentImageToOGRDataFilter.h b/Code/Common/otbPersistentImageToOGRDataFilter.h
index 8f5669f4d05ad12a5a8a4f9ed8a1e3fa11655995..9861eedbacc5b5d8b22d4c7f3b198fe8e70e152a 100644
--- a/Code/Common/otbPersistentImageToOGRDataFilter.h
+++ b/Code/Common/otbPersistentImageToOGRDataFilter.h
@@ -24,7 +24,6 @@
 #include "otbPersistentImageFilter.h"
 
 #include "otbLabelImageToOGRDataSourceFilter.h"
-#include "otbOGRDataSourceWrapper.h"
 
 #include "itkMacro.h"
 #include <string>
diff --git a/Code/Common/otbPipelineMemoryPrintCalculator.h b/Code/Common/otbPipelineMemoryPrintCalculator.h
index fec7d08f0c627883aa2c15f7c992fccfe6fd19c2..bfcf83f34347a5da92bd452dbeaa032498af6112 100644
--- a/Code/Common/otbPipelineMemoryPrintCalculator.h
+++ b/Code/Common/otbPipelineMemoryPrintCalculator.h
@@ -19,7 +19,6 @@
 #define __otbPipelineMemoryPrintCalculator_h
 
 #include "itkProcessObject.h"
-#include "itkDataObject.h"
 #include "itksys/FundamentalType.h"
 #include <set>
 
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Code/Common/otbPointSetAndValuesFunction.h
index d26feeec75e1e9d21610d970e695111deb0c9ca7..2bd80fa39ff567783518c0514fe720f535fb2dce 100644
--- a/Code/Common/otbPointSetAndValuesFunction.h
+++ b/Code/Common/otbPointSetAndValuesFunction.h
@@ -19,7 +19,6 @@
 #define __otbPointSetAndValuesFunction_h
 
 #include "itkFunctionBase.h"
-#include "itkPoint.h"
 #include "itkIndex.h"
 #include "itkContinuousIndex.h"
 #include "itkVectorContainer.h"
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Code/Common/otbPolyLineImageIterator.h
index 2b40a12dc2c45a5a0fdff2aacea43391561c6de9..df68be6a9bc4d2abeb5095945e3696e2a7c79be3 100644
--- a/Code/Common/otbPolyLineImageIterator.h
+++ b/Code/Common/otbPolyLineImageIterator.h
@@ -18,7 +18,6 @@
 #ifndef __otbPolyLineImageIterator_h
 #define __otbPolyLineImageIterator_h
 
-#include "itkIndex.h"
 #include "itkImage.h"
 #include "otbPolyLineImageConstIterator.h"
 
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.h b/Code/Common/otbPolyLineParametricPathWithValue.h
index a63bb4a3767389eeb4ff0f61bbdf777ed03f019a..824572eca8043948369959f87c9ae2518527eeed 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.h
+++ b/Code/Common/otbPolyLineParametricPathWithValue.h
@@ -20,7 +20,6 @@
 
 #include "itkPolyLineParametricPath.h"
 #include "itkMetaDataObject.h"
-#include "itkImageRegion.h"
 #include "otbRemoteSensingRegion.h"
 #include "otbMacro.h"
 
diff --git a/Code/Common/otbRectangle.h b/Code/Common/otbRectangle.h
index e222d597b4b4a124f2929041b2bd8b99e9363a09..552947ba15c46d4d951273c98dcb42f45f1bf045 100644
--- a/Code/Common/otbRectangle.h
+++ b/Code/Common/otbRectangle.h
@@ -18,10 +18,8 @@
 #ifndef __otbRectangle_h
 #define __otbRectangle_h
 
-#include "itkObject.h"
 #include "itkImageRegion.h"
 
-#include "itkContinuousIndex.h"
 #include "itkVectorContainer.h"
 
 namespace otb
diff --git a/Code/Common/otbRemoteSensingRegion.h b/Code/Common/otbRemoteSensingRegion.h
index 22c8b1a7a0bf7f7ab6584fa9c529d5856bb26058..baaa5931e4b0d466c254579ce0bf827e64381472 100644
--- a/Code/Common/otbRemoteSensingRegion.h
+++ b/Code/Common/otbRemoteSensingRegion.h
@@ -21,10 +21,8 @@
 #include <algorithm>
 #include <iomanip>
 
-#include "itkObjectFactory.h"
 
 #include "itkContinuousIndex.h"
-#include "itkRegion.h"
 #include "otbImageKeywordlist.h"
 #include "itkImageRegion.h"
 
diff --git a/Code/Common/otbStreamingManager.h b/Code/Common/otbStreamingManager.h
index 96ba2466a44873de9157b6e44bca8908bad1e274..e6976acb7a3868cc15863e2bbc2947124092692c 100644
--- a/Code/Common/otbStreamingManager.h
+++ b/Code/Common/otbStreamingManager.h
@@ -19,7 +19,6 @@
 #define __otbStreamingManager_h
 
 #include "otbMacro.h"
-#include "otbConfigure.h"
 
 #include "itkObject.h"
 #include "itkDataObject.h"
diff --git a/Code/Common/otbStreamingManager.txx b/Code/Common/otbStreamingManager.txx
index 4aead8bf8c2661699a6bba636a4c10eff9d354f6..709ddddb056d4cb5b649264e6ce0ff815b0c3b86 100644
--- a/Code/Common/otbStreamingManager.txx
+++ b/Code/Common/otbStreamingManager.txx
@@ -19,7 +19,6 @@
 #define __otbStreamingManager_txx
 
 #include "otbStreamingManager.h"
-#include "otbMacro.h"
 #include "otbConfigure.h"
 #include "otbConfigurationFile.h"
 #include "itkExtractImageFilter.h"
diff --git a/Code/Common/otbStreamingTraits.h b/Code/Common/otbStreamingTraits.h
index e8ffb3ea8da0970ff1165a32a91c6cf6f59796cc..9972cf40a36a77f69bcc3600f956ba57b771e7df 100644
--- a/Code/Common/otbStreamingTraits.h
+++ b/Code/Common/otbStreamingTraits.h
@@ -19,7 +19,6 @@
 #define __otbStreamingTraits_h
 
 #include "otbMacro.h"
-#include "otbConfigure.h"
 
 #include "itkInterpolateImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
@@ -36,7 +35,6 @@
 
 #include "otbProlateInterpolateImageFunction.h"
 
-#include "otbVectorImage.h"
 
 namespace otb
 {
diff --git a/Code/Common/otbStreamingTraits.txx b/Code/Common/otbStreamingTraits.txx
index e50c6bc8d1f5971370ccb9e58fc8a45e07ab1c87..a57ae171434b721fea7d63004755fe693440be48 100644
--- a/Code/Common/otbStreamingTraits.txx
+++ b/Code/Common/otbStreamingTraits.txx
@@ -21,13 +21,10 @@
 #include <boost/cstdint.hpp>
 
 #include "otbStreamingTraits.h"
-#include "otbMacro.h"
 #include "otbConfigure.h"
 #include "otbConfigurationFile.h"
 
-#include "itkInterpolateImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 
 namespace otb
diff --git a/Code/Common/otbTransform.h b/Code/Common/otbTransform.h
index 7399144d2a3c516873f16de6a556ad206461ad84..4aca4473322ba075ab68716b1743c505e8e236b1 100644
--- a/Code/Common/otbTransform.h
+++ b/Code/Common/otbTransform.h
@@ -19,7 +19,6 @@
 #define __otbTransform_h
 
 #include "itkTransform.h"
-#include "itkVector.h"
 #include "vnl/vnl_vector_fixed.h"
 
 
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
index a39ead2037933557385e961d1ec82da75a213274..3ee51a2ec6c0d4a99f5664154710f11a08be423c 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 #include "itkZeroFluxNeumannBoundaryCondition.h"
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
index b2bc6fab420002fa27366bb0615efbad7f5b79ce..a0c040c668c5b9d4d6c93e6e85b4c1c6bf8e78f7 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 #include "itkZeroFluxNeumannBoundaryCondition.h"
diff --git a/Code/Common/otbVariableLengthVectorConverter.h b/Code/Common/otbVariableLengthVectorConverter.h
index bf184de507467305f35aeb598cdc7a678f9c9723..0cc709e3673d1b0b7bb1ba1f247ed4e7d16805b0 100644
--- a/Code/Common/otbVariableLengthVectorConverter.h
+++ b/Code/Common/otbVariableLengthVectorConverter.h
@@ -20,7 +20,6 @@
 
 #include "itkProcessObject.h"
 #include "itkVariableLengthVector.h"
-#include "itkNumericTraits.h"
 #include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "itkHistogram.h"
diff --git a/Code/Common/otbVariableLengthVectorConverter.txx b/Code/Common/otbVariableLengthVectorConverter.txx
index 73db4a4fcedac5844ff5d32d2fb1fdb3b55c0024..d689c406362f5c3812c82dd742f0c1afb54a81be 100644
--- a/Code/Common/otbVariableLengthVectorConverter.txx
+++ b/Code/Common/otbVariableLengthVectorConverter.txx
@@ -19,7 +19,6 @@
 #define __otbVariableLengthVectorConverter_txx
 
 #include "otbVariableLengthVectorConverter.h"
-#include "itkNumericTraits.h"
 #include <complex>
 
 
diff --git a/Code/Common/otbVectorData.h b/Code/Common/otbVectorData.h
index d351a7aa969143f51ad808a7b4dcc6948f8e6577..2189e0c2e888bec97d044b9564b77510ca45646d 100644
--- a/Code/Common/otbVectorData.h
+++ b/Code/Common/otbVectorData.h
@@ -21,7 +21,6 @@
 #include "itkTreeContainer.h"
 #include "itkDataObject.h"
 #include "otbDataNode.h"
-#include "itkVector.h"
 #include "itkPoint.h"
 
 namespace otb
diff --git a/Code/Common/otbVectorDataProperties.h b/Code/Common/otbVectorDataProperties.h
index 05aaa39269d6b9faf41b94bac5008841ac61a662..c71d58dbc55ab50ddee154f532803d5416beec0b 100644
--- a/Code/Common/otbVectorDataProperties.h
+++ b/Code/Common/otbVectorDataProperties.h
@@ -19,7 +19,6 @@
 #ifndef __otbVectorDataProperties_h
 #define __otbVectorDataProperties_h
 
-#include "itkDataObject.h"
 #include "itkObjectFactory.h"
 
 // #include "itkNumericTraits.h"
diff --git a/Code/Common/otbVectorDataSource.h b/Code/Common/otbVectorDataSource.h
index 841267e0e3d7c78388c22d94f0d13e1cbb03f759..5a97920ee6ea4abeb03a304fdef1ffe87883186d 100644
--- a/Code/Common/otbVectorDataSource.h
+++ b/Code/Common/otbVectorDataSource.h
@@ -21,7 +21,6 @@
 
 
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkMacro.h"
 
 namespace otb
diff --git a/Code/Common/otbVectorDataToGISTableFilter.h b/Code/Common/otbVectorDataToGISTableFilter.h
index 5e166b5af4b6d0fc1a3c6ac81bcd2e8d5e7f7f1d..ef309bd338bb6c30203461e1c915abcdb2a88ccc 100644
--- a/Code/Common/otbVectorDataToGISTableFilter.h
+++ b/Code/Common/otbVectorDataToGISTableFilter.h
@@ -22,7 +22,6 @@
 //#include "itkAttributeLabelObject.h"
 #include "otbGISTableSource.h"
 #include "otbGISConnectionImplementation.h"
-#include "otbVectorData.h"
 #include <iostream>
 #include <sstream>
 #include <string>
diff --git a/Code/Common/otbVectorDataToImageFilter.h b/Code/Common/otbVectorDataToImageFilter.h
index 9a240d0c32acd4fb4d18604867239210ca9a61bb..205572a833e2efafb2feb43dac40f830d712f8a3 100644
--- a/Code/Common/otbVectorDataToImageFilter.h
+++ b/Code/Common/otbVectorDataToImageFilter.h
@@ -22,7 +22,6 @@
 #include "itkImageSource.h"
 #include "otbRGBAPixelConverter.h"
 #include "otbVectorDataExtractROI.h"
-#include "otbRemoteSensingRegion.h"
 
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/map.hpp>
diff --git a/Code/Common/otbVectorDataToMapFilter.h b/Code/Common/otbVectorDataToMapFilter.h
index e784ac0af7be294b1b688b3931c3a19ae4b577f2..a1ff2a4614b57a6813ec1f9aad24f0f19abc9933 100644
--- a/Code/Common/otbVectorDataToMapFilter.h
+++ b/Code/Common/otbVectorDataToMapFilter.h
@@ -22,7 +22,6 @@
 #include "itkImageSource.h"
 #include "otbRGBAPixelConverter.h"
 #include "otbVectorDataExtractROI.h"
-#include "otbRemoteSensingRegion.h"
 
 #include <mapnik/memory_datasource.hpp>
 #include <mapnik/map.hpp>
diff --git a/Code/Common/otbVectorImageToASPixelAccessor.h b/Code/Common/otbVectorImageToASPixelAccessor.h
index 6f6a819331c0a7a871246ca98a915f5f6349deed..dbe8620c4c48f0db0f0c99479d92a18ad94a95fa 100644
--- a/Code/Common/otbVectorImageToASPixelAccessor.h
+++ b/Code/Common/otbVectorImageToASPixelAccessor.h
@@ -19,7 +19,6 @@
 #ifndef __otbVectorImageToASPixelAccessor_h
 #define __otbVectorImageToASPixelAccessor_h
 
-#include "itkFixedArray.h"
 #include "itkVector.h"
 
 namespace otb
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
index 3311ed700c8582fd81ae796b1c9bda6721427290..cfb6fccecb8da7f59465c1299cd19dc022429c6b 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx
@@ -19,12 +19,9 @@
 #define __otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
 
 #include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "itkLandmarkDisplacementFieldSource.h"
 #include "otbObjectList.h"
-#include "otbImage.h"
 #include "otbMacro.h"
-#include "otbMath.h"
 
 namespace otb
 {
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.h b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
index 51608d152afc2937ee0a8e028614d61ed3cb9a81..1d88c90d43f1710a19a16a13b4840592fc95ef9f 100644
--- a/Code/DisparityMap/otbDisparityMapEstimationMethod.h
+++ b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
@@ -18,7 +18,6 @@
 #ifndef __otbDisparityMapEstimationMethod_h
 #define __otbDisparityMapEstimationMethod_h
 
-#include "itkProcessObject.h"
 #include "itkImageToImageMetric.h"
 #include "itkSingleValuedNonLinearOptimizer.h"
 #include "itkDataObjectDecorator.h"
diff --git a/Code/DisparityMap/otbDisparityMapMedianFilter.txx b/Code/DisparityMap/otbDisparityMapMedianFilter.txx
index b90b16536a455c82591cc139084c7a38ce4f4fe5..cf5255f9669dd8651cc1843cf2f38dfb6d5ff81e 100644
--- a/Code/DisparityMap/otbDisparityMapMedianFilter.txx
+++ b/Code/DisparityMap/otbDisparityMapMedianFilter.txx
@@ -19,7 +19,6 @@
 #define __otbDisparityMapMedianFilter_txx
 
 #ifdef ITK_USE_CONSOLIDATED_MORPHOLOGY
-#include "itkOptMedianImageFilter.h"
 #else
 
 #include "otbDisparityMapMedianFilter.h"
diff --git a/Code/DisparityMap/otbLineOfSightOptimizer.h b/Code/DisparityMap/otbLineOfSightOptimizer.h
index cdb9e2e273fb4d6820ae5e9793a9a3b1b2025b4a..e6997772e23c22e5457ce3aa927f77616b79b1a3 100644
--- a/Code/DisparityMap/otbLineOfSightOptimizer.h
+++ b/Code/DisparityMap/otbLineOfSightOptimizer.h
@@ -19,7 +19,6 @@
 #define __otbLineOfSightOptimizer_h
 
 #include "itkObject.h"
-#include "itkDefaultStaticMeshTraits.h"
 
 #include "itkPointSet.h"
 
diff --git a/Code/DisparityMap/otbMulti3DMapToDEMFilter.h b/Code/DisparityMap/otbMulti3DMapToDEMFilter.h
index 95f2ae14a52936ec3889b7f7406ac8bf932cfd37..7c8431d027e9271eba40a89ce764674cf202a36d 100644
--- a/Code/DisparityMap/otbMulti3DMapToDEMFilter.h
+++ b/Code/DisparityMap/otbMulti3DMapToDEMFilter.h
@@ -19,7 +19,6 @@
 #define __otbMulti3DMapToDEMFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "otbGenericRSTransform.h"
 #include "otbImageToGenericRSOutputParameters.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Code/DisparityMap/otbMulti3DMapToDEMFilter.txx b/Code/DisparityMap/otbMulti3DMapToDEMFilter.txx
index 1b1f76aa9bef66871c1069fb5afa78faeb4982b6..2acf42a922eaf2dce2d211d1a0d06f388d74220d 100644
--- a/Code/DisparityMap/otbMulti3DMapToDEMFilter.txx
+++ b/Code/DisparityMap/otbMulti3DMapToDEMFilter.txx
@@ -21,9 +21,7 @@
 #include "otbMulti3DMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
-#include "otbImageToGenericRSOutputParameters.h"
 #include "otbInverseSensorModel.h"
 
 namespace otb
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.h b/Code/DisparityMap/otbNCCRegistrationFunction.h
index 8d2d97f2508e793aeb38d26b8b6ea2e69a172839..319a6c203ef4432bc5a5cb9dfca9bdbda2db585b 100644
--- a/Code/DisparityMap/otbNCCRegistrationFunction.h
+++ b/Code/DisparityMap/otbNCCRegistrationFunction.h
@@ -23,7 +23,6 @@
 
 #include "itkPDEDeformableRegistrationFunction.h"
 #include "itkPoint.h"
-#include "itkCovariantVector.h"
 #include "itkInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkCentralDifferenceImageFunction.h"
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
index 33d3644dc3cc346784ecf1a720ff9003c01a2d8f..226beb0b799a947fa5a4fdc4e67b7aacfc9d024c 100644
--- a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.h
@@ -21,7 +21,6 @@
 
 #include "itkImageToImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "otbImage.h"
 
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
index 594bfb1225cf8735b26607636ea36deb7abdd39e..aef57cabe6123156a0f8b01631c91e436dff7b7e 100644
--- a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
+++ b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
@@ -19,7 +19,6 @@
 #define __otbPixelWiseBlockMatchingImageFilter_txx
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 #include "itkConstantBoundaryCondition.h"
diff --git a/Code/DisparityMap/otbStreamingWarpImageFilter.txx b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
index a117c92403879b90a49b53ffb98744d1c39a70e7..a3e9972a3b5117584e0b984f6c3d0cdf0ec9f693 100644
--- a/Code/DisparityMap/otbStreamingWarpImageFilter.txx
+++ b/Code/DisparityMap/otbStreamingWarpImageFilter.txx
@@ -22,7 +22,6 @@
 #define __otbStreamingWarpImageFilter_txx
 
 #include "otbStreamingWarpImageFilter.h"
-#include "otbStreamingTraits.h"
 #include "itkImageRegionIteratorWithIndex.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbAddCarvingPathFilter.h b/Code/FeatureExtraction/otbAddCarvingPathFilter.h
index 90f697adbdb7f13e461f8db2098f93a647c0007f..64861ab2ba56d7096064f8bd4767bd2a83fb1343 100644
--- a/Code/FeatureExtraction/otbAddCarvingPathFilter.h
+++ b/Code/FeatureExtraction/otbAddCarvingPathFilter.h
@@ -19,7 +19,6 @@
 #define __otbAddCarvingPathFilter_h
 
 #include "itkImageAndPathToImageFilter.h"
-#include "itkImageSliceConstIteratorWithIndex.h"
 #include "itkImageSliceIteratorWithIndex.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
index bc47f812b3ae19a360f5cc2339190d4c81d9f617..20b4f53d88ef34e7a0edd94277496f896af18d68 100644
--- a/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorImageFilter.h
@@ -20,7 +20,6 @@
 
 #include "itkImageToImageFilter.h"
 
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbLineRatioDetectorImageFilter.h"
 #include "otbLineCorrelationDetectorImageFilter.h"
 #include "otbAssociativeSymmetricalSumImageFilter.h"
diff --git a/Code/FeatureExtraction/otbCloudDetectionFunctor.h b/Code/FeatureExtraction/otbCloudDetectionFunctor.h
index 36a58fee2ca41fa00e13d10668f57c925e62ff71..026fd420cbeeb843ccf07c899f2e8ef5faedb0bb 100644
--- a/Code/FeatureExtraction/otbCloudDetectionFunctor.h
+++ b/Code/FeatureExtraction/otbCloudDetectionFunctor.h
@@ -18,7 +18,6 @@
 #ifndef __otbCloudDetectionFunctor_h
 #define __otbCloudDetectionFunctor_h
 
-#include "otbMath.h"
 #include "otbCloudEstimatorFunctor.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbCloudEstimatorFunctor.h b/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
index d6ec9c2805a090dfd4683e524031514c13604739..70949b8179064bb9167fa65b5bacf25dacc5987a 100644
--- a/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
+++ b/Code/FeatureExtraction/otbCloudEstimatorFunctor.h
@@ -18,7 +18,6 @@
 #ifndef __otbCloudEstimatorFunctor_h
 #define __otbCloudEstimatorFunctor_h
 
-#include "otbMath.h"
 #include "otbSpectralAngleFunctor.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index c1f879ceeca200a150191fc5248483d807e0d8a6..52d381ab88e2edb17ecc64d3f1e526571509fa2c 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -20,7 +20,6 @@
 
 #include "otbComplexMomentPathFunction.h"
 #include "itkImageRegionIterator.h"
-#include "itkImage.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "otbMacro.h"
 
diff --git a/Code/FeatureExtraction/otbComplexMomentsImageFunction.txx b/Code/FeatureExtraction/otbComplexMomentsImageFunction.txx
index 219a916444fd13f3d539aff8dadb5edc1919b8f7..019834ab9ad3558a7b17266b94bc28ba162186f8 100644
--- a/Code/FeatureExtraction/otbComplexMomentsImageFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentsImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbComplexMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
index b745fe9a90c7b0b03f64161e01361abf2741eb12..fd08f40f4a531f069e4a007377481e85a5a733d4 100644
--- a/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
+++ b/Code/FeatureExtraction/otbExtractSegmentsImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbExtractSegmentsImageFilter_h
 #define __otbExtractSegmentsImageFilter_h
 
-#include "itkImageToImageFilter.h"
 
 #include "otbPixelSuppressionByDirectionImageFilter.h"
 #include "otbLocalHoughFilter.h"
@@ -26,7 +25,6 @@
 #include "otbDrawLineSpatialObjectListFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
-#include "otbLineSpatialObjectList.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx b/Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx
index e6bbd16130ccebfe37e134d8d1038b33033c68d0..e96c00ae2b737f85ba74e7c44faf24b728e14058 100644
--- a/Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserMomentsImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbFlusserMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 #include <complex>
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
index cbb9511e3e0bdd502fc2c5494ff872dd541450f6..07aa705ce3b92d9664af583877fecfee46eb7b06 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
@@ -20,7 +20,6 @@
 #define __otbForwardFourierMellinTransformImageFilter_h
 
 #include "otbImage.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkImageToImageFilter.h"
 #include "itkVnlForwardFFTImageFilter.h"
 #include "otbLogPolarTransform.h"
diff --git a/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx b/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx
index 2df8e20d6136b5a7984be65b0ee07234e5e1fb9b..1b8b68572624d3ced680ef2cba701edf252f41f1 100644
--- a/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx
+++ b/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbFourierMellinDescriptorsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 #include "otbMath.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
index ff2eda4a91908d847750b821bdd17c6fb4392474..137eae43b3de7b5f57f8723ff92d1b9c5fefe076 100644
--- a/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbGenericRoadExtractionFilter.h
@@ -18,10 +18,8 @@
 #ifndef __otbGenericRoadExtractionFilter_h
 #define __otbGenericRoadExtractionFilter_h
 
-#include "itkCovariantVector.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageToPathListFilter.h"
 #include "itkSqrtImageFilter.h"
diff --git a/Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx b/Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx
index 0503767b6756ed6d6ff2301984f44b728229e3f9..d858c8bcf1af1b0d364b9970820c3e352434b711 100644
--- a/Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx
+++ b/Code/FeatureExtraction/otbHaralickTexturesImageFunction.txx
@@ -22,7 +22,6 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 #include <complex>
 #include <cmath>
 
diff --git a/Code/FeatureExtraction/otbHarrisImageFilter.h b/Code/FeatureExtraction/otbHarrisImageFilter.h
index 6b6897d0361bd4b0c9ab49462b149eeb8d1b4ea0..4abb345b8deb59da15a7191c24c3923860c55770 100644
--- a/Code/FeatureExtraction/otbHarrisImageFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageFilter.h
@@ -19,9 +19,7 @@
 #define __otbHarrisImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkRecursiveGaussianImageFilter.h"
 #include "itkHessianRecursiveGaussianImageFilter.h"
-#include "itkSymmetricSecondRankTensor.h"
 #include "otbHessianToScalarImageFilter.h"
 #include "otbMultiplyByScalarImageFilter.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
index eb69173c6f0704ebc85c000079d0afdfe10b7246..f14958b303eaa3b3a0a24986775d22d77d22ac30 100644
--- a/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
+++ b/Code/FeatureExtraction/otbHarrisImageToPointSetFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbHarrisImageToPointSetFilter_h
 #define __otbHarrisImageToPointSetFilter_h
 
-#include "otbImageToPointSetFilter.h"
 #include "otbThresholdImageToPointSetFilter.h"
 #include "otbHarrisImageFilter.h"
 
diff --git a/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx b/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx
index 94bbfd86958dee5fe2834c63fb970897649c3935..fbefccd4297f066c6828ebfa58f4bae23d50b291 100644
--- a/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx
+++ b/Code/FeatureExtraction/otbHistogramOfOrientedGradientCovariantImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbHistogramOfOrientedGradientCovariantImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 #include "otbMath.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
index a45e27644c88900c6a14026fb88826423048b8a8..a7b0f8397dc1f7ae33efcfdaf9ea00707ddda149 100644
--- a/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
+++ b/Code/FeatureExtraction/otbHoughTransform2DLinesImageFilter.txx
@@ -19,7 +19,6 @@
 #define __otbHoughTransform2DLinesImageFilter_txx
 
 #include "otbHoughTransform2DLinesImageFilter.h"
-#include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Code/FeatureExtraction/otbHuMomentsImageFunction.txx b/Code/FeatureExtraction/otbHuMomentsImageFunction.txx
index a192250f53212ad3ce17fbcb352c1db6d3070968..c7668f1626a6bfc9987598481f3eb7b701a9c06f 100644
--- a/Code/FeatureExtraction/otbHuMomentsImageFunction.txx
+++ b/Code/FeatureExtraction/otbHuMomentsImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbHuMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 #include <complex>
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
index 1d4f401825bedc60ac4e2c48d61ae3bcefdab26e..5cb12c555ac56183b5779b0ea16d154c162472d7 100644
--- a/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
+++ b/Code/FeatureExtraction/otbImageFittingPolygonListFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbImageFittingPolygonListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
-#include "otbMacro.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbImageFunctionAdaptor.h b/Code/FeatureExtraction/otbImageFunctionAdaptor.h
index cc3df7e217515765f7c9f8a9a90832dce235f2b2..ea85901ff476cd8dee1c9da1d614d9d80c77da13 100644
--- a/Code/FeatureExtraction/otbImageFunctionAdaptor.h
+++ b/Code/FeatureExtraction/otbImageFunctionAdaptor.h
@@ -19,7 +19,6 @@
 #define __otbImageFunctionAdaptor_h
 
 #include "itkImageFunction.h"
-#include "itkNumericTraits.h"
 
 #include "otbVariableLengthVectorConverter.h"
 
diff --git a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
index ae5fe59dccb24be7c782af324d2b51613adc9103..3db9a7dfac7da78698ccf7db2e69ab1d92e49384 100644
--- a/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
+++ b/Code/FeatureExtraction/otbImageToPathListAlignFilter.txx
@@ -22,9 +22,7 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkPathIterator.h"
-#include "itkImage.h"
 #include "itkNumericTraits.h"
-#include "itkImageLinearConstIteratorWithIndex.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "otbMath.h"
 
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
index 0f8e2702505ada6f3355438c83ff71fff7786328..a0d2dc9fb575fde51f2bd0bb57dd0d5fdc70f785 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.txx
@@ -22,7 +22,6 @@
 
 #include "itkMatrix.h"
 #include "itkProcessObject.h"
-#include "otbMath.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
index af627a41cb7a6260fadeb28ccc63249e318ddcf0..ac4ca91a62a22b2aad8417c598b02b958433a3f9 100644
--- a/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilter.h
@@ -20,7 +20,6 @@
 #ifndef __otbImageToSURFKeyPointSetFilter_h
 #define __otbImageToSURFKeyPointSetFilter_h
 
-#include "itkProcessObject.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "otbImageToHessianDeterminantImageFilter.h"
 #include "itkPointSet.h"
@@ -30,7 +29,6 @@
 #include "otbImageToPointSetFilter.h"
 #include "itkVector.h"
 
-#include "otbMath.h"
 #include <iostream>
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
index d997640cc4be8b9384f4ce504257fe046a1ee30f..270e71572b4b0a3655bd81b7b8799fa8e8eafa33 100644
--- a/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
+++ b/Code/FeatureExtraction/otbKeyPointSetsMatchingFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbKeyPointSetsMatchingFilter_h
 #define __otbKeyPointSetsMatchingFilter_h
 
-#include "otbObjectList.h"
 #include "otbObjectListSource.h"
 #include "otbLandmark.h"
 #include "itkEuclideanDistanceMetric.h"
diff --git a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
index bb9b61705348c1f6ca498711b5a4523c13785d16..fd2482e60bddd0cb6f1b99567855c8f2baf0a87a 100644
--- a/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLikelihoodPathListFilter.txx
@@ -21,7 +21,6 @@
 #include "otbLikelihoodPathListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
 #include "itkMetaDataObject.h"
-#include "otbMacro.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
index 98bf32539b10efac3ee6e4a925153b3f5898ed43..47952bdbf94fb6257305bc17d6fa0f219f8857b3 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbLineCorrelationDetectorImageFilter_h
 #define __otbLineCorrelationDetectorImageFilter_h
 
-#include "itkNearestNeighborInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
index 77916e487d6a516e332637d988a41ee6d8dd6423..8cab7d6e3503a7ca34e0567a2dd4e6bc15cf8196 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.txx
@@ -21,12 +21,10 @@
 #include "otbLineCorrelationDetectorImageFilter.h"
 
 #include "itkDataObject.h"
-#include "itkMacro.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkProgressReporter.h"
 #include "otbMath.h"
 
diff --git a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
index bdf1796f03843ff141fa4f497df0b62f53cb055b..d53e7d5e2271891a117c82f66c2b7fa5cb9403ca 100644
--- a/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
+++ b/Code/FeatureExtraction/otbLineDetectorImageFilterBase.txx
@@ -26,9 +26,7 @@
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
index c4debb7dde7a1180fb8aa9d01ea9ae7ec6975cc7..903219e7d06144c883d39d83881e4341e4c5285b 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbLineRatioDetectorImageFilter_h
 #define __otbLineRatioDetectorImageFilter_h
 
-#include "itkNearestNeighborInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
index ad5d7eb68d1c80fe0efcf9fb91478010e3c7ecd2..41715bdc3e1c55a012ed0bd1806ebbf9cf9801c6 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.txx
@@ -26,7 +26,6 @@
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkProgressReporter.h"
 #include "otbMath.h"
 
diff --git a/Code/FeatureExtraction/otbLineSegmentDetector.txx b/Code/FeatureExtraction/otbLineSegmentDetector.txx
index fb141f66b9f0525bda46ae8f0e82f84419c9e816..69c99110ea8ea13aada99ea6f5863494c0bcfe9d 100644
--- a/Code/FeatureExtraction/otbLineSegmentDetector.txx
+++ b/Code/FeatureExtraction/otbLineSegmentDetector.txx
@@ -20,9 +20,7 @@
 
 #include "otbLineSegmentDetector.h"
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "itkMinimumMaximumImageCalculator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkImageConstIterator.h"
 #include "itkNeighborhoodIterator.h"
 #include "otbPolygon.h"
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index 87bbe56a78dd083e8f2167d1dc6214a898c9aadb..7b49e0c3c00830181f2bd89e6d01f3ea8b9f82a2 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -20,7 +20,6 @@
 #ifndef __otbLineSpatialObjectListToRightAnglePointSetFilter_h
 #define __otbLineSpatialObjectListToRightAnglePointSetFilter_h
 
-#include "itkProcessObject.h"
 #include "itkPointSet.h"
 #include "otbLineSpatialObjectListToPointSetFilter.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
index 506d73744f45a9521c0c17ba35a92bffbf939cda..a241052f34bae42e73b2e83a89e209e787bb2493 100644
--- a/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
+++ b/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.txx
@@ -21,7 +21,6 @@
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "itkLineIterator.h"
 #include "itkMatrix.h"
-#include "itkCovariantVector.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.h b/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
index 56c07ff09451e9438f700e8597e8c96bb8cc3562..27a3cfafcfee6e10cb4f82447b1ba3196e14ac18 100644
--- a/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
+++ b/Code/FeatureExtraction/otbLocalHistogramImageFunction.h
@@ -19,7 +19,6 @@
 #define __otbLocalHistogramImageFunction_h
 
 #include "itkImageFunction.h"
-#include "itkFixedArray.h"
 #include "itkHistogram.h"
 #include "itkNumericTraits.h"
 
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
index 59976b7972316bc0cefe28e5c5c2b70d26828882..c91872e76c988c3ba3a81a66ef5394232d80d187 100644
--- a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
+++ b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
@@ -20,7 +20,6 @@
 
 #include "otbLocalHistogramImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
-#include "itkNumericTraits.h"
 #include "itkMacro.h"
 #include "itkExtractImageFilter.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.h b/Code/FeatureExtraction/otbLocalHoughFilter.h
index 1a06a8f06a9937e0f4b64e98e25f4316fb5d143a..15270340c7b0730ebd361ce12c8c9e7f5bcb1119 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.h
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.h
@@ -19,13 +19,10 @@
 #define __otbLocalHoughFilter_h
 
 
-#include "itkProcessObject.h"
 #include "itkHoughTransform2DLinesImageFilter.h"
 
 #include "otbImageToLineSpatialObjectListFilter.h"
-#include "otbLineSpatialObjectList.h"
 #include "otbExtractROI.h"
-#include "otbImage.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
index 113fd8048daf497f7a0f73f96ff3806212ec22f6..b617bdb3b3852203ea816e7eeb4f92348b4f896a 100644
--- a/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
+++ b/Code/FeatureExtraction/otbPixelSuppressionByDirectionImageFilter.txx
@@ -21,7 +21,6 @@
 #include "otbPixelSuppressionByDirectionImageFilter.h"
 
 #include "itkDataObject.h"
-#include "itkMacro.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx b/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx
index 100790c96ac3d62729a210a93c222293c07a4994..574880893651babe26957b85bbc6a007e620a297 100644
--- a/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx
+++ b/Code/FeatureExtraction/otbRadiometricMomentsImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbRadiometricMomentsImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkProgressReporter.h"
 #include "itkZeroFluxNeumannBoundaryCondition.h"
diff --git a/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx b/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx
index 0878db15423b84d270a1549e1d002f19ac305dcb..5d0b44bf9ffaed8600a6303d476b06706c243171 100644
--- a/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx
+++ b/Code/FeatureExtraction/otbRadiometricMomentsImageFunction.txx
@@ -19,7 +19,6 @@
 #define __otbRadiometricMomentsImageFunction_txx
 
 #include "otbRadiometricMomentsImageFunction.h"
-#include "itkNumericTraits.h"
 #include "itkMacro.h"
 #include "itkVariableLengthVector.h"
 #include <complex>
diff --git a/Code/FeatureExtraction/otbRealMomentsImageFunction.txx b/Code/FeatureExtraction/otbRealMomentsImageFunction.txx
index 1f86d1353680fa4fe80c948603b90205c36ea1ae..cc2966b052c9a0b9379aa0cb42701c1df71641f8 100644
--- a/Code/FeatureExtraction/otbRealMomentsImageFunction.txx
+++ b/Code/FeatureExtraction/otbRealMomentsImageFunction.txx
@@ -21,7 +21,6 @@
 #include "otbRealMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkNumericTraits.h"
-#include "itkMacro.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 3ebfe117aba2db84ef60ce51ace0c4bf36bcc55a..39361f1d64e2fcdc2bf8ff67c6299166288785e0 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -28,12 +28,9 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkPathIterator.h"
-#include "itkImage.h"
 #include "itkNumericTraits.h"
-#include "itkImageLinearConstIteratorWithIndex.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "otbMath.h"
-#include "itkBinaryThresholdImageFunction.h"
 #include "itkNeighborhoodBinaryThresholdImageFunction.h"
 #include "itkFloodFilledImageFunctionConditionalIterator.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
index 92ac565388359a7c8c048979e508b21b9e311fe7..38f2115c22a6056c7c7a93e4eee004e29a4c6add 100644
--- a/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
+++ b/Code/FeatureExtraction/otbRemoveCarvingPathFilter.h
@@ -19,7 +19,6 @@
 #define __otbRemoveCarvingPathFilter_h
 
 #include "itkImageAndPathToImageFilter.h"
-#include "itkImageSliceConstIteratorWithIndex.h"
 #include "itkImageSliceIteratorWithIndex.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Code/FeatureExtraction/otbRoadExtractionFilter.h
index 224225f3021ce030a80395175d2cd703ba7d53c3..8ba41d4f04fe3a688db838108d62c8dd613db3a0 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.h
@@ -18,12 +18,9 @@
 #ifndef __otbRoadExtractionFilter_h
 #define __otbRoadExtractionFilter_h
 
-#include "itkCovariantVector.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
-#include "otbImageToPathListFilter.h"
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "otbGenericRoadExtractionFilter.h"
 
diff --git a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
index 4610dda6efb515ec409ac3bee9e247f92b9364be..af361ce25796d87c05fe14155e9839fafb312389 100644
--- a/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
+++ b/Code/FeatureExtraction/otbSqrtSpectralAngleFunctor.h
@@ -18,7 +18,6 @@
 #ifndef __otbSqrtSpectralAngleFunctor_h
 #define __otbSqrtSpectralAngleFunctor_h
 
-#include "otbMath.h"
 #include "otbSpectralAngleFunctor.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h b/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
index b3a65a3c0b4c7ec4ce147da23b254787088c7aff..b8c4bf515beeb2ae10094f9e7671c2aa5ab20049 100644
--- a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
+++ b/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
@@ -24,15 +24,12 @@
 #include <vector>
 
 #include "itkImageRegion.h"
-#include "otbVectorData.h"
 #include "itkPreOrderTreeIterator.h"
 
-#include "itkDataObject.h"
 #include "itkDataObjectDecorator.h"
 #include "itkSimpleDataObjectDecorator.h"
 
 #include "otbLineSegmentDetector.h"
-#include "itkExtractImageFilter.h"
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Code/FeatureExtraction/otbTextureImageFunction.h b/Code/FeatureExtraction/otbTextureImageFunction.h
index 777687de1fd0d0bbf46455d1fed32290340139b3..2009dbc8fa5f1fd6f01693fc27b32ae12ba2b7bb 100644
--- a/Code/FeatureExtraction/otbTextureImageFunction.h
+++ b/Code/FeatureExtraction/otbTextureImageFunction.h
@@ -19,7 +19,6 @@
 #define __otbTextureImageFunction_h
 
 #include "itkImageFunction.h"
-#include "itkNumericTraits.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkVariableLengthVector.h"
 
diff --git a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
index 984acedc479ebed49680441a9eca1c66f9fe7034..5fb8cf880dfcae64d6515dc078492ecd95c2987f 100644
--- a/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
+++ b/Code/FeatureExtraction/otbTouziEdgeDetectorImageFilter.txx
@@ -25,7 +25,6 @@
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
index 0340d943cdca6f5e548e72db6fb0292322af91b5..3293eab78fa45f5fb5de3e61223fde90f0a18ff3 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
@@ -18,12 +18,9 @@
 #ifndef __otbUrbanAreaDetectionImageFilter_h
 #define __otbUrbanAreaDetectionImageFilter_h
 
-#include "otbMath.h"
 #include "otbImage.h"
-#include "otbVegetationIndicesFunctor.h"
 #include "otbWaterIndicesFunctor.h"
 #include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
-#include "itkBinaryThresholdImageFilter.h"
 #include "itkImageToImageFilter.h"
 #include "itkBinaryErodeImageFilter.h"
 #include "itkBinaryDilateImageFilter.h"
@@ -34,7 +31,6 @@
 #include "otbEdgeDensityImageFilter.h"
 #include "otbBinaryImageDensityFunction.h"
 #include "otbVectorImageToIntensityImageFilter.h"
-#include "itkBinaryThresholdImageFilter.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
index 91f2f71e9e04aa3d774ff5ed5ac0e1f5306206ca..70a47f868ae4968d5f0a356e4b67a9087a7f2efb 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.h
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
@@ -19,9 +19,7 @@
 #define __otbVectorizationPathListFilter_h
 
 #include "otbPathListSource.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodIterator.h"
 #include "itkConstantBoundaryCondition.h"
 #include "otbImage.h"
diff --git a/Code/Fusion/otbBayesianFusionFilter.h b/Code/Fusion/otbBayesianFusionFilter.h
index 111bbb77f868be85628ae48020c3afbe92c12cf7..cca29e95b4ec43d4f8afee15f0e4a1176d923203 100644
--- a/Code/Fusion/otbBayesianFusionFilter.h
+++ b/Code/Fusion/otbBayesianFusionFilter.h
@@ -25,12 +25,10 @@
 
 #include "itkImageToImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkNumericTraits.h"
 #include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbFusionImageBase.h"
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
-#include "itkVariableSizeMatrix.h"
 
 namespace otb
 {
diff --git a/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h b/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h
index 7b59ab4ef37d011413237dc3fed0d98bed24a878..ea1962ca39935bd6290e12887b5110f70ba98afb 100644
--- a/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.h
@@ -21,7 +21,6 @@
 #ifndef __otbLmvmPanSharpeningFusionImageFilter_h
 #define __otbLmvmPanSharpeningFusionImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbConvolutionImageFilter.h"
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbPerBandVectorImageFilter.h"
diff --git a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 892e32fabbe0d6410d01b98d13ee60e0b120a07f..e546a0a84e8d37f233da475717984397f4cdafc3 100644
--- a/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -21,7 +21,6 @@
 #ifndef __otbSimpleRcsPanSharpeningFusionImageFilter_h
 #define __otbSimpleRcsPanSharpeningFusionImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbConvolutionImageFilter.h"
 #include "itkTernaryFunctorImageFilter.h"
 
diff --git a/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h b/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h
index 2deeb867f2ea0ed1b3a871eb49d3971933abce3f..12410b4197d2aed13c2ce3f5ce74402ca3f30dfb 100644
--- a/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h
+++ b/Code/Fuzzy/otbConfusionMatrixToMassOfBelief.h
@@ -24,7 +24,6 @@
 #include "itkConfigure.h"
 
 #include "itkProcessObject.h"
-#include "itkVariableSizeMatrix.h"
 #include "otbConfusionMatrixMeasurements.h"
 
 
diff --git a/Code/Fuzzy/otbJointMassOfBeliefFilter.h b/Code/Fuzzy/otbJointMassOfBeliefFilter.h
index 483c883c36ba206b525941d45001104a071c3b64..8c5a7df7485debc5b9d6686d6b3a2321457f1a68 100644
--- a/Code/Fuzzy/otbJointMassOfBeliefFilter.h
+++ b/Code/Fuzzy/otbJointMassOfBeliefFilter.h
@@ -19,7 +19,6 @@
 #define __otbJointMassOfBeliefFilter_h
 
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkNumericTraits.h"
 
 namespace otb
diff --git a/Code/Fuzzy/otbStandardDSCostFunction.h b/Code/Fuzzy/otbStandardDSCostFunction.h
index e6f73d6ef686e99f24d189fd163253f158221000..7f6981204bdebdc34c6dce6252e04797411933f9 100644
--- a/Code/Fuzzy/otbStandardDSCostFunction.h
+++ b/Code/Fuzzy/otbStandardDSCostFunction.h
@@ -21,7 +21,6 @@
 #include "itkSingleValuedCostFunction.h"
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
-#include "otbParser.h"
 #include "otbFuzzyDescriptorsModelManager.h"
 
 namespace otb
diff --git a/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx b/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx
index 6e9c8c735f7bac3069c36a29a70bda3604cd9bc7..1dc7869ace93093d2101da21e658535f927b278e 100644
--- a/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx
+++ b/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.txx
@@ -19,7 +19,6 @@
 #define __otbVectorDataToDSValidatedVectorDataFilter_txx
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
-#include "otbMassOfBelief.h"
 #include <iostream>
 
 namespace otb
diff --git a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
index 805d15a7e42f4c0afe9f0843ccaebcf6ac94a8a9..8635b00d65058de9fd1d78615171b702ae65afc2 100644
--- a/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
+++ b/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.h
@@ -19,7 +19,6 @@
 #define __otbVectorDataToRoadDescriptionFilter_h
 
 #include "otbVectorDataToSpecificDescriptionFilterBase.h"
-#include "itkPreOrderTreeIterator.h"
 #include "otbVectorData.h"
 
 //#include "otbNDVIDataNodeFeatureFunction.h"
diff --git a/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h b/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h
index bece5b3b32da4830eecb5becf8596c37491c2fc6..58a1fd99bc83ab492bb68f0f20ab5b311c3c9634 100644
--- a/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h
+++ b/Code/Hyperspectral/otbEigenvalueLikelihoodMaximisation.h
@@ -21,7 +21,6 @@
 #ifndef __otbEigenvalueLikelihoodMaximisation_h
 #define __otbEigenvalueLikelihoodMaximisation_h
 
-#include "itkMacro.h"
 #include "itkObjectFactory.h"
 #include "itkLightObject.h"
 #include "vnl/vnl_vector.h"
diff --git a/Code/Hyperspectral/otbISRAUnmixingImageFilter.h b/Code/Hyperspectral/otbISRAUnmixingImageFilter.h
index 3b9963d6ca14325b3adb04ad21a82b7b2aaf5cbc..11645da0ff96a94f9d896dfe2d98584b49a56110 100644
--- a/Code/Hyperspectral/otbISRAUnmixingImageFilter.h
+++ b/Code/Hyperspectral/otbISRAUnmixingImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbISRAUnmixingImageFilter_h
 #define __otbISRAUnmixingImageFilter_h
 
-#include "itkMacro.h"
 #include "itkNumericTraits.h"
 #include "otbUnaryFunctorImageFilter.h"
 #include "vnl/algo/vnl_svd.h"
diff --git a/Code/Hyperspectral/otbLocalRxDetectorFilter.h b/Code/Hyperspectral/otbLocalRxDetectorFilter.h
index 1d049e62bbc2ed0566ac8d9c37a3ca9ddb5b0b81..880974db3b460921ffef5c2a41cac36a6f58456d 100644
--- a/Code/Hyperspectral/otbLocalRxDetectorFilter.h
+++ b/Code/Hyperspectral/otbLocalRxDetectorFilter.h
@@ -25,7 +25,6 @@
 #include "itkImageRegionIterator.h"
 #include "itkListSample.h"
 #include "itkCovarianceSampleFilter.h"
-#include "itkVariableSizeMatrix.h"
 
 namespace otb
 {
diff --git a/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h b/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h
index 91ff7a575fdac34f23830679b6409e08e1eedc73..d955990054f79b6e1dc303bf872ca75c3c71e2cc 100644
--- a/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h
+++ b/Code/Hyperspectral/otbLocalRxDetectorNonThreadFilter.h
@@ -25,7 +25,6 @@
 #include "itkImageRegionIterator.h"
 #include "itkListSample.h"
 #include "itkCovarianceSampleFilter.h"
-#include "itkVariableSizeMatrix.h"
 
 namespace otb
 {
diff --git a/Code/Hyperspectral/otbMDMDNMFImageFilter.h b/Code/Hyperspectral/otbMDMDNMFImageFilter.h
index cb302feac3f671c68fbf42107de641707e8b5874..39081934a654e7b34ddac81bdea45655d4ac2d9a 100644
--- a/Code/Hyperspectral/otbMDMDNMFImageFilter.h
+++ b/Code/Hyperspectral/otbMDMDNMFImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbMDMDNMFImageFilter_h
 
 #include "itkImageToImageFilter.h"
-#include "itkVariableSizeMatrix.h"
 #include "otbVectorImageToMatrixImageFilter.h"
 
 #include "vnl/vnl_matrix.h"
diff --git a/Code/Hyperspectral/otbSparseUnmixingImageFilter.h b/Code/Hyperspectral/otbSparseUnmixingImageFilter.h
index 0586bab7b214ceb7e6fd575be88d0f01da57b33b..fbefb32da926d5238c324267c1ba44fe4a3f9712 100644
--- a/Code/Hyperspectral/otbSparseUnmixingImageFilter.h
+++ b/Code/Hyperspectral/otbSparseUnmixingImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbSparseUnmixingImageFilter_h
 
 #include "otbMacro.h"
-#include "otbObjectList.h"
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
 #include "otbWaveletTransform.h"
@@ -27,7 +26,6 @@
 #include "otbAngularProjectionSetImageFilter.h"
 
 #include "itkListSample.h"
-#include "itkFixedArray.h"
 #include "itkHistogram.h"
 
 namespace otb {
diff --git a/Code/Hyperspectral/otbVcaImageFilter.h b/Code/Hyperspectral/otbVcaImageFilter.h
index 8831737dc955823fc2b1c7b3d55e1703ad0d65f8..6e2fd7c83c54c1397b5f42d0a18ed13c8de5ba81 100644
--- a/Code/Hyperspectral/otbVcaImageFilter.h
+++ b/Code/Hyperspectral/otbVcaImageFilter.h
@@ -25,11 +25,9 @@
 #include "itkAbsImageFilter.h"
 #include "otbDotProductImageFilter.h"
 #include "otbProjectiveProjectionImageFilter.h"
-#include "otbMatrixImageFilter.h"
 #include "otbVectorImageToMatrixImageFilter.h"
 #include "otbStreamingMinMaxImageFilter.h"
 #include "otbStreamingStatisticsImageFilter.h"
-#include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbPCAImageFilter.h"
 #include "otbVectorImageToAmplitudeImageFilter.h"
 #include "otbConcatenateScalarValueImageFilter.h"
diff --git a/Code/Hyperspectral/otbVirtualDimensionality.h b/Code/Hyperspectral/otbVirtualDimensionality.h
index c1769971e12f12cdc88848b88828311aab8c5fda..4645da85e1a6a325b0553be309bfd4dc00d213df 100644
--- a/Code/Hyperspectral/otbVirtualDimensionality.h
+++ b/Code/Hyperspectral/otbVirtualDimensionality.h
@@ -21,7 +21,6 @@
 #ifndef __otbVirtualDimensionality_h
 #define __otbVirtualDimensionality_h
 
-#include "itkMacro.h"
 #include "itkObjectFactory.h"
 #include "itkLightObject.h"
 #include "vnl/vnl_vector.h"
diff --git a/Code/IO/otbCoordinateToName.h b/Code/IO/otbCoordinateToName.h
index a7fe8948b3e1c80251e25e944412cc79527f98c0..1be8876ea30daff226979d144b6c25c4f2157225 100644
--- a/Code/IO/otbCoordinateToName.h
+++ b/Code/IO/otbCoordinateToName.h
@@ -18,7 +18,6 @@
 #ifndef __otbCoordinateToName_h
 #define __otbCoordinateToName_h
 
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 #include "itkPoint.h"
 #include "itkMultiThreader.h"
diff --git a/Code/IO/otbDEMToImageGenerator.h b/Code/IO/otbDEMToImageGenerator.h
index a5b11b5bfc7068fb5a608be3003a2463044983bc..b80e0d1563f0c7fde0eb081a51d88debe83f9a1d 100644
--- a/Code/IO/otbDEMToImageGenerator.h
+++ b/Code/IO/otbDEMToImageGenerator.h
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <stdio.h>
 
-#include "itkIndent.h"
 #include "itkImageSource.h"
 #include "otbImage.h"
 #include "otbDEMHandler.h"
diff --git a/Code/IO/otbDefaultConvertPixelTraits.h b/Code/IO/otbDefaultConvertPixelTraits.h
index b8f1c4895d7d6f7deedcbc63b24b349de60c562f..f1009bced6971822e38368e1d5e7f31cb70e5374 100644
--- a/Code/IO/otbDefaultConvertPixelTraits.h
+++ b/Code/IO/otbDefaultConvertPixelTraits.h
@@ -19,9 +19,7 @@
 #define __otbDefaultConvertPixelTraits_h
 
 #include "itkOffset.h"
-#include "itkCovariantVector.h"
 #include "itkVector.h"
-#include "itkPoint.h"
 #include "itkMatrix.h"
 
 namespace otb
diff --git a/Code/IO/otbDefaultImageMetadataInterface.h b/Code/IO/otbDefaultImageMetadataInterface.h
index 175679f4ef77558e1cd35a8f7ecd4417e43c737a..99cd2b279cee1306220e987c1db8b04043f5460d 100644
--- a/Code/IO/otbDefaultImageMetadataInterface.h
+++ b/Code/IO/otbDefaultImageMetadataInterface.h
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 
-#include "otbMacro.h"
 
 #include "otbImageMetadataInterfaceBase.h"
 
diff --git a/Code/IO/otbExtendedFilenameToReaderOptions.h b/Code/IO/otbExtendedFilenameToReaderOptions.h
index f22e7d04c3866a5373ad5149d754e750b5973a3c..80bf5d790ddc426d15efb03e2d79fa2cf4bf913a 100644
--- a/Code/IO/otbExtendedFilenameToReaderOptions.h
+++ b/Code/IO/otbExtendedFilenameToReaderOptions.h
@@ -18,7 +18,6 @@
 #ifndef __otbExtendedFilenameToReaderOptions_h
 #define __otbExtendedFilenameToReaderOptions_h
 
-#include "itkObject.h"
 #include "otbExtendedFilenameHelper.h"
 
 namespace otb
diff --git a/Code/IO/otbExtendedFilenameToWriterOptions.h b/Code/IO/otbExtendedFilenameToWriterOptions.h
index fc7049664843f29d70df2d4f7210b32968a73fb6..e884fc3bfe4a6ecb2092c2a51502737a955ec265 100644
--- a/Code/IO/otbExtendedFilenameToWriterOptions.h
+++ b/Code/IO/otbExtendedFilenameToWriterOptions.h
@@ -18,7 +18,6 @@
 #ifndef __otbExtendedFilenameToWriterOptions_h
 #define __otbExtendedFilenameToWriterOptions_h
 
-#include "itkObject.h"
 #include "otbExtendedFilenameHelper.h"
 #include "otbGDALImageIO.h"
 
diff --git a/Code/IO/otbGDALDriverManagerWrapper.cxx b/Code/IO/otbGDALDriverManagerWrapper.cxx
index 2ca24ca357bdf7af3bc873c0aee2f8a7d8a0425c..5705fe8c077175fa9913e51f196fddf0f47ca79a 100644
--- a/Code/IO/otbGDALDriverManagerWrapper.cxx
+++ b/Code/IO/otbGDALDriverManagerWrapper.cxx
@@ -19,7 +19,6 @@
 #include <vector>
 #include "otbMacro.h"
 #include "otbSystem.h"
-#include "itkMacro.h"
 
 namespace otb
 {
diff --git a/Code/IO/otbGDALDriverManagerWrapper.h b/Code/IO/otbGDALDriverManagerWrapper.h
index 4c81c83fc66838dc24dd3c099d945bbb53d24069..fa3133d1f34947e459492495e8e0e12e81d33ac6 100644
--- a/Code/IO/otbGDALDriverManagerWrapper.h
+++ b/Code/IO/otbGDALDriverManagerWrapper.h
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkLightObject.h"
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "otbConfigure.h"
 
 class GDALDataset;
diff --git a/Code/IO/otbGDALImageIO.cxx b/Code/IO/otbGDALImageIO.cxx
index 171a7322fcb2324b40ab1cea50457d151c51e9d8..3e87fda2c3e8ff454d1a8947eb4f3d37cbed0170 100644
--- a/Code/IO/otbGDALImageIO.cxx
+++ b/Code/IO/otbGDALImageIO.cxx
@@ -24,7 +24,6 @@
 #include "otbSystem.h"
 #include "itksys/SystemTools.hxx"
 #include "otbImage.h"
-#include "itkVariableLengthVector.h"
 #include "otbTinyXML.h"
 #include "otbImageKeywordlist.h"
 
diff --git a/Code/IO/otbImageFileReader.h b/Code/IO/otbImageFileReader.h
index fa262a9d0efc08fcd7a70d23f56db60a5909cb66..d4869ee4532879a79d73bee1daa83b7a462af494 100644
--- a/Code/IO/otbImageFileReader.h
+++ b/Code/IO/otbImageFileReader.h
@@ -21,7 +21,6 @@
 #include "itkImageSource.h"
 #include "otbImageIOBase.h"
 #include "itkExceptionObject.h"
-#include "itkSize.h"
 #include "itkImageRegion.h"
 
 #include "otbDefaultConvertPixelTraits.h"
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 2e4e32e7bc05eb32571c538306b7aa672f550119..fc7f71943e85bf2634f08d17b6961a30bc07a93a 100644
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -24,17 +24,13 @@
 #include <itksys/SystemTools.hxx>
 #include <fstream>
 
-#include "itkObjectFactory.h"
 #include "itkImageIOFactory.h"
-#include "itkImageRegion.h"
 #include "itkPixelTraits.h"
 #include "itkVectorImage.h"
 #include "itkMetaDataObject.h"
 
 #include "otbConvertPixelBuffer.h"
-#include "otbMacro.h"
 #include "otbImageIOFactory.h"
-#include "otbImageKeywordlist.h"
 #include "otbMetaDataKey.h"
 
 #include "otbGDALImageIO.h" //FIXME avoid requiring GDALImageIO here
diff --git a/Code/IO/otbImageFileWriter.h b/Code/IO/otbImageFileWriter.h
index 0ee02ff4aceec1617b7c6e2a3963a927b26dc95c..7e5e369d69fcb89fd92c0d80739b8541709063c8 100644
--- a/Code/IO/otbImageFileWriter.h
+++ b/Code/IO/otbImageFileWriter.h
@@ -18,7 +18,6 @@
 #ifndef __otbImageFileWriter_h
 #define __otbImageFileWriter_h
 
-#include "otbMacro.h"
 #include "otbImageIOBase.h"
 #include "itkProcessObject.h"
 #include "otbStreamingManager.h"
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index 7aea3a4963be7402f7f0651c57c348fd47c8de83..9f78c9f3a650806ac15a3456d5a12ae7868aeea3 100644
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -26,7 +26,6 @@
 #include "itkImageRegionMultidimensionalSplitter.h"
 #include "otbImageIOFactory.h"
 
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 #include "itkMetaDataObject.h"
diff --git a/Code/IO/otbImageIOBase.cxx b/Code/IO/otbImageIOBase.cxx
index b22ccb1619c93e10f5ccfbaa929ab0e5733983dc..3e16dace62f17d17b285972717944afa30455213 100644
--- a/Code/IO/otbImageIOBase.cxx
+++ b/Code/IO/otbImageIOBase.cxx
@@ -21,12 +21,9 @@
 #include "itkRGBPixel.h"
 #include "itkRGBAPixel.h"
 #include "itkOffset.h"
-#include "itkVector.h"
 #include "itkPoint.h"
 #include "itkCovariantVector.h"
-#include "itkSymmetricSecondRankTensor.h"
 #include "itkDiffusionTensor3D.h"
-#include "itkFixedArray.h"
 #include "itkImageRegionSplitter.h"
 
 namespace otb
diff --git a/Code/IO/otbImageIOBase.h b/Code/IO/otbImageIOBase.h
index 0bb12abb90d3a971e223a87b33030bfa9552f9ca..e9d96b7f9aacd353939985830049dae69af1ccc2 100644
--- a/Code/IO/otbImageIOBase.h
+++ b/Code/IO/otbImageIOBase.h
@@ -18,7 +18,6 @@
 #define __otbImageIOBase_h
 
 #include "itkLightProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkIndent.h"
 #include "itkImageIORegion.h"
 #include "vnl/vnl_vector.h"
diff --git a/Code/IO/otbImageIOFactory.cxx b/Code/IO/otbImageIOFactory.cxx
index 6a8c983082f19374782be92db18fc0e4a7218547..30a23fcc74d07996013724b663f65bf14321d188 100644
--- a/Code/IO/otbImageIOFactory.cxx
+++ b/Code/IO/otbImageIOFactory.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbConfigure.h"
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
 #include "otbCurlHelperInterface.h"
diff --git a/Code/IO/otbImageMetadataInterfaceBase.cxx b/Code/IO/otbImageMetadataInterfaceBase.cxx
index 61ace1e717f5fb92c3d75e8658357f2235816587..7104085ce4f097384d7710042050c39e41ab75be 100644
--- a/Code/IO/otbImageMetadataInterfaceBase.cxx
+++ b/Code/IO/otbImageMetadataInterfaceBase.cxx
@@ -18,7 +18,6 @@
 
 #include "otbImageMetadataInterfaceBase.h"
 
-#include "otbMacro.h"
 #include "otbImageKeywordlist.h"
 #include "itkMetaDataObject.h"
 #include "itksys/SystemTools.hxx"
diff --git a/Code/IO/otbImageMetadataInterfaceFactory.cxx b/Code/IO/otbImageMetadataInterfaceFactory.cxx
index 07c1b1e62120fd9c3f575e41241639ce1837b17c..248a69f7f936040f9c7ebf8f6529b9cc9743dc13 100644
--- a/Code/IO/otbImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbImageMetadataInterfaceFactory.cxx
@@ -33,7 +33,6 @@
 // SAR Sensors
 #include "otbTerraSarImageMetadataInterfaceFactory.h"
 
-#include "itkObjectFactoryBase.h"
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
 
diff --git a/Code/IO/otbImageSeriesFileReader.h b/Code/IO/otbImageSeriesFileReader.h
index f653f2f2d1321929b3435294d31ab3733f7aa51b..2a245bd99f66923c04f5251feee1eac70e4528d6 100644
--- a/Code/IO/otbImageSeriesFileReader.h
+++ b/Code/IO/otbImageSeriesFileReader.h
@@ -23,7 +23,6 @@
 
 #include "otbImageSeriesFileReaderBase.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbObjectList.h"
 
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Code/IO/otbImageSeriesFileReaderBase.h
index d072da0cfe497ba7c70aca4413d7edb6f117792a..a19c44c2e96b5ffb809c86dd78cdfb315560a244 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.h
+++ b/Code/IO/otbImageSeriesFileReaderBase.h
@@ -30,7 +30,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 
-#include "otbObjectList.h"
 #include "otbImageList.h"
 #include "otbImageListSource.h"
 #include "otbImageFileReader.h"
diff --git a/Code/IO/otbImageToOSMVectorDataGenerator.h b/Code/IO/otbImageToOSMVectorDataGenerator.h
index 205502e08791e961088d0c7b3a8ed0884347db1a..bfa1cd6af34672f57840986a969ab7f6b3ff88f5 100644
--- a/Code/IO/otbImageToOSMVectorDataGenerator.h
+++ b/Code/IO/otbImageToOSMVectorDataGenerator.h
@@ -18,7 +18,6 @@
 #ifndef __otbImageToOSMVectorDataGenerator_h
 #define __otbImageToOSMVectorDataGenerator_h
 
-#include "otbVectorData.h"
 #include "otbOSMDataToVectorDataGenerator.h"
 
 namespace otb {
diff --git a/Code/IO/otbJPEG2000ImageIO.cxx b/Code/IO/otbJPEG2000ImageIO.cxx
index 698d47e70c13900c56686a8edbb78b376b68e593..2dd3b30427db961374a7a4501c36df2af3ff57c9 100644
--- a/Code/IO/otbJPEG2000ImageIO.cxx
+++ b/Code/IO/otbJPEG2000ImageIO.cxx
@@ -24,7 +24,6 @@
 #include "otbMacro.h"
 #include "itksys/SystemTools.hxx"
 #include "itkTimeProbe.h"
-#include "itkMacro.h"
 #include "itkMetaDataObject.h"
 #include "otbMetaDataKey.h"
 
diff --git a/Code/IO/otbKmzProductWriter.h b/Code/IO/otbKmzProductWriter.h
index 2244ea6993dab2b315164deb99bfe14ac9f044be..387b40f1fba047be0cadfcf0c67904bb3397f397 100644
--- a/Code/IO/otbKmzProductWriter.h
+++ b/Code/IO/otbKmzProductWriter.h
@@ -18,7 +18,6 @@
 #ifndef __otbKmzProductWriter_h
 #define __otbKmzProductWriter_h
 
-#include "itkProcessObject.h"
 #include "itkObjectFactory.h"
 
 //kmz creation
diff --git a/Code/IO/otbMapFileProductWriter.h b/Code/IO/otbMapFileProductWriter.h
index fdac09607bbcd558f62011491797a5395c446600..ece0a06d9c62677a1a4dfd74de2f1604d030684c 100644
--- a/Code/IO/otbMapFileProductWriter.h
+++ b/Code/IO/otbMapFileProductWriter.h
@@ -18,7 +18,6 @@
 #ifndef __otbMapFileProductWriter_h
 #define __otbMapFileProductWriter_h
 
-#include "itkProcessObject.h"
 #include "itkObjectFactory.h"
 
 // Image Tiling
@@ -26,7 +25,6 @@
 #include "otbImageFileWriter.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "otbGeoInformationConversion.h"
-#include "otbGenericRSTransform.h"
 #include "otbStreamingShrinkImageFilter.h"
 
 // sahpe index necessary includes
diff --git a/Code/IO/otbOGRVectorDataIO.cxx b/Code/IO/otbOGRVectorDataIO.cxx
index b2c7a90a778caa919e9b0ba0a970620fdeb32a31..c2d1aae4e49f857d9fb4e8d9f9c30a679fe8afd9 100644
--- a/Code/IO/otbOGRVectorDataIO.cxx
+++ b/Code/IO/otbOGRVectorDataIO.cxx
@@ -28,7 +28,6 @@
 #include "otbDataNode.h"
 #include "otbMetaDataKey.h"
 #include "itkTimeProbe.h"
-#include "otbVectorDataKeywordlist.h"
 #include "otbOGRIOHelper.h"
 
 namespace otb
diff --git a/Code/IO/otbONERAImageIO.cxx b/Code/IO/otbONERAImageIO.cxx
index 9f9f51c444c529108e88a11edf3115780a95e8df..fbfbf663420c9aa89b9c9c1c4accfc13dd4fe3a8 100644
--- a/Code/IO/otbONERAImageIO.cxx
+++ b/Code/IO/otbONERAImageIO.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbONERAImageIO.h"
-#include "itkByteSwapper.h"
 #include "itksys/SystemTools.hxx"
 
 #include "otbMacro.h"
diff --git a/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx b/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
index a67a579e622c9db5092573f056fb2a8298201854..f484b0030db975e1140133e8b8166af733c53332 100644
--- a/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbOpticalDefaultImageMetadataInterfaceFactory.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbMacro.h"
 
 #include "otbOpticalDefaultImageMetadataInterfaceFactory.h"
 #include "otbOpticalDefaultImageMetadataInterface.h"
diff --git a/Code/IO/otbOpticalImageMetadataInterface.h b/Code/IO/otbOpticalImageMetadataInterface.h
index 03cb7bb19f73a22922bd7cfcbae17c439a1c6975..0429bce83ea862bbe5557786991eddaa01515ea6 100644
--- a/Code/IO/otbOpticalImageMetadataInterface.h
+++ b/Code/IO/otbOpticalImageMetadataInterface.h
@@ -20,7 +20,6 @@
 
 #include <string>
 
-#include "itkMetaDataDictionary.h"
 #include "otbMetaDataKey.h"
 #include "otbImageMetadataInterfaceBase.h"
 #include "otbFilterFunctionValues.h"
diff --git a/Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx b/Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx
index 252a14e5ecb11e01d7acf94dbc7ecbe0c2425c3d..3eff3cf6a0f0d804c90c8d05fda3e4ce24fb8efd 100644
--- a/Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbOpticalImageMetadataInterfaceFactory.cxx
@@ -29,7 +29,6 @@
 #include "otbPleiadesImageMetadataInterfaceFactory.h"
 #include "otbSpot6ImageMetadataInterfaceFactory.h"
 
-#include "itkObjectFactoryBase.h"
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
 
diff --git a/Code/IO/otbPlaceNameToLonLat.h b/Code/IO/otbPlaceNameToLonLat.h
index 88c49ecc665b2cc185fe9253742c4aab00a8c339..f6c0a80996b2099acb41f0ef1a83169c612ad90f 100644
--- a/Code/IO/otbPlaceNameToLonLat.h
+++ b/Code/IO/otbPlaceNameToLonLat.h
@@ -18,7 +18,6 @@
 #ifndef __otbPlaceNameToLonLat_h
 #define __otbPlaceNameToLonLat_h
 
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 #include "otbCurlHelperInterface.h"
 
diff --git a/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx b/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx
index a64be06806a9fe2becfe1492a613476332b8944f..16b2fb747b166a9f388cb94946e382d9057d4a3e 100644
--- a/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbSarDefaultImageMetadataInterfaceFactory.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbMacro.h"
 
 #include "otbSarDefaultImageMetadataInterfaceFactory.h"
 #include "otbSarDefaultImageMetadataInterface.h"
diff --git a/Code/IO/otbSarImageMetadataInterface.h b/Code/IO/otbSarImageMetadataInterface.h
index 140c1e22d1ef6485ce1fc801ce860dd90ec1af2a..5693e5ce48a6b279b48ae8fd6d945dbb6bccd07c 100644
--- a/Code/IO/otbSarImageMetadataInterface.h
+++ b/Code/IO/otbSarImageMetadataInterface.h
@@ -20,7 +20,6 @@
 
 #include <string>
 
-#include "itkMetaDataDictionary.h"
 #include "otbMetaDataKey.h"
 #include "otbImageMetadataInterfaceBase.h"
 #include "itkPointSet.h"
diff --git a/Code/IO/otbSarImageMetadataInterfaceFactory.cxx b/Code/IO/otbSarImageMetadataInterfaceFactory.cxx
index a42945f4c22bf52f7aca65141d9e28b78a2deb02..8075a2303c4dd83a1aa58e95ef490cb852bb7fe3 100644
--- a/Code/IO/otbSarImageMetadataInterfaceFactory.cxx
+++ b/Code/IO/otbSarImageMetadataInterfaceFactory.cxx
@@ -23,7 +23,6 @@
 // SAR Sensors
 #include "otbTerraSarImageMetadataInterfaceFactory.h"
 
-#include "itkObjectFactoryBase.h"
 #include "itkMutexLock.h"
 #include "itkMutexLockHolder.h"
 
diff --git a/Code/IO/otbScalarBufferToImageFileWriter.h b/Code/IO/otbScalarBufferToImageFileWriter.h
index 9b38ee223c248d19f96c8d81182976c0ab3f064b..0c7a5f82348eabde1d9e28d4170c3d0f677c8aac 100644
--- a/Code/IO/otbScalarBufferToImageFileWriter.h
+++ b/Code/IO/otbScalarBufferToImageFileWriter.h
@@ -19,7 +19,6 @@
 #define __otbScalarBufferToImageFileWriter_h
 
 
-#include "itkProcessObject.h"
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Code/IO/otbStreamingImageVirtualWriter.txx b/Code/IO/otbStreamingImageVirtualWriter.txx
index 97891a9bf9a21ffaefe56bf5534a42c9c32b96f8..f4d5259f6338cccad5f76d9c3734dd9edd03b1f9 100644
--- a/Code/IO/otbStreamingImageVirtualWriter.txx
+++ b/Code/IO/otbStreamingImageVirtualWriter.txx
@@ -20,7 +20,6 @@
 #include "otbStreamingImageVirtualWriter.h"
 
 #include "otbMacro.h"
-#include "otbConfigure.h"
 #include "itkCommand.h"
 
 #include "otbNumberOfDivisionsStrippedStreamingManager.h"
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.h b/Code/IO/otbTerraSarImageMetadataInterface.h
index e9dc8de53a8caf6f3c9d236ad20a7430958ef049..633cd2a5b5dbba9a7da4788d83d8a921df7405ca 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.h
+++ b/Code/IO/otbTerraSarImageMetadataInterface.h
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "otbSarImageMetadataInterface.h"
-#include "itkMetaDataDictionary.h"
 #include "otbMetaDataKey.h"
 #include "itkImageBase.h"
 
diff --git a/Code/IO/otbTileMapImageIO.cxx b/Code/IO/otbTileMapImageIO.cxx
index 571ab923c75e40af01c9411030494ea41be53a47..8811fdc78edecb76042099a496b41a2a05d5dfb5 100644
--- a/Code/IO/otbTileMapImageIO.cxx
+++ b/Code/IO/otbTileMapImageIO.cxx
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "itkMacro.h"
 
 #include "itksys/SystemTools.hxx"
 #include "otbSystem.h"
diff --git a/Code/IO/otbVectorDataFileReader.h b/Code/IO/otbVectorDataFileReader.h
index a6e22e2d9e5a6536aeda82b856c93b40dbaa9fb2..3e6554644a98990b27872847f94f291ea624ab28 100644
--- a/Code/IO/otbVectorDataFileReader.h
+++ b/Code/IO/otbVectorDataFileReader.h
@@ -20,7 +20,6 @@
 
 #include "otbVectorDataSource.h"
 #include "otbVectorDataIOBase.h"
-#include "itkMacro.h"
 
 namespace otb
 {
diff --git a/Code/IO/otbVectorDataIOBase.h b/Code/IO/otbVectorDataIOBase.h
index 3060cdbebbf48cbeb4c63f367cc0d81061c1bc96..ca21bf4f782bc52ecb1d9adcd6cad381ef2de94e 100644
--- a/Code/IO/otbVectorDataIOBase.h
+++ b/Code/IO/otbVectorDataIOBase.h
@@ -21,9 +21,7 @@
 #include <string>
 
 #include "itkLightProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkIndent.h"
-#include "itkVector.h"
 #include "itkPoint.h"
 #include "itkDataObject.h"
 
diff --git a/Code/IO/otbWavelengthSpectralBands.h b/Code/IO/otbWavelengthSpectralBands.h
index 3fc8b86561459d8299b6b449191b90d05f147174..0931d623609d8d63f2e72bc6c2b9c41b3c8a39eb 100644
--- a/Code/IO/otbWavelengthSpectralBands.h
+++ b/Code/IO/otbWavelengthSpectralBands.h
@@ -18,7 +18,6 @@
 #ifndef __otbWavelengthSpectralBands_h
 #define __otbWavelengthSpectralBands_h
 
-#include "itkDataObject.h"
 #include "itkObjectFactory.h"
 #include "otbMacro.h"
 #include "otbObjectList.h"
diff --git a/Code/Learning/otbConfusionMatrixCalculator.h b/Code/Learning/otbConfusionMatrixCalculator.h
index 6b353e47a6b1a727d54e03213a29973f26095a90..6cc43a2c9d792ba6f281942ee0659787673dc5e3 100644
--- a/Code/Learning/otbConfusionMatrixCalculator.h
+++ b/Code/Learning/otbConfusionMatrixCalculator.h
@@ -20,9 +20,7 @@
 #define __otbConfusionMatrixCalculator_h
 
 #include "otbMacro.h"
-#include "itkObject.h"
 #include "itkObjectFactory.h"
-#include "itkVariableSizeMatrix.h"
 #include "otbConfusionMatrixMeasurements.h"
 
 namespace otb
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.h b/Code/Learning/otbKMeansImageClassificationFilter.h
index 78393f5461279837ce1c9e35c46cb2773f805102..8e2f00bb84b5a4d3f83867bd7b60f91b3af1acdc 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.h
+++ b/Code/Learning/otbKMeansImageClassificationFilter.h
@@ -19,9 +19,7 @@
 #define __otbKMeansImageClassificationFilter_h
 
 #include "itkInPlaceImageFilter.h"
-#include "itkFixedArray.h"
 #include "itkListSample.h"
-#include "itkFixedArray.h"
 #include "itkEuclideanDistanceMetric.h"
 
 namespace otb
diff --git a/Code/Learning/otbLibSVMMachineLearningModel.h b/Code/Learning/otbLibSVMMachineLearningModel.h
index 914542b6843b16d442b713a9960125313abf78c9..3c4970097147315f6c251ac09e3e13e948fa1295 100644
--- a/Code/Learning/otbLibSVMMachineLearningModel.h
+++ b/Code/Learning/otbLibSVMMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbLibSVMMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 // SVM estimator
diff --git a/Code/Learning/otbListSampleSource.h b/Code/Learning/otbListSampleSource.h
index fc5ab3e5939324d9108197ef7e064ea7cba450b8..295d77b73b9e286a2b7b6937bbca72968685f991 100644
--- a/Code/Learning/otbListSampleSource.h
+++ b/Code/Learning/otbListSampleSource.h
@@ -19,7 +19,6 @@
 #define __otbListSampleSource_h
 
 #include "itkProcessObject.h"
-#include "itkDataObject.h"
 #include "itkDataObjectDecorator.h"
 
 namespace otb {
diff --git a/Code/Learning/otbListSampleToBalancedListSampleFilter.h b/Code/Learning/otbListSampleToBalancedListSampleFilter.h
index 3aff9e2bc03c6582eae817b5599db8eda62f3065..8359dea142648eeb00f3c6b4ef0a0b89fc6870c7 100644
--- a/Code/Learning/otbListSampleToBalancedListSampleFilter.h
+++ b/Code/Learning/otbListSampleToBalancedListSampleFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbListSampleToBalancedListSampleFilter_h
 #define __otbListSampleToBalancedListSampleFilter_h
 
-#include "otbListSampleToListSampleFilter.h"
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "itkDataObjectDecorator.h"
 #include "otbMacro.h"
diff --git a/Code/Learning/otbMachineLearningModel.h b/Code/Learning/otbMachineLearningModel.h
index 849d659ea06de70e817fbf24cd562d56ea6edcb1..9f2c39e7dcbf0a4f978b7223ea04be9095684a2e 100644
--- a/Code/Learning/otbMachineLearningModel.h
+++ b/Code/Learning/otbMachineLearningModel.h
@@ -20,7 +20,6 @@
 
 #include "itkObject.h"
 #include "itkVariableLengthVector.h"
-#include "itkFixedArray.h"
 #include "itkListSample.h"
 
 namespace otb
diff --git a/Code/Learning/otbMachineLearningModelFactory.h b/Code/Learning/otbMachineLearningModelFactory.h
index 07693d15cd2d20db08c3bdca744acd628accba7f..4c4a239354cb80a98f515a2e87af4d1a051de4b9 100644
--- a/Code/Learning/otbMachineLearningModelFactory.h
+++ b/Code/Learning/otbMachineLearningModelFactory.h
@@ -18,7 +18,6 @@
 #ifndef __otbMachineLearningModelFactory_h
 #define __otbMachineLearningModelFactory_h
 
-#include "itkObject.h"
 #include "otbMachineLearningModel.h"
 #include "otbMachineLearningModelFactoryBase.h"
 
diff --git a/Code/Learning/otbMachineLearningModelFactoryBase.h b/Code/Learning/otbMachineLearningModelFactoryBase.h
index 2058d645b88813699193e548c6e4a2cd3500b891..7dd030c2f6d2e3693a7ffcb7e1eb9cb8d06560b9 100644
--- a/Code/Learning/otbMachineLearningModelFactoryBase.h
+++ b/Code/Learning/otbMachineLearningModelFactoryBase.h
@@ -18,7 +18,6 @@
 #ifndef __otbMachineLearningModelFactoryBase_h
 #define __otbMachineLearningModelFactoryBase_h
 
-#include "itkObject.h"
 #include "itkMutexLock.h"
 
 namespace otb
diff --git a/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx b/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx
index 132c30f58a5beb6fc3cc096b0cfeaa96534fd152..2889cf1d861de2ec69193924e94da97db67d565c 100644
--- a/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx
+++ b/Code/Learning/otbNeighborhoodMajorityVotingImageFilter.txx
@@ -21,7 +21,6 @@
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
 // gets integrated into the main directories.
-#include "itkConfigure.h"
 
 #include "otbNeighborhoodMajorityVotingImageFilter.h"
 
diff --git a/Code/Learning/otbROIdataConversion.txx b/Code/Learning/otbROIdataConversion.txx
index 4c34af1df6d8f57fc9c45103cd67bf2bdf079a39..142bb6fe1b5af7e244c917f896fa4dcc7fe4ef04 100644
--- a/Code/Learning/otbROIdataConversion.txx
+++ b/Code/Learning/otbROIdataConversion.txx
@@ -21,11 +21,9 @@
 #ifndef __otbROIdataConversion_txx
 #define __otbROIdataConversion_txx
 
-#include "otbImage.h"
 #include "itkVector.h"
 
 #include "otbROIdataConversion.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 namespace otb
diff --git a/Code/Learning/otbSEMClassifier.h b/Code/Learning/otbSEMClassifier.h
index 3127c20712ebf159624ec695eb75bd6da3cbaca4..35a7318f4a3fa46b78e642d1ba6757ed0b12a42a 100644
--- a/Code/Learning/otbSEMClassifier.h
+++ b/Code/Learning/otbSEMClassifier.h
@@ -3,7 +3,6 @@
 
 #include "itkListSample.h"
 #include "itkSampleClassifierFilter.h"
-#include "itkMembershipFunctionBase.h"
 
 #include "otbModelComponentBase.h"
 
diff --git a/Code/Learning/otbSEMClassifier.txx b/Code/Learning/otbSEMClassifier.txx
index 6dc034b0743b2b46ab005714595e473d6dfbb6de..f53424bc58bae306e5c5ccd8dcebe20b14db8df5 100644
--- a/Code/Learning/otbSEMClassifier.txx
+++ b/Code/Learning/otbSEMClassifier.txx
@@ -10,7 +10,6 @@
 
 #include "otbMacro.h"
 // default mixture model
-#include "otbGaussianModelComponent.h"
 
 #include "otbSEMClassifier.h"
 
diff --git a/Code/Learning/otbSOMActivationBuilder.txx b/Code/Learning/otbSOMActivationBuilder.txx
index 8b553fae4534913dc8dcdb1dfc037d50b558ae24..e8048291e0e59f30311451043c173f79a82a94cf 100644
--- a/Code/Learning/otbSOMActivationBuilder.txx
+++ b/Code/Learning/otbSOMActivationBuilder.txx
@@ -18,7 +18,6 @@
 #ifndef __otbSOMActivationBuilder_txx
 #define __otbSOMActivationBuilder_txx
 
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 namespace otb
diff --git a/Code/Learning/otbSOMImageClassificationFilter.h b/Code/Learning/otbSOMImageClassificationFilter.h
index 2d6f1a09b5aa0281d12c78c681495a43ae1f9c13..008ba063b36ab45b073e15c033ae99252346dc4f 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.h
+++ b/Code/Learning/otbSOMImageClassificationFilter.h
@@ -20,7 +20,6 @@
 
 #include "otbSOMClassifier.h"
 #include "itkInPlaceImageFilter.h"
-#include "itkFixedArray.h"
 #include "itkListSample.h"
 
 namespace otb
diff --git a/Code/Learning/otbSVMImageModelEstimator.h b/Code/Learning/otbSVMImageModelEstimator.h
index c125de941ca79a786ad79c357c056e99fc974285..b9b93dc5ddaf487ad51298be748a0f8618204e5e 100644
--- a/Code/Learning/otbSVMImageModelEstimator.h
+++ b/Code/Learning/otbSVMImageModelEstimator.h
@@ -22,7 +22,6 @@
 
 #include "itkImageModelEstimatorBase.h"
 #include "itkImageRegionIterator.h"
-#include "otbSVMModel.h"
 #include "otbSVMModelEstimator.h"
 
 namespace otb
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.h b/Code/Learning/otbSVMSampleListModelEstimator.h
index 093096797f3fdc65cbb0ccc5cd9849c3a8f4ad77..911963f8064f6c8c959cba161b6029e9982e69b9 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.h
+++ b/Code/Learning/otbSVMSampleListModelEstimator.h
@@ -22,7 +22,6 @@
 
 #include "itkImageModelEstimatorBase.h"
 #include "itkImageRegionIterator.h"
-#include "otbSVMModel.h"
 #include "otbSVMModelEstimator.h"
 
 namespace otb
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.h b/Code/Markov/otbMarkovRandomFieldFilter.h
index 823c578d3a7e2f8a1c332f09873bbc27ed845249..f592c4598a47857fb031f40c5233081ca6dbe588 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.h
+++ b/Code/Markov/otbMarkovRandomFieldFilter.h
@@ -27,12 +27,10 @@
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIterator.h"
 
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkNeighborhood.h"
 #include "itkSize.h"
-#include "otbMRFEnergy.h"
 #include "otbMRFOptimizer.h"
 #include "otbMRFSampler.h"
 
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
index a92f66da2dc4457781dd99a26a33152bb80ca53e..d4bfba606d24095b83aac7ad11bf4872d6d45658 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbGeodesicMorphologyDecompositionImageFilter_h
 #define __otbGeodesicMorphologyDecompositionImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbGeodesicMorphologyLevelingFilter.h"
 #include "itkSubtractImageFilter.h"
 #include "itkOpeningByReconstructionImageFilter.h"
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.txx b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
index be6a8a66d3166fad8445d51d91ac3ce229ad395e..0f377e64723ce1d25cd14460083c4c393a9db38b 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
@@ -21,9 +21,7 @@
 #include "itkResampleImageFilter.h"
 #include "itkScalableAffineTransform.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkProgressAccumulator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 namespace otb
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
index 87ab0cdfc5bc9f47b7c35d1ea6732d2d10a9d15c..b6eff7705102320b82dbcdbec02938781af73505 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include <vector>
 #include "otbMacro.h"
 
diff --git a/Code/MultiScale/otbSubsampleImageFilter.txx b/Code/MultiScale/otbSubsampleImageFilter.txx
index 16456528bda99a89854327f38632a660f30f8244..2474aca2bcb8e27a38ff4e5d7d1a2dd18b7c8705 100644
--- a/Code/MultiScale/otbSubsampleImageFilter.txx
+++ b/Code/MultiScale/otbSubsampleImageFilter.txx
@@ -23,9 +23,7 @@
 #include "otbSubsampleImageFilter.h"
 
 #include "otbMacro.h"
-#include "otbSubsampledImageRegionConstIterator.h"
 #include "otbSubsampledImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 
diff --git a/Code/MultiScale/otbWaveletFilterBank.txx b/Code/MultiScale/otbWaveletFilterBank.txx
index 8d2cb6def50dd0b855d948866d7040c1ab8f5783..3cd2693ca6f023cfd42c8a51a0c790a3f7ecb6a2 100644
--- a/Code/MultiScale/otbWaveletFilterBank.txx
+++ b/Code/MultiScale/otbWaveletFilterBank.txx
@@ -22,13 +22,10 @@
 #define __otbWaveletFilterBank_txx
 #include "otbWaveletFilterBank.h"
 
-#include "otbMacro.h"
 #include "otbSubsampleImageFilter.h"
 #include "otbSubsampledImageRegionConstIterator.h"
 
-#include "itkNeighborhoodAlgorithm.h"
 #include "itkPeriodicBoundaryCondition.h"
-#include "itkProgressReporter.h"
 
 // FIXME
 #define __myDebug__ 0
diff --git a/Code/MultiScale/otbWaveletGenerator.h b/Code/MultiScale/otbWaveletGenerator.h
index 9b0ea1e9fb0ac4f2222e890a4a73259a50cd1488..100d46212868ad1da96f5e98525d642d868c2319 100644
--- a/Code/MultiScale/otbWaveletGenerator.h
+++ b/Code/MultiScale/otbWaveletGenerator.h
@@ -22,7 +22,6 @@
 #define __otbWaveletGenerator_h
 
 #include <vector>
-#include "itkMacro.h"
 #include "itkLightObject.h"
 #include "itkObjectFactory.h"
 
diff --git a/Code/MultiScale/otbWaveletPacketTransform.h b/Code/MultiScale/otbWaveletPacketTransform.h
index 6ce97769f2444620136444df9b4c147b92f7bf08..48642ed6b89d15d8e45a40a028ab7582a3b92710 100644
--- a/Code/MultiScale/otbWaveletPacketTransform.h
+++ b/Code/MultiScale/otbWaveletPacketTransform.h
@@ -21,7 +21,6 @@
 #ifndef __otbWaveletPacketTransform_h
 #define __otbWaveletPacketTransform_h
 
-#include "itkImageSource.h"
 #include "otbImageToImageListFilter.h"
 #include "otbImageListToImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Code/MultiScale/otbWaveletTransform.txx b/Code/MultiScale/otbWaveletTransform.txx
index 4b826cd468acabf0714982002de586003c698f3e..fcccb78421cad5365c80cdd76590c19cd82da81f 100644
--- a/Code/MultiScale/otbWaveletTransform.txx
+++ b/Code/MultiScale/otbWaveletTransform.txx
@@ -23,7 +23,6 @@
 #include "otbWaveletTransform.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressAccumulator.h"
 #include "otbMacro.h"
 
diff --git a/Code/OBIA/otbAttributesMapLabelObject.h b/Code/OBIA/otbAttributesMapLabelObject.h
index b3af24017f211049834af3555589bd9cfeb89962..67efda31f5f0d6d3dd9506aa82ef9c9af9351ded 100644
--- a/Code/OBIA/otbAttributesMapLabelObject.h
+++ b/Code/OBIA/otbAttributesMapLabelObject.h
@@ -19,7 +19,6 @@
 #define __otbAttributesMapLabelObject_h
 
 #include "itkShapeLabelObject.h"
-#include "itkLabelMap.h"
 #include "otbPolygon.h"
 #include <map>
 
diff --git a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
index 4515adf000d01cfa84a75ba41a5f45a2e80929ad..2039b8b90cf1ba23f58bc11a019bda12963b88a4 100644
--- a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
+++ b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
@@ -18,12 +18,10 @@ PURPOSE.  See the above copyright notices for more information.
 #ifndef __otbImageToLabelMapWithAttributesFilter_h
 #define __otbImageToLabelMapWithAttributesFilter_h
 
-#include "itkLabelMap.h"
 #include "itkLabelObject.h"
 #include "itkShapeLabelMapFilter.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
-#include "otbLabelMapWithAdjacency.h"
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "otbLabelMapWithClassLabelToClassLabelImageFilter.h"
diff --git a/Code/OBIA/otbKMeansAttributesLabelMapFilter.h b/Code/OBIA/otbKMeansAttributesLabelMapFilter.h
index fea27b7607b1324ffe3e8266c5b6b5dab9604e98..7e8cf7d76e40b738fbec4594d1a525076179f439 100644
--- a/Code/OBIA/otbKMeansAttributesLabelMapFilter.h
+++ b/Code/OBIA/otbKMeansAttributesLabelMapFilter.h
@@ -21,7 +21,6 @@ PURPOSE.  See the above copyright notices for more information.
 #include "itkLabelMapFilter.h"
 #include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
 #include "itkListSample.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkWeightedCentroidKdTreeGenerator.h"
 #include "itkKdTreeBasedKmeansEstimator.h"
 
diff --git a/Code/OBIA/otbLabelMapSource.h b/Code/OBIA/otbLabelMapSource.h
index 8acc6124348d96505c5b920475651d6456df9182..7a27530f5ede68ae58109b79a7f83411e14a8ca8 100644
--- a/Code/OBIA/otbLabelMapSource.h
+++ b/Code/OBIA/otbLabelMapSource.h
@@ -21,7 +21,6 @@
 
 
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkMacro.h"
 
 namespace otb
diff --git a/Code/OBIA/otbLabelObjectToPolygonFunctor.h b/Code/OBIA/otbLabelObjectToPolygonFunctor.h
index 315b21aa3e509bfc2e8f6d3e9bbd7861a22c91f8..3c943c41eea2076db0b8b5e74fc115b76257a084 100644
--- a/Code/OBIA/otbLabelObjectToPolygonFunctor.h
+++ b/Code/OBIA/otbLabelObjectToPolygonFunctor.h
@@ -23,7 +23,6 @@
 //TODO change this include  have to define from what inherate this class
 #include "otbPolyLineParametricPathWithValue.h" //for vcl_abs
 
-#include "itkVector.h"
 #include "itkPoint.h"
 #include "itkIndex.h"
 
diff --git a/Code/OBIA/otbShapeAttributesLabelMapFilter.txx b/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
index 0c2b6785b2e095981d30274da1e5430f32d891a5..44ffb6e87622b87f2524caba33305b6accbf6835 100644
--- a/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
+++ b/Code/OBIA/otbShapeAttributesLabelMapFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "itkProgressReporter.h"
-#include "itkNeighborhoodIterator.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkConstShapedNeighborhoodIterator.h"
 #include "itkLabelMapToLabelImageFilter.h"
diff --git a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index 94e93f857a7daedc4a534a911c894bada9f48754..c32538979ff6a4c0ce29f3c8ca00016022cf9fdb 100644
--- a/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Code/OBIA/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
 #define __otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_h
 
-#include "itkMacro.h"
 #include "otbPersistentImageToVectorDataFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
 
@@ -27,7 +26,6 @@
 #include "otbMaskMuParserFilter.h"
 #include "itkRelabelComponentImageFilter.h"
 #include "otbAttributesMapLabelObject.h"
-#include "otbLabelMapWithAdjacency.h"
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "otbShapeAttributesLabelMapFilter.h"
diff --git a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
index bbdbf55c420847e716973bf0a0b2376d5e24a2a8..7ddba0a65f4d24acade88f6b0359715c7ee47c21 100644
--- a/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Code/OBIA/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -27,7 +27,6 @@
 //#include "itkDataObject.h"
 
 #include "otbLabelMapSource.h"
-#include "otbVectorData.h"
 #include "otbCorrectPolygonFunctor.h"
 
 #include <vector>
diff --git a/Code/ObjectDetection/otbDescriptorsListSampleGenerator.h b/Code/ObjectDetection/otbDescriptorsListSampleGenerator.h
index c441d751a196f1c1766a16a61c945d5b6e767f39..51fff9d3fc6558c39cf038a77f71561f8a52a6fe 100644
--- a/Code/ObjectDetection/otbDescriptorsListSampleGenerator.h
+++ b/Code/ObjectDetection/otbDescriptorsListSampleGenerator.h
@@ -27,7 +27,6 @@
 #include "itkListSample.h"
 #include "otbVectorData.h"
 
-#include "itkDataObject.h"
 #include "itkSimpleDataObjectDecorator.h"
 
 #include "otbPersistentImageFilter.h"
diff --git a/Code/ObjectDetection/otbFlusserMomentsIFFactory.h b/Code/ObjectDetection/otbFlusserMomentsIFFactory.h
index 1300c9389d46c8f1829135af51d84b2381f9547c..dbc5c412b9abc2db3400273aaeebcfafed4d5d8a 100644
--- a/Code/ObjectDetection/otbFlusserMomentsIFFactory.h
+++ b/Code/ObjectDetection/otbFlusserMomentsIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbFlusserMomentsImageFunction.h"
diff --git a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h b/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
index f4694518453abb308f93772bc0383ed8bacf4fad..da3ddb08b53ddea8e8ddd4696ace22c90fbd5861 100644
--- a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
+++ b/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbFourierMellinDescriptorsImageFunction.h"
diff --git a/Code/ObjectDetection/otbHaralickTexturesIFFactory.h b/Code/ObjectDetection/otbHaralickTexturesIFFactory.h
index 8c888daf78249537f3042627be9e2b559430ad67..68b1911515cd5fce393c108079bfa7e46ba753dd 100644
--- a/Code/ObjectDetection/otbHaralickTexturesIFFactory.h
+++ b/Code/ObjectDetection/otbHaralickTexturesIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbHaralickTexturesImageFunction.h"
diff --git a/Code/ObjectDetection/otbLocalHistogramIFFactory.h b/Code/ObjectDetection/otbLocalHistogramIFFactory.h
index 1322f9bb80e42e68aab6c4a7a4f426bf83a3d4cb..650006465169c70a4e8b484f3def0492aaae75ac 100644
--- a/Code/ObjectDetection/otbLocalHistogramIFFactory.h
+++ b/Code/ObjectDetection/otbLocalHistogramIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbLocalHistogramImageFunction.h"
diff --git a/Code/ObjectDetection/otbObjectDetectionClassifier.h b/Code/ObjectDetection/otbObjectDetectionClassifier.h
index ca40189091415c4b6b6f2b6dc44c11f09d11bfd6..0510d6f3a388dc34f3227eb52a9f9ea016c83923 100644
--- a/Code/ObjectDetection/otbObjectDetectionClassifier.h
+++ b/Code/ObjectDetection/otbObjectDetectionClassifier.h
@@ -24,7 +24,6 @@
 #include "itkImageRegion.h"
 #include "otbVectorData.h"
 
-#include "itkDataObject.h"
 #include "itkDataObjectDecorator.h"
 #include "itkSimpleDataObjectDecorator.h"
 
diff --git a/Code/ObjectDetection/otbRadiometricMomentsIFFactory.h b/Code/ObjectDetection/otbRadiometricMomentsIFFactory.h
index 26ccc9b3459a943aadecfd081a50f225c8ba5135..806b6053c29d90fe46337d3004aad22951c2459f 100644
--- a/Code/ObjectDetection/otbRadiometricMomentsIFFactory.h
+++ b/Code/ObjectDetection/otbRadiometricMomentsIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbRadiometricMomentsImageFunction.h"
diff --git a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h b/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
index 6733889e86e315bb1205157e041c24d7faf13554..ba57a25d1981d0bd68423a7876207076741809f6 100644
--- a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
+++ b/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
@@ -18,12 +18,9 @@
 #ifndef __otbStandardMetaImageFunctionBuilder_h
 #define __otbStandardMetaImageFunctionBuilder_h
 
-#include "itkLightObject.h"
 
 #include "otbMetaImageFunction.h"
-#include "itkDataObject.h"
 #include "itkVariableLengthVector.h"
-#include "otbImage.h"
 
 #include "otbMultiChannelIFFactory.h"
 
diff --git a/Code/Projections/otbForwardSensorModel.h b/Code/Projections/otbForwardSensorModel.h
index 8c10ec76868d5292e3c5b38d734ab92715e7b3e6..b85c2b7fa316df358f95f80b3aa28096ad09600a 100644
--- a/Code/Projections/otbForwardSensorModel.h
+++ b/Code/Projections/otbForwardSensorModel.h
@@ -21,7 +21,6 @@
 
 #include "otbSensorModelBase.h"
 #include "itkMacro.h"
-#include "itkSmartPointer.h"
 #include "itkObject.h"
 
 namespace otb
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.h b/Code/Projections/otbGenericRSResampleImageFilter.h
index f0f0d15cf70348aca03875bf68846daaa3d69ca7..c0a44cf9e46b2dff1e33d2838816da59fefa7852 100644
--- a/Code/Projections/otbGenericRSResampleImageFilter.h
+++ b/Code/Projections/otbGenericRSResampleImageFilter.h
@@ -18,10 +18,8 @@
 #ifndef __otbGenericRSResampleImageFilter_h
 #define __otbGenericRSResampleImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbStreamingResampleImageFilter.h"
 #include "otbPhysicalToRPCSensorModelImageFilter.h"
-#include "otbGenericRSTransform.h"
 
 namespace otb
 {
diff --git a/Code/Projections/otbGenericRSResampleImageFilter.txx b/Code/Projections/otbGenericRSResampleImageFilter.txx
index 943f6db853a2b71221cc3971679ebf5bce8084dd..42eedb9ba479812413b7fae52aacad766fc6a243 100644
--- a/Code/Projections/otbGenericRSResampleImageFilter.txx
+++ b/Code/Projections/otbGenericRSResampleImageFilter.txx
@@ -20,14 +20,12 @@
 
 #include "otbGenericRSResampleImageFilter.h"
 
-#include "itkMetaDataDictionary.h"
 #include "itkMetaDataObject.h"
 #include "otbMetaDataKey.h"
 
 #include "itkProgressAccumulator.h"
 
 #include "itkPoint.h"
-#include "itkNumericTraits.h"
 
 #include "ogr_spatialref.h"
 #include "cpl_conv.h"
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index c84e8a6b18d182ac4043e43af373e2da455d6176..396ad8d0eca9e071e33249cbd54694b93c800eea 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -18,7 +18,6 @@
 #ifndef __otbGenericRSTransform_h
 #define __otbGenericRSTransform_h
 
-#include "otbTransform.h"
 #include "itkMacro.h"
 #include "otbCompositeTransform.h"
 
diff --git a/Code/Projections/otbGeocentricTransform.h b/Code/Projections/otbGeocentricTransform.h
index 0f9b8ae9cc3455b284c696e7867027cd27c1832c..8112e259d5d5786ddca4876b08684e2d51694857 100644
--- a/Code/Projections/otbGeocentricTransform.h
+++ b/Code/Projections/otbGeocentricTransform.h
@@ -18,7 +18,6 @@
 #ifndef __otbGeocentricTransform_h
 #define __otbGeocentricTransform_h
 
-#include "otbTransform.h"
 #include "otbGenericMapProjection.h"
 #include "otbEllipsoidAdapter.h"
 
diff --git a/Code/Projections/otbGroundSpacingImageFunction.txx b/Code/Projections/otbGroundSpacingImageFunction.txx
index 68e53110c5a2712b4105e020b3f830be4a9571c1..1461ebba6fd58466593bfe1264486de1721d6532 100644
--- a/Code/Projections/otbGroundSpacingImageFunction.txx
+++ b/Code/Projections/otbGroundSpacingImageFunction.txx
@@ -24,7 +24,6 @@
 
 #include "otbGroundSpacingImageFunction.h"
 
-#include "itkNumericTraits.h"
 #include "itkConstNeighborhoodIterator.h"
 
 namespace otb
diff --git a/Code/Projections/otbInverseSensorModel.h b/Code/Projections/otbInverseSensorModel.h
index c06f557a5fbb23b6d0e8288928fa860ad8f1b8ab..176900ff93d95e8d0430649d0dc7d47910b4dc60 100644
--- a/Code/Projections/otbInverseSensorModel.h
+++ b/Code/Projections/otbInverseSensorModel.h
@@ -21,7 +21,6 @@
 #include "otbSensorModelBase.h"
 
 #include "itkMacro.h"
-#include "itkSmartPointer.h"
 #include "itkObject.h"
 
 namespace otb
diff --git a/Code/Projections/otbMapProjections.h b/Code/Projections/otbMapProjections.h
index b115f33754a426e10d3f8e91f8d6c7617ff7049f..644a0d0c3d5d7625c2e3f2386728aef736b3a0ec 100644
--- a/Code/Projections/otbMapProjections.h
+++ b/Code/Projections/otbMapProjections.h
@@ -21,12 +21,10 @@
 #include "otbMapProjectionDeprecated.h"
 
 #include "otbUtmMapProjection.h"
-#include "otbLambertConformalConicMapProjection.h"
 #include "otbLambert2EtenduProjection.h"
 #include "otbLambert3CartoSudProjection.h"
 #include "otbLambert93Projection.h"
 #include "otbEckert4MapProjection.h"
-#include "otbTransMercatorMapProjection.h"
 #include "otbSinusoidalMapProjection.h"
 #include "otbMollweidMapProjection.h"
 #include "otbSVY21MapProjection.h"
diff --git a/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h b/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h
index b6577fe64eaa71ab883be471d2be490f7bc598af..2314dfc481e04efa4831856d6015d078e6ea7afb 100644
--- a/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Code/Projections/otbPhysicalToRPCSensorModelImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbPhysicalToRPCSensorModelImageFilter_h
 #define __otbPhysicalToRPCSensorModelImageFilter_h
 
-#include "itkCastImageFilter.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 #include "otbGenericRSTransform.h"
 
diff --git a/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h b/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h
index 8b97470b7ca8b3a2514191c5f092bbed854b42b4..4affd6fe55d9a877c1bf635f16783e1879d934ca 100644
--- a/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h
+++ b/Code/Projections/otbPleiadesPToXSAffineTransformCalculator.h
@@ -19,7 +19,6 @@
 #define __otbPleiadesPToXSAffineTransformCalculator__h
 
 #include "itkLightObject.h"
-#include "itkObjectFactory.h"
 #include "itkScalableAffineTransform.h"
 #include "itkImageBase.h"
 
diff --git a/Code/Projections/otbSensorModelBase.h b/Code/Projections/otbSensorModelBase.h
index 187738dab19810d1d2a0930bae1d874e57cfe64e..cb076ff4e279e5a476ee26c031be70a485f509e3 100644
--- a/Code/Projections/otbSensorModelBase.h
+++ b/Code/Projections/otbSensorModelBase.h
@@ -26,7 +26,6 @@
 
 #include "otbTransform.h"
 #include "itkSmartPointer.h"
-#include "itkObject.h"
 
 namespace otb
 {
diff --git a/Code/Projections/otbSensorModelBase.txx b/Code/Projections/otbSensorModelBase.txx
index 97097e5d73a4b67d22560127e46f0d6526edcb60..fe12a75e72a077d695368d5d16c8e20c823649ca 100644
--- a/Code/Projections/otbSensorModelBase.txx
+++ b/Code/Projections/otbSensorModelBase.txx
@@ -20,7 +20,6 @@
 
 #include "otbSensorModelBase.h"
 
-#include "otbMacro.h"
 
 namespace otb
 {
diff --git a/Code/Projections/otbTileMapTransform.h b/Code/Projections/otbTileMapTransform.h
index fe2460dfd3f88f4bb054ebb7ce5b54d3580dceee..027e9ed47e264b1bc15824367f49b34b87415757 100644
--- a/Code/Projections/otbTileMapTransform.h
+++ b/Code/Projections/otbTileMapTransform.h
@@ -18,7 +18,6 @@
 #ifndef __otbTileMapTransform_h
 #define __otbTileMapTransform_h
 
-#include "otbTransform.h"
 
 // Only for the enum definition
 #include "otbGenericMapProjection.h"
diff --git a/Code/Projections/otbVectorDataIntoImageProjectionFilter.h b/Code/Projections/otbVectorDataIntoImageProjectionFilter.h
index ddfaca95cf76e601052689dfdd0c65c118352835..ab8cbe7c705666d31d08825bac0abb5103940187 100644
--- a/Code/Projections/otbVectorDataIntoImageProjectionFilter.h
+++ b/Code/Projections/otbVectorDataIntoImageProjectionFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbVectorDataIntoImageProjectionFilter_h
 #define __otbVectorDataIntoImageProjectionFilter_h
 
-#include "otbVectorDataToVectorDataFilter.h"
 
 #include "otbImage.h"
 
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index fe1ba2517edc5da921ec8ed73df7a52d62756c5e..0d637907ddf458b9d870f63e3613c4d20882ef29 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -19,7 +19,6 @@
 #define __otbAtmosphericCorrectionParameters_h
 
 #include "itkObject.h"
-#include "itkObjectFactory.h"
 #include "itkMacro.h"
 #include "itkVariableSizeMatrix.h"
 #include "itkVariableLengthVector.h"
diff --git a/Code/Radiometry/otbBuiltUpIndicesFunctor.h b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
index fee3980eb8a63d6e0d7bab8b43b7e2f319a4cfcc..2f7e9dfe72313bd0c2ef6ad4c5826e2c2b4e02b5 100644
--- a/Code/Radiometry/otbBuiltUpIndicesFunctor.h
+++ b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
@@ -18,7 +18,6 @@
 #ifndef __otbBuiltUpIndicesFunctor_h
 #define __otbBuiltUpIndicesFunctor_h
 
-#include "otbMath.h"
 #include "itkVariableLengthVector.h"
 #include "otbVegetationIndicesFunctor.h"
 
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.h b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
index 53da381cbfd642029861ec0206e9d710bf7fd393..bbb9749dd411debb41f547f20153cbfca8287f7e 100644
--- a/Code/Radiometry/otbDEMCaracteristicsExtractor.h
+++ b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
@@ -23,10 +23,8 @@
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
-#include "itkImageToImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
-#include "itkNthElementImageAdaptor.h"
 #include "itkCovariantVector.h"
 #include "itkAtan2ImageFilter.h"
 #include "itkAtanImageFilter.h"
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.txx b/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
index f56887d06fed0b579e2f0d7a95446f1d46f2fb3c..717437a8c3011392e6ee276f0999c291bcecc397 100644
--- a/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
+++ b/Code/Radiometry/otbDEMCaracteristicsExtractor.txx
@@ -22,7 +22,6 @@
 #define __otbDEMCaracteristicsExtractor_txx
 
 #include "otbDEMCaracteristicsExtractor.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 #include "otbMath.h"
 
diff --git a/Code/Radiometry/otbGAndRIndexImageFilter.txx b/Code/Radiometry/otbGAndRIndexImageFilter.txx
index 9be8710eb690cef4f77a3d7b752430af219b3825..37ec73ef01629de4332c193cb285efcae1214838 100644
--- a/Code/Radiometry/otbGAndRIndexImageFilter.txx
+++ b/Code/Radiometry/otbGAndRIndexImageFilter.txx
@@ -20,9 +20,7 @@
 
 #include "otbGAndRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
-#include "itkProcessObject.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbImageMetadataCorrectionParameters.h b/Code/Radiometry/otbImageMetadataCorrectionParameters.h
index 0bde6a032577109da60efea781abe2beb4896419..10292571cb05e49b47cfafac44a8923464fb81d4 100644
--- a/Code/Radiometry/otbImageMetadataCorrectionParameters.h
+++ b/Code/Radiometry/otbImageMetadataCorrectionParameters.h
@@ -19,7 +19,6 @@
 #define __otbImageMetadataCorrectionParameters_h
 
 #include "itkObject.h"
-#include "itkMacro.h"
 #include "itkVariableSizeMatrix.h"
 #include "itkVariableLengthVector.h"
 #include "otbObjectList.h"
diff --git a/Code/Radiometry/otbImageToLuminanceImageFilter.h b/Code/Radiometry/otbImageToLuminanceImageFilter.h
index 4ffb0ab979718c588662fd89c7d9f6e376397047..f6b1764bb820171c94d0d4ce9e86bbf6919c72fc 100644
--- a/Code/Radiometry/otbImageToLuminanceImageFilter.h
+++ b/Code/Radiometry/otbImageToLuminanceImageFilter.h
@@ -24,11 +24,8 @@
 
 #include "otb_6S.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "itkNumericTraits.h"
-#include "itkVariableLengthVector.h"
 #include "otbMacro.h"
-#include "otbOpticalImageMetadataInterface.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 
 #include <fstream>
diff --git a/Code/Radiometry/otbImageToReflectanceImageFilter.h b/Code/Radiometry/otbImageToReflectanceImageFilter.h
index a3151a4ca7d3ade75f59ea7967f024b0af7d6d92..1f21221435ac99a5e3b515bb48498ab08646a544 100644
--- a/Code/Radiometry/otbImageToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbImageToReflectanceImageFilter.h
@@ -22,13 +22,10 @@
 #ifndef __otbImageToReflectanceImageFilter_h
 #define __otbImageToReflectanceImageFilter_h
 
-#include "otbVarSol.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "itkNumericTraits.h"
-#include "itkVariableLengthVector.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbLandsatTMIndices.h b/Code/Radiometry/otbLandsatTMIndices.h
index 3ab1b60841e631c7c79ce8c92faffb2d1d51418c..a3555bee571fe04b350455d5d8c568954a03de96 100644
--- a/Code/Radiometry/otbLandsatTMIndices.h
+++ b/Code/Radiometry/otbLandsatTMIndices.h
@@ -20,7 +20,6 @@
 
 #include "otbMath.h"
 #include "itkVariableLengthVector.h"
-#include "itkFixedArray.h"
 #include "otbBandName.h"
 #include "otbFuzzyVariable.h"
 #include <vector>
diff --git a/Code/Radiometry/otbLuminanceToImageImageFilter.h b/Code/Radiometry/otbLuminanceToImageImageFilter.h
index b3c660c6b81855455df64d3faf14a297c26936e9..116f2e38516d4bea0b6f91d3ae538c36d10b3c8d 100644
--- a/Code/Radiometry/otbLuminanceToImageImageFilter.h
+++ b/Code/Radiometry/otbLuminanceToImageImageFilter.h
@@ -24,11 +24,8 @@
 
 #include "otb_6S.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "itkNumericTraits.h"
-#include "itkVariableLengthVector.h"
 #include "otbMacro.h"
-#include "otbOpticalImageMetadataInterface.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 
 #include <fstream>
diff --git a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
index 2d29e7d3f2377c8cf083ddfbe5f85909689c1752..869a14b42a9792b397cf61cd4ad68bde61424697 100644
--- a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
@@ -24,12 +24,9 @@
 
 #include "otbVarSol.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbMath.h"
-#include "itkNumericTraits.h"
 #include "itkVariableLengthVector.h"
 #include "otbMacro.h"
-#include "otbOpticalImageMetadataInterface.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 #include <iomanip>
 
diff --git a/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
index b9d11c4918d954a203dd5f9de94296f7c202d3cf..3ecfb4fd84af36d94382e4543984827e831163c4 100644
--- a/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelGAndRIndexImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbMultiChannelGAndRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "otbSoilIndicesFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
index 0137666949c19a39c581f35382d7ed02ba966c63..bd9039bb05ce62dd2e2daf0175db8a0187b9bf9c 100644
--- a/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndBAndNIRIndexImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbMultiChannelRAndBAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "otbVegetationIndicesFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
index 0ef3a223c671607856c85c72683413dad462c077..028c6e5979817ead9e36dba2e34e5b50f6188523 100644
--- a/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndGAndNIRIndexImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbMultiChannelRAndGAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "otbVegetationIndicesFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h b/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
index 15a798b2e6c7beb258cf7902263b6d99017df259..e82d2c067ed5c2e3e4341a6a10f2d6cac1599a40 100644
--- a/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
+++ b/Code/Radiometry/otbMultiChannelRAndNIRIndexImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbMultiChannelRAndNIRIndexImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
-#include "itkImageRegionIteratorWithIndex.h"
 #include "otbVegetationIndicesFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbRAndNIRIndexImageFilter.txx b/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
index cf258269e6deebc3daa40fc496cee6cb143e7ab0..b1e42689ac6bb05c7550875d856afe0bbce50d5e 100644
--- a/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
+++ b/Code/Radiometry/otbRAndNIRIndexImageFilter.txx
@@ -20,9 +20,7 @@
 
 #include "otbRAndNIRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
-#include "itkProcessObject.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h b/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
index 03c683f8e9a7d286bb9e432195759f3ebe59431f..219112fd11e8fcd8a8b00daab59541d0abf35350 100644
--- a/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h
@@ -19,7 +19,6 @@
 #define __otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms_h
 
 #include "otbAtmosphericRadiativeTerms.h"
-#include "otbAtmosphericCorrectionParameters.h"
 #include "otbImageMetadataCorrectionParameters.h"
 #include "otbSIXSTraits.h"
 
diff --git a/Code/Radiometry/otbReflectanceToImageImageFilter.h b/Code/Radiometry/otbReflectanceToImageImageFilter.h
index 32e8d3322da1411041d1debab83989d1c8f5879a..dbd7b2b7646b876d3a98d9b57ef8cac6cb82754a 100644
--- a/Code/Radiometry/otbReflectanceToImageImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToImageImageFilter.h
@@ -22,12 +22,9 @@
 #ifndef __otbReflectanceToImageImageFilter_h
 #define __otbReflectanceToImageImageFilter_h
 
-#include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "otbLuminanceToImageImageFilter.h"
 #include "otbReflectanceToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "itkNumericTraits.h"
-#include "itkVariableLengthVector.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h b/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
index b91b0bc5b7da5afc92f935960a6db4b89233e4d2..61f9fc8dac369ddda28a96f6f53fed4093f9c31c 100644
--- a/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
@@ -24,12 +24,9 @@
 
 #include "otb_6S.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbMath.h"
-#include "itkNumericTraits.h"
 #include "itkVariableLengthVector.h"
 #include "otbMacro.h"
-#include "otbOpticalImageMetadataInterface.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 #include <iomanip>
 
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
index f89c940715fb65d1325495de9ee8a771a894e44b..cd3c287309f9602b056300841d256e08e4d67e57 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -26,7 +26,6 @@
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbImageMetadataCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"
 
 #include "itkMetaDataDictionary.h"
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
index 24711e2967e3e0bc6fd6c90284eeed4041b41722..3920d8b6966be6839a1da8fad44708ad6781a2be 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbSarBrightnessFunction.h b/Code/Radiometry/otbSarBrightnessFunction.h
index 7313fcc54e21c8062254983beee8d84dc79b98a1..6e6d9694f845dd6ca282cabdef778148a1d2dfda 100644
--- a/Code/Radiometry/otbSarBrightnessFunction.h
+++ b/Code/Radiometry/otbSarBrightnessFunction.h
@@ -18,7 +18,6 @@
 #ifndef __otbSarBrightnessFunction_h
 #define __otbSarBrightnessFunction_h
 
-#include "itkNumericTraits.h"
 #include "itkImageFunction.h"
 #include "otbSarBrightnessFunctor.h"
 #include "otbSarParametricMapFunction.h"
diff --git a/Code/Radiometry/otbSarBrightnessFunction.txx b/Code/Radiometry/otbSarBrightnessFunction.txx
index 2bfca6890ac83814a39c21a3450af2823ca508b5..d18e9f3837cb85a787d1da49f6550f554dfc06a8 100644
--- a/Code/Radiometry/otbSarBrightnessFunction.txx
+++ b/Code/Radiometry/otbSarBrightnessFunction.txx
@@ -20,7 +20,6 @@
 #define __otbSarBrightnessFunction_txx
 
 #include "otbSarBrightnessFunction.h"
-#include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbSarBrightnessToImageFilter.txx b/Code/Radiometry/otbSarBrightnessToImageFilter.txx
index 8d63211cd4cf5309875695b570072b168bc319b2..5030eb932dcb4993abe4176103494971e185afa2 100644
--- a/Code/Radiometry/otbSarBrightnessToImageFilter.txx
+++ b/Code/Radiometry/otbSarBrightnessToImageFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbSarBrightnessToImageFilter.h"
 
-#include "otbSarImageMetadataInterface.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbSarParametricMapFunction.h b/Code/Radiometry/otbSarParametricMapFunction.h
index 39ab9e0ff474ee9277f684bc109fdd93f696c1cc..79821ca7b9efce0a0978ab93776f07e49e44776c 100644
--- a/Code/Radiometry/otbSarParametricMapFunction.h
+++ b/Code/Radiometry/otbSarParametricMapFunction.h
@@ -18,10 +18,8 @@
 #ifndef __otbSarParametricMapFunction_h
 #define __otbSarParametricMapFunction_h
 
-#include "itkNumericTraits.h"
 #include "itkImageFunction.h"
 #include "itkPointSet.h"
-#include "itkPoint.h"
 #include "itkVariableSizeMatrix.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbSarParametricMapFunction.txx b/Code/Radiometry/otbSarParametricMapFunction.txx
index 8fb5afeaaaeba7a8cea1a88e2a6e2de6cb9890d6..ed1c8c745c0ebf6d883ba40293d27e71dc1c751f 100644
--- a/Code/Radiometry/otbSarParametricMapFunction.txx
+++ b/Code/Radiometry/otbSarParametricMapFunction.txx
@@ -22,7 +22,6 @@
 #include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
 
-#include "itkMetaDataDictionary.h"
 #include "itkMetaDataObject.h"
 #include "otbMetaDataKey.h"
 #include "otbImageKeywordlist.h"
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
index e9e0f3815b3078ca640d34d63cdbb34be722272a..b2740e2befefc1518ae73e1b24df2468024699a1 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
+++ b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
@@ -18,7 +18,6 @@
 #ifndef __otbSarRadiometricCalibrationFunction_h
 #define __otbSarRadiometricCalibrationFunction_h
 
-#include "itkNumericTraits.h"
 #include "itkImageFunction.h"
 #include "otbSarRadiometricCalibrationFunctor.h"
 #include "otbSarParametricMapFunction.h"
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx b/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
index 9df22306b96fcd7297c5fd6aa526bdbebf84949b..b04ee4c8fc450006826cf3db1f5ad80777ca518b 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
+++ b/Code/Radiometry/otbSarRadiometricCalibrationFunction.txx
@@ -20,7 +20,6 @@
 #define __otbSarRadiometricCalibrationFunction_txx
 
 #include "otbSarRadiometricCalibrationFunction.h"
-#include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx b/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx
index 3b08da6f9d687428b94d907a900b66ef03f84574..15b09c7fd73a1381545b48a64bcd16593fd24b38 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx
+++ b/Code/Radiometry/otbSarRadiometricCalibrationToImageFilter.txx
@@ -23,7 +23,6 @@
 
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 
-#include "otbSarImageMetadataInterface.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h
index d7f1b75c71b9f2143dfe08cce52bc4023846efcb..8b78764b5439f51cc16502d69de081d8d7f2dab2 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h
@@ -24,10 +24,8 @@
 
 #include "itkNumericTraits.h"
 #include <vector>
-#include "itkConstNeighborhoodIterator.h"
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkVariableSizeMatrix.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h"
 #include <iomanip>
 
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
index b050c6d8a484df6da78010b610c219a5e8ef84a6..cc09104f8e7595f99b6cdec8fe099a67ffb8b142 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.txx
@@ -25,7 +25,6 @@
 
 #include "otbSurfaceAdjacencyEffect6SCorrectionSchemeFilter.h"
 
-#include "itkConstNeighborhoodIterator.h"
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
@@ -36,7 +35,6 @@
 #include "otbSIXSTraits.h"
 #include "otbMath.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index a8352b3e7ea360809376abb2881d548e6d00e91d..840d6aada39e1fd0985fb09edcfaf2e5930740b4 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -24,10 +24,8 @@
 
 #include "itkNumericTraits.h"
 #include <vector>
-#include "itkConstNeighborhoodIterator.h"
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkVariableSizeMatrix.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include <iomanip>
 
diff --git a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
index 109bde61068e7dd2a4c4e1466228ee0ff20e4375..07ce4485f7eb98e55da2494d784ef9698b97a7d3 100644
--- a/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx
@@ -29,14 +29,12 @@
 #include "itkNeighborhoodInnerProduct.h"
 #include "itkImageRegionIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkOffset.h"
 #include "itkProgressReporter.h"
 #include "otbImage.h"
 #include "otbSIXSTraits.h"
 #include "otbMath.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbTerraSarBrightnessImageFilter.h b/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
index 9597c066047094edea3cfd0c5e2608886b865e46..df2423fe331a564821a79c4c64909da2085ca799 100644
--- a/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
+++ b/Code/Radiometry/otbTerraSarBrightnessImageFilter.h
@@ -25,7 +25,6 @@
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkMetaDataDictionary.h"
 
-#include "otbMath.h"
 #include "otbTerraSarBrightnessFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
index 896c54f143e4ca51c88b1b936c822d87718ec67d..adcfae8bdb2c5bfafefed40fa7ccf81a8e21ff6a 100644
--- a/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
+++ b/Code/Radiometry/otbWaterSqrtSpectralAngleImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbWaterSqrtSpectralAngleImageFilter_h
 #define __otbWaterSqrtSpectralAngleImageFilter_h
 
-#include "otbMath.h"
 #include "otbWaterIndicesFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
index 6f3caa1b1827094b39340898273d65fe4d0eec7c..afe0ad0080beff8cd60b7c1fbd1ae2b421a4bb13 100644
--- a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -21,7 +21,6 @@
 #include "itkInPlaceImageFilter.h"
 #include "otbPolarimetricSynthesisFunctor.h"
 #include "otbPolarimetricData.h"
-#include "itkFixedArray.h"
 #include <complex>
 
 namespace otb
diff --git a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
index 7df4a5f0caf41af0c3cea2646b2aff0a7d201136..d465a986214b438a1ad706d0ae208eaa9770d064 100644
--- a/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
+++ b/Code/SARPolarimetry/otbMultiChannelsPolarimetricSynthesisFilter.txx
@@ -22,7 +22,6 @@
 
 #include "otbMultiChannelsPolarimetricSynthesisFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkProgressReporter.h"
 #include "otbMath.h"
 
diff --git a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.h b/Code/Segmentation/otbOGRLayerStreamStitchingFilter.h
index 169004f7b8c02d55147fdc623588dadfafe4f53a..535e63947c46d18ef9e90fcf13deb3272a1966c8 100644
--- a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.h
+++ b/Code/Segmentation/otbOGRLayerStreamStitchingFilter.h
@@ -25,7 +25,6 @@
 //#error OGRLayerStreamStitchingFilter requires GDAL version >= 1.8.0
 //#endif
 
-#include "itkProcessObject.h"
 #include "itkProgressReporter.h"
 
 #include <algorithm>
diff --git a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx b/Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx
index a8788e0a7e2451a20ac9ad42a9d2b8a05edb321e..b9ff29546786bdb4ca4524372d9e9370e8be0421 100644
--- a/Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx
+++ b/Code/Segmentation/otbOGRLayerStreamStitchingFilter.txx
@@ -24,7 +24,6 @@
 #include <iomanip>
 #include "ogrsf_frmts.h"
 #include "itkTimeProbe.h"
-#include "otbMacro.h"
 #include <set>
 
 namespace otb
diff --git a/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h b/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h
index d3299070915e0e94f3120a28dd288dfe6734c767..7bfcad4d7ef190f33f7c9c00bba6849fb790b8b0 100644
--- a/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -23,16 +23,13 @@
 
 #include "itkExtractImageFilter.h"
 
-#include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
 #include "otbPersistentImageToOGRLayerFilter.h"
 #include "otbRelabelComponentImageFilter.h"
 #include "itkMultiplyImageFilter.h"
 
-#include "otbMeanShiftImageFilter.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
 #include "otbMeanShiftVectorImageFilter.h"
-#include "itkMacro.h"
 
 
 namespace otb
diff --git a/Code/Simulation/otbAtmosphericEffects.h b/Code/Simulation/otbAtmosphericEffects.h
index 60ce6cfb87387307121adf7566d10789ca967075..877fcfd6a21b7912d0b6a34ef3addb9ce96a3617 100644
--- a/Code/Simulation/otbAtmosphericEffects.h
+++ b/Code/Simulation/otbAtmosphericEffects.h
@@ -19,7 +19,6 @@
 #define __otbAtmosphericEffects_h
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
-#include "otbAtmosphericRadiativeTerms.h"
 
 namespace otb
 {
diff --git a/Code/Simulation/otbImageSimulationMethod.h b/Code/Simulation/otbImageSimulationMethod.h
index e03ede745b136226b0fa32635dc7eed867733ee4..4cd42c4f4f31d980d4a3942463f1ce2f68f831cb 100644
--- a/Code/Simulation/otbImageSimulationMethod.h
+++ b/Code/Simulation/otbImageSimulationMethod.h
@@ -23,9 +23,7 @@
 #include "itkImageSource.h"
 #include "otbProspectModel.h"
 #include "otbSailModel.h"
-#include "otbReduceSpectralResponse.h"
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
 #include "otbLabelMapToSimulatedImageFilter.h"
 
diff --git a/Code/Simulation/otbLabelMapToSimulatedImageFilter.h b/Code/Simulation/otbLabelMapToSimulatedImageFilter.h
index faf30244a93d0f3673e26d7167221af94449fca0..c8534f14fcb3d4656f2495336d390b2b82dced66 100644
--- a/Code/Simulation/otbLabelMapToSimulatedImageFilter.h
+++ b/Code/Simulation/otbLabelMapToSimulatedImageFilter.h
@@ -24,7 +24,6 @@
 #include "otbLabelToProSailParameters.h"
 #include "otbReduceSpectralResponse.h"
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
 
 
diff --git a/Code/Simulation/otbProspectModel.h b/Code/Simulation/otbProspectModel.h
index 8eb5d0435001f81244588966daeebec7dc9cc39a..d4b62aa785eab7dd23806e7a80ee0e52d4bc1cbf 100644
--- a/Code/Simulation/otbProspectModel.h
+++ b/Code/Simulation/otbProspectModel.h
@@ -19,7 +19,6 @@
 #define __otbProspectModel_h
 
 
-#include "itkProcessObject.h"
 #include "itkObjectFactory.h"
 #include "otbLeafParameters.h"
 
diff --git a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h b/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
index 49794921be00dbc83dc9b4f14c58387cefcb57cd..ab8523e126cec586e8b5b1e74f7f4d589be66d38 100644
--- a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -19,7 +19,6 @@
 #define __otbReduceSpectralResponseClassifierRAndNIR_h
 
 
-#include "itkDataObject.h"
 #include <itkObjectFactory.h>
 
 #include "otbReduceSpectralResponse.h"
diff --git a/Code/Simulation/otbSailModel.h b/Code/Simulation/otbSailModel.h
index 7f9ac0192c0c71bccf91b2b7a1b8f2461fb0bca1..f390db3ca39db2e1927ae2a932716fc41be4a8fb 100644
--- a/Code/Simulation/otbSailModel.h
+++ b/Code/Simulation/otbSailModel.h
@@ -19,7 +19,6 @@
 #define __otbSailModel_h
 
 
-#include "itkProcessObject.h"
 #include "itkObjectFactory.h"
 #include "otbSpectralResponse.h"
 #include "otbDataSpecP5B.h"
diff --git a/Code/Simulation/otbSatelliteRSR.h b/Code/Simulation/otbSatelliteRSR.h
index 55f21f81e43d956cb4649237f3b5e01f3e3ac41a..8afb463099a15343db8eac84d55680ca51442df9 100644
--- a/Code/Simulation/otbSatelliteRSR.h
+++ b/Code/Simulation/otbSatelliteRSR.h
@@ -18,7 +18,6 @@
 #ifndef __otbSatelliteRSR_h
 #define __otbSatelliteRSR_h
 
-#include "itkDataObject.h"
 #include <itkObjectFactory.h>
 #include <vector>
 #include <utility>
diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
index 2b9604b78f3b27bfcac76c86dffb2b90e69a85bc..d5368eb022df32fbae3038cb46b7ce3acb8cffbe 100644
--- a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.h
@@ -25,9 +25,7 @@
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 
-#include "otbAtmosphericRadiativeTerms.h"
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
-#include "otbImageMetadataCorrectionParameters.h"
 #include "itkMetaDataDictionary.h"
 // #include "itkFactory.h"
 namespace otb
diff --git a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx
index c20cfa1d4046f692e801d917989e427f8334b60f..9349e9be63cb4b5ea72777e5275c101337c39007 100644
--- a/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx
+++ b/Code/Simulation/otbSurfaceReflectanceToReflectanceFilter.txx
@@ -20,7 +20,6 @@
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 namespace otb
 {
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
index 3b05447069235b45b52f4ae8f3fcc16e3959e492..f7a5c7006967a3514fc155cb20042ce4497de6af 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
@@ -25,7 +25,6 @@
 #include "itkSubtractImageFilter.h"
 #include "itkAndImageFilter.h"
 #include "itkImageRegionIterator.h"
-#include "itkImageRegionConstIterator.h"
 #include "otbBinaryImageMinimalBoundingRegionCalculator.h"
 #include "otbMacro.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
index 2414381c7bd4d6c6f94a10220dee423ec80df44c..80dc830cd36afba59017c63edb4723fc91de12fa 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
@@ -19,7 +19,6 @@
 #define __otbRCC8VertexWithCompacity_h
 
 #include "otbRCC8VertexBase.h"
-#include "itkObjectFactory.h"
 
 namespace otb
 {
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
index 386c0602e73a96b94c659a7006283f2c32df55eb..c43894de36333d40e617e042693297c04d6ec7bf 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
@@ -19,7 +19,6 @@
 #define __otbRCC8VertexWithRegionCenter_h
 
 #include "otbRCC8VertexBase.h"
-#include "itkObjectFactory.h"
 
 namespace otb
 {
diff --git a/Code/Testing/otbTestDriver.cxx b/Code/Testing/otbTestDriver.cxx
index 673aa4e0454ae495adb03dcbe4a173085f344032..7ce323856afce6528d24f0f666de75b018d28231 100644
--- a/Code/Testing/otbTestDriver.cxx
+++ b/Code/Testing/otbTestDriver.cxx
@@ -23,7 +23,6 @@
 #define itksys_SHARED_FORWARD_EXE_BUILD ""
 #define itksys_SHARED_FORWARD_EXE_INSTALL ""
 
-#include "itkWin32Header.h"
 #include <map>
 #include <string>
 #include <iostream>
diff --git a/Code/Testing/otbTestDriverIncludeBuiltInIOFactories.h b/Code/Testing/otbTestDriverIncludeBuiltInIOFactories.h
index eb2b902575cd10a01698883bb8a32b4a496071ea..dba163644e71bed4132b8d985ce928b4a820e74e 100644
--- a/Code/Testing/otbTestDriverIncludeBuiltInIOFactories.h
+++ b/Code/Testing/otbTestDriverIncludeBuiltInIOFactories.h
@@ -15,7 +15,6 @@
 #include "otbTileMapImageIOFactory.h"
 #endif
 
-#include "itkObjectFactoryBase.h"
 
 void RegisterOTBBuiltInFactories(void)
 {
diff --git a/Code/Testing/otbTestHelper.cxx b/Code/Testing/otbTestHelper.cxx
index 963c53d49da702c55f7326062ddf35a935834a7b..06a7755c9c0c6b9a578bba3ea4e77367d5ad0af8 100644
--- a/Code/Testing/otbTestHelper.cxx
+++ b/Code/Testing/otbTestHelper.cxx
@@ -30,7 +30,6 @@
 #include "itksys/Directory.hxx"
 #include "itksys/RegularExpression.hxx"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Code/Testing/otbTestMain.h b/Code/Testing/otbTestMain.h
index 4293417b99234660ae6a96f45469593122e6fc98..2ec5b71cfbcc140a23e400fae82468f406fd52dd 100644
--- a/Code/Testing/otbTestMain.h
+++ b/Code/Testing/otbTestMain.h
@@ -24,7 +24,6 @@
 #include <string>
 #include <iostream>
 
-#include "itkWin32Header.h"
 #include "itkMultiThreader.h"
 #include "itkMacro.h"
 
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx b/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx
index 8c688218e8663557a996976dea45e2b5f093869d..2f08cca5d1f804cf123e283483fd57c4b069c5a4 100644
--- a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx
+++ b/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTComplexToComplexImageFilter.hxx
@@ -31,7 +31,6 @@
 #ifndef __itkFFTComplexToComplexImageFilter_hxx
 #define __itkFFTComplexToComplexImageFilter_hxx
 
-#include "itkFFTComplexToComplexImageFilter.h"
 
 #if defined( ITK_USE_FFTWD ) || defined( ITK_USE_FFTWF )
 #include "itkFFTWComplexToComplexImageFilter.h"
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx b/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx
index 2d9c2cdef4dbf2cec14f56bf69d6334ac362be44..4ff7e2385f0ed7bb25a93421af18763104e7c157 100644
--- a/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx
+++ b/Code/UtilitiesAdapters/ITKPendingPatches/itkFFTWComplexToComplexImageFilter.hxx
@@ -19,7 +19,6 @@
 #define __itkFFTWComplexToComplexImageFilter_hxx
 
 #include "itkFFTWComplexToComplexImageFilter.h"
-#include "itkFFTComplexToComplexImageFilter.h"
 #include <iostream>
 #include "itkIndent.h"
 #include "itkMetaDataObject.h"
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h b/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h
index 66406d8d172a436d432d985dfd3cc3ac72d7d222..6ace761b7b6b6cd81816c0075aac123b93d6641e 100644
--- a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h
+++ b/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.h
@@ -19,10 +19,8 @@
 #define __otbWarpImageFilter_h
 #include "itkImageBase.h"
 #include "itkImageToImageFilter.h"
-#include "itkInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkPoint.h"
-#include "itkFixedArray.h"
 
 namespace otb
 {
diff --git a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx b/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx
index 1926ec554e72bafbe3c77059618c7f1f4856ecd3..a57a72f045d97f8ab7916a5e7835a48890f4d794 100644
--- a/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx
+++ b/Code/UtilitiesAdapters/ITKPendingPatches/otbWarpImageFilter.txx
@@ -21,7 +21,6 @@
 
 #include "itkImageRegionIterator.h"
 #include "itkImageRegionIteratorWithIndex.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "itkContinuousIndex.h"
 #include "vnl/vnl_math.h"
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h
index 49be82e9ba59bd0c73da3a7d444e69f23a777bc5..7774025173f04a6e7e3b9b3c776db7b3986e7d1c 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSet.h
@@ -19,7 +19,6 @@
 #define __otbGeometriesSet_h
 
 #include <boost/variant.hpp>
-#include "itkDataObject.h"
 // #include "otbOGRLayerWrapper.h"
 #include "otbOGRDataSourceWrapper.h"
 #include "otbImageReference.h"
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h
index e73e77a13df5fbeaefa3537bcbb6bc613b0a56a2..7fb98fb4902785803673fb61f76557a5155d1d6f 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesSource.h
@@ -20,7 +20,6 @@
 
 #include <boost/noncopyable.hpp>
 #include "itkProcessObject.h"
-#include "itkObjectFactory.h"
 #include "itkMacro.h"
 
 // Forward declarations
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
index 31bc5ca352d61ae5465ff0860988fd5423603e48..0d0a14d12de373424c66fca4092e5be048c3b18c 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbGeometriesToGeometriesFilter.h"
 #include <cassert>
 #include "otbGeometriesSet.h"
-#include "itkMacro.h"
 #include "itkTimeProbe.h"
 #include "otbMacro.h"
 
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h
index 311c49289f6c5f471a48d11ca2006dc5b6a7e7d7..89fd40fe578e9f1c61bbe144a755e8a2ddc1a348 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbGeometriesToGeometriesFilter.h
@@ -30,7 +30,6 @@
 #include <map>
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_same.hpp>
-#include "otbOGRFeatureWrapper.h"
 #include "otbOGRLayerWrapper.h"
 
 // forward declarations
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h b/Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h
index efce577c73a103407926b9dd4cdb9453c698f22f..e5035ae085fa7f0c373e9197f0ead423e566aeac 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbImageReference.h
@@ -18,7 +18,6 @@
 #ifndef __otbImageReference_h
 #define __otbImageReference_h
 
-#include "itkVector.h"
 #include "itkPoint.h"
 #include "itkMacro.h"
 
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
index cc7b2caf9b6810d7f8e5c1bbbd236d0f52877947..b5705985c13b4ec974639271b74d2248a4ce14ac 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFeatureWrapper.cxx
@@ -26,7 +26,6 @@
 #include "cpl_error.h"
 #include "itkMacro.h"
 
-#include "otbOGRFieldWrapper.h"
 /*===========================================================================*/
 /*======================[ Construction / Destruction ]=======================*/
 /*===========================================================================*/
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx
index 3da7ca415fba07ae8a709b089cd12a361cbf75b0..2fb40202c5990fe4a99e942817b8b843d4cc86cf 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRFieldWrapper.cxx
@@ -19,7 +19,6 @@
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
 /*===========================================================================*/
-#include "otbOGRFieldWrapper.h"
 #include "ogr_feature.h"
 #include "otbOGRFeatureWrapper.h"
 #include "otbJoinContainer.h"
diff --git a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
index 39cf4960ad1151334d8cc068a575fd3938007160..98aca05c3930f211e8904a68c942d34893e187b4 100644
--- a/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
+++ b/Code/UtilitiesAdapters/OGRAdapters/otbOGRLayerWrapper.cxx
@@ -19,7 +19,6 @@
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
 /*===========================================================================*/
-#include "otbOGRLayerWrapper.h"
 
 #include <cassert>
 #include <boost/bind.hpp>
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h
index dc089a504cb065438ae9c98d8e9ff995c52edf65..644c45746bbbba9bd6debae2474c10a6bf7f6776 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbBoostMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbBoostMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h
index d6ffcc2d4f18bf9f21b1b0524adacafd2c5b1707..24d7c471ebaead63917d6d1d24ec68b96bb9b744 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbDecisionTreeMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbDecisionTreeMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h
index 253939c7fd4f01a4a8a245fe42d5688270913f3a..5bec76e0471f9c4a02ad18ce72cfcd426735a234 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbGradientBoostedTreeMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbGradientBoostedTreeMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h
index 9a2736b0c96902de93673125679f17281b3b9df8..86804b2d61dad93675dc19de1ba7f3458bd57f2a 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbKNearestNeighborsMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbKNearestNeighborsMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 class CvKNearest;
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h
index 1e6f8c094246ffecde1ceab97b844474ad524e09..c9f065a29525edf2d61339aa53287d69b50a8b50 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbNeuralNetworkMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbNeuralNetworkMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 class CvANN_MLP;
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h
index 5f971047369e7d4318586a62f49b48f39ad3c92b..fd55b86f7b18bf1a357a11089f8e5b6937e7b0d3 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbNormalBayesMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbNormalBayesMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h
index 50555eaf5b44689e60ded7a154af4e1423a647dd..2906f18c0a9b7f7ba46faba3a9450b28e3e9b01e 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbRandomForestsMachineLearningModel.h
@@ -19,9 +19,7 @@
 #define __otbRandomForestsMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 #include "itkVariableSizeMatrix.h"
 
diff --git a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h b/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h
index 1c6a7e1928199dea8192d999796de82d63b1b809..2455bf34cd300eee364d60836dcb03484fc41be7 100644
--- a/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h
+++ b/Code/UtilitiesAdapters/OpenCVAdapters/otbSVMMachineLearningModel.h
@@ -20,9 +20,7 @@
 #define __otbSVMMachineLearningModel_h
 
 #include "itkLightObject.h"
-#include "itkVariableLengthVector.h"
 #include "itkFixedArray.h"
-#include "itkListSample.h"
 #include "otbMachineLearningModel.h"
 
 class CvSVM;
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
index 89a17f007e01390e68604c84813f6abe39c6dba9..b908a06fb4466e1ca05d58e2a9c56f94b25b4c9d 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
@@ -18,7 +18,6 @@
 #ifndef __otbSensorModelAdapter_h
 #define __otbSensorModelAdapter_h
 
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 #include "otbDEMHandler.h"
 
diff --git a/Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx b/Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx
index e422d1025f3a498104e4cacccdcc1018d44645b7..24036ac4ac4ab276a50635fd9da69152547502c9 100644
--- a/Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx
+++ b/Code/Wrappers/ApplicationLauncherQt/otbApplicationLauncherQt.cxx
@@ -16,7 +16,6 @@
 
  =========================================================================*/
 #include <QtGui>
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperQtWidgetView.h"
 #include "otbWrapperQtWidgetSimpleProgressReport.h"
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
index 4ae5f6aa596ce7f8e779f63fc6189e8ebb7d7a10..b13211e55aec818084354b17487da1bc50f794fd 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.cxx
@@ -23,14 +23,11 @@
 #include "otbWrapperEmptyParameter.h"
 #include "otbWrapperInputFilenameParameter.h"
 #include "otbWrapperOutputFilenameParameter.h"
-#include "otbWrapperComplexInputImageParameter.h"
 #include "otbWrapperInputImageParameter.h"
 #include "otbWrapperInputVectorDataParameter.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperOutputImageParameter.h"
 #include "otbWrapperOutputVectorDataParameter.h"
 #include "otbWrapperRadiusParameter.h"
-#include "otbWrapperStringParameter.h"
 #include "otbWrapperListViewParameter.h"
 #include "otbWrapperRAMParameter.h"
 #include "otbWrapperOutputProcessXMLParameter.h"
@@ -42,11 +39,9 @@
 #include "otbWrapperInputFilenameListParameter.h"
 #include "otbWrapperStringListParameter.h"
 
-#include "otbImageFileWriter.h"
 
 
 #include "otbWrapperApplicationRegistry.h"
-#include "otbWrapperApplication.h"
 #include "otbWrapperTypes.h"
 #include <itksys/RegularExpression.hxx>
 #include <string>
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
index b0ce68a93b5e1bf4f9a30ad20c22c5df21874956..d73866aaa1e76c651a08a5fb6e29ad157510421e 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
@@ -18,9 +18,7 @@
 #ifndef __otbWrapperCommandLineLauncher_h
 #define __otbWrapperCommandLineLauncher_h
 
-#include "otbMacro.h"
 #include "itkObject.h"
-#include "itkObjectFactory.h"
 
 #include "otbWrapperApplication.h"
 #include "otbWrapperParameter.h"
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
index 85d890e3f72030ab0af45dfa306e39fc55e1f68e..38a5ad5268fe967892258bcedbf6f2f08066e4ae 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.cxx
@@ -19,7 +19,6 @@
 
 
 #include "otbWrapperApplicationRegistry.h"
-#include "otbWrapperApplication.h"
 
 #include <itksys/SystemTools.hxx>
 #include <itksys/RegularExpression.hxx>
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h
index 83cca736364bad782204257bd2dcaacfcc43b6cf..6290692f83d3579a87572f6e5866c09259462e3c 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineParser.h
@@ -19,7 +19,6 @@
 #define __otbWrapperCommandLineParser_h
 
 #include "otbMacro.h"
-#include "itkObject.h"
 #include "itkObjectFactory.h"
 
 
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h
index eff49093e158d7afd252c7370bc6a2547414fdd5..5960f23e3f46bc3322d9ea4914e7605c18cc9857 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetChoiceParameter.h
@@ -20,7 +20,6 @@
 
 #include <QtGui>
 #include "otbWrapperChoiceParameter.h"
-#include "otbWrapperParameterGroup.h"
 #include "otbWrapperQtWidgetParameterBase.h"
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
index 87657612c256ff5bd4bb14c9c6554da38f7440a1..6c25c6c8f3964ead3df953fbb2667d3ea39ca312 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetInputFilenameListParameter_h
 
 #include <QtGui>
-#include "otbWrapperInputFilenameListParameter.h"
 #include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtFileSelectionWidget.h"
 
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
index 7cfeaadda49370cf4e69d4eb7c6b5ffe2a9684f2..2dc07643fb2343a3d0c496b2cd86259b4ca1f655 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetInputImageListParameter_h
 
 #include <QtGui>
-#include "otbWrapperInputImageListParameter.h"
 #include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtFileSelectionWidget.h"
 
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h
index 803da9201f4733fbe39259fa47a91da0b546736c..f48c674cfd36f0c126b89b4db963db31ac088d29 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputVectorDataListParameter.h
@@ -20,7 +20,6 @@
 
 #include <QtGui>
 #include "otbWrapperInputVectorDataListParameter.h"
-#include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtFileSelectionWidget.h"
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h
index 8bb40d61c8698cda2e35754a3eaa922deeeed53f..4280b53cb9677f15022fdd688612051c7a0eaa34 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetListViewParameter.h
@@ -20,7 +20,6 @@
 
 #include <QtGui>
 #include "otbWrapperListViewParameter.h"
-#include "otbWrapperParameterGroup.h"
 #include "otbWrapperQtWidgetParameterBase.h"
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h
index ff8f8ede765a31d047250c5a783eef3b668a3164..cf77a0efd4fff15e5f1c9b435e7650f20aa27e73 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetParameterGroup.h
@@ -20,7 +20,6 @@
 
 #include <QtGui>
 #include "otbWrapperParameterGroup.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperRadiusParameter.h"
 #include "otbWrapperRAMParameter.h"
 #include "otbWrapperQtWidgetParameterBase.h"
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h
index 9a43f915d8d7481c2cd95c06b8023feeea328b5c..e3d1b3319b0955a93d2e455dd5727f9fb840ae10 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetProgressReport.h
@@ -19,12 +19,10 @@
 #define __otbWrapperQtWidgetProgressReport_h
 
 #include <QtGui>
-#include "otbWrapperApplication.h"
 #include "otbWrapperQtWidgetModel.h"
 #include "itkQtProgressBar.h"
 #include "itkProcessObject.h"
 
-#include "itkCommand.h"
 
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h
index a3c1ba447471ad50c7f1984d9824ae78650108bd..30d1f67f2f06c15defc6781b8f1f50eb844ddf89 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetSimpleProgressReport.h
@@ -19,12 +19,10 @@
 #define __otbWrapperQtWidgetSimpleProgressReport_h
 
 #include <QtGui>
-#include "otbWrapperApplication.h"
 #include "otbWrapperQtWidgetModel.h"
 #include "itkProcessObject.h"
 #include "itkQtProgressBar.h"
 
-#include "itkCommand.h"
 
 namespace otb
 {
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
index 84211761841643c515b851c0d5c0dab4886bb022..128610bafb36753bf477ce9bc062279a822fab7f 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetStringListParameter_h
 
 #include <QtGui>
-#include "otbWrapperStringListParameter.h"
 #include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtStringSelectionWidget.h"
 
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
index bff4434d553a072273669913339ad12bdbb7dba7..63a0adfc2ea77f23793f303cf5f6fc0aff575055 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.cxx
@@ -21,7 +21,6 @@
 #include "otbWrapperQtWidgetParameterFactory.h"
 #include "otbWrapperQtWidgetProgressReport.h"
 #include "otbWrapperOutputImageParameter.h"
-#include "otbWrapperParameterGroup.h"
 #include "otbWrapperChoiceParameter.h"
 #include "otbWrapperQtWidgetSimpleProgressReport.h"
 #include "otbWrapperApplicationHtmlDocGenerator.h"
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
index 5762562b557cb8a239f2769f80376f71b9a3abcd..5db51f94526effde25a5b619516d3aa4811ebfa1 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetView.h
@@ -20,7 +20,6 @@
 
 #include <QtGui>
 #include <QObject>
-#include "otbWrapperApplication.h"
 #include "otbWrapperQtWidgetModel.h"
 
 namespace otb
diff --git a/Code/Wrappers/SWIG/itkBase.includes b/Code/Wrappers/SWIG/itkBase.includes
index 10db084e6ec8f5aac84fdd89de6591ae4e5572eb..14a8a040f708ffab7d1de917937f7fca8f64e307 100644
--- a/Code/Wrappers/SWIG/itkBase.includes
+++ b/Code/Wrappers/SWIG/itkBase.includes
@@ -21,13 +21,11 @@
 /* kindly stolen from the build files of OTB-Wrapping
  * (Typedefs/itkBase.includes, Typedefs/wrap_ITKCommonBase.i) */
 
-#include "itkLightObject.h"
 #include "itkObject.h"
 #include "itkProcessObject.h"
 #include "itkObjectFactoryBase.h"
 
 #include "itkCommand.h"
-#include "itkEventObject.h"
 
 typedef itk::LightObject                itkLightObject;
 typedef itk::LightObject::Pointer       itkLightObject_Pointer;
diff --git a/Code/Wrappers/SWIG/otbWrapperSWIGIncludes.h b/Code/Wrappers/SWIG/otbWrapperSWIGIncludes.h
index bf96a458e7fe7733a5e20b8ef89346f8d021bcc3..3bf30746dcf81c1f9b8633c7152a4f0fdccd6f6c 100644
--- a/Code/Wrappers/SWIG/otbWrapperSWIGIncludes.h
+++ b/Code/Wrappers/SWIG/otbWrapperSWIGIncludes.h
@@ -18,7 +18,6 @@
 #ifndef __otbWrapperSWIGIncludes_h
 #define __otbWrapperSWIGIncludes_h
 
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperAddProcessToWatchEvent.h"
 #include "otbWrapperDocExampleStructure.h"
diff --git a/Examples/BasicFilters/DEMToRainbowExample.cxx b/Examples/BasicFilters/DEMToRainbowExample.cxx
index 417fa4ab2fd5c67b0d923f8e995b63fa2800be9a..0f7898645f363320bae3ecde7170e77bb9befe0f 100644
--- a/Examples/BasicFilters/DEMToRainbowExample.cxx
+++ b/Examples/BasicFilters/DEMToRainbowExample.cxx
@@ -48,7 +48,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/BasicFilters/HillShadingExample.cxx b/Examples/BasicFilters/HillShadingExample.cxx
index 7a3abbc3a3151077a27bd347cb01a21398acf67f..129e377ca73e2b2e5ebe346ac03d872eab3986f1 100644
--- a/Examples/BasicFilters/HillShadingExample.cxx
+++ b/Examples/BasicFilters/HillShadingExample.cxx
@@ -38,7 +38,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
@@ -49,7 +48,6 @@
 #include "otbReliefColormapFunctor.h"
 #include "itkMultiplyImageFilter.h"
 #include "itkShiftScaleImageFilter.h"
-#include "itkBinaryFunctorImageFilter.h"
 #include "otbWorldFile.h"
 
 int main(int argc, char * argv[])
diff --git a/Examples/BasicFilters/IndexedToRGBExample.cxx b/Examples/BasicFilters/IndexedToRGBExample.cxx
index e27d3cef85d21aaeec4ccbc0df84f2a20f461632..f1be9aa53eb5d82fa2cc1af8d926bd00f81edbd2 100644
--- a/Examples/BasicFilters/IndexedToRGBExample.cxx
+++ b/Examples/BasicFilters/IndexedToRGBExample.cxx
@@ -42,7 +42,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
 
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/BasicFilters/MeanShiftSegmentationFilterExample.cxx b/Examples/BasicFilters/MeanShiftSegmentationFilterExample.cxx
index 7c64d550a4e0b34797450b6d0c66efca08c97581..25e63d451531c556ec754d40b1f473cf3441e540 100644
--- a/Examples/BasicFilters/MeanShiftSegmentationFilterExample.cxx
+++ b/Examples/BasicFilters/MeanShiftSegmentationFilterExample.cxx
@@ -37,14 +37,12 @@
 //
 //  Software Guide : EndLatex
 
-#include "itkMacro.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
 #include "otbPrintableImageFilter.h"
 
-#include "itkRGBPixel.h"
 #include "itkScalarToRGBPixelFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
index fa359e75d69cf3e0a5a0c196522c8fbe0c3eed75..7cef2c7805df11f2f99881b5ffd0c966600a41bc 100644
--- a/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerProfileChDet.cxx
@@ -42,13 +42,11 @@
 //
 // Software Guide : EndLatex
 
-#include "itkMacro.h"
 #include "otbImage.h"
 #include "otbMultiChannelExtractROI.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginCodeSnippet
-#include "otbVectorImage.h"
 #include "otbKullbackLeiblerProfileImageFilter.h"
 //  Software Guide : EndCodeSnippet
 #include "otbImageFileReader.h"
diff --git a/Examples/Classification/BayesianPluginClassifier.cxx b/Examples/Classification/BayesianPluginClassifier.cxx
index d30ad322d9ae4e5db7d8e69b0a7df45ec2e6d6e4..383528c41dcafc22f62ceee41e7380c31030122d 100644
--- a/Examples/Classification/BayesianPluginClassifier.cxx
+++ b/Examples/Classification/BayesianPluginClassifier.cxx
@@ -60,7 +60,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "itkVector.h"
-#include "itkArray.h"
 #include "itkListSample.h"
 #include "itkSubsample.h"
 // Software Guide : EndCodeSnippet
@@ -85,7 +84,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "itkDecisionRule.h"
 #include "itkMaximumRatioDecisionRule.h"
 #include "itkGaussianMembershipFunction.h"
 #include "itkSampleClassifierFilter.h"
diff --git a/Examples/Classification/DempsterShaferFusionOfClassificationMapsExample.cxx b/Examples/Classification/DempsterShaferFusionOfClassificationMapsExample.cxx
index be8f3dfebcc89d7e64c90af973f5bdaf7bf18837..64efa5b15fa7df9d5527775b8d5aa7158f723cf0 100644
--- a/Examples/Classification/DempsterShaferFusionOfClassificationMapsExample.cxx
+++ b/Examples/Classification/DempsterShaferFusionOfClassificationMapsExample.cxx
@@ -40,7 +40,6 @@
 #include <fstream>
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/Classification/KdTreeBasedKMeansClustering.cxx b/Examples/Classification/KdTreeBasedKMeansClustering.cxx
index c2de5d313ee46a0931649800595fcb7085d38e2c..dd5582d607f15aa4dc834650e5c95789ea384e62 100644
--- a/Examples/Classification/KdTreeBasedKMeansClustering.cxx
+++ b/Examples/Classification/KdTreeBasedKMeansClustering.cxx
@@ -113,7 +113,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "itkMinimumDecisionRule.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkSampleClassifierFilter.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/Classification/SOMImageClassificationExample.cxx b/Examples/Classification/SOMImageClassificationExample.cxx
index fb00fb76e81a34e1d1fec8e74f7129c1867b98e0..f58b935fbb266dddbcf9960119e6395419ff09a2 100644
--- a/Examples/Classification/SOMImageClassificationExample.cxx
+++ b/Examples/Classification/SOMImageClassificationExample.cxx
@@ -32,7 +32,6 @@
 // Software Guide : BeginCodeSnippet
 #include "otbSOMImageClassificationFilter.h"
 // Software Guide : EndCodeSnippet
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbImageFileReader.h"
diff --git a/Examples/Classification/ScalarImageKmeansModelEstimator.cxx b/Examples/Classification/ScalarImageKmeansModelEstimator.cxx
index b48f6e64ae2e552bd2494f913972ef560e755511..0b52996cab2d788fcbccf3c13b2b467cf34866e6 100644
--- a/Examples/Classification/ScalarImageKmeansModelEstimator.cxx
+++ b/Examples/Classification/ScalarImageKmeansModelEstimator.cxx
@@ -41,7 +41,6 @@
 #include "itkWeightedCentroidKdTreeGenerator.h"
 
 #include "itkMinimumDecisionRule.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkSampleClassifierFilter.h"
 
 #include "itkImageToListSampleAdaptor.h"
diff --git a/Examples/Classification/ScalarImageMarkovRandomField1.cxx b/Examples/Classification/ScalarImageMarkovRandomField1.cxx
index e59c481b572f59dbef82a6e0cca644d974fe4aa0..0cc13649025ade3f1950c73e9fbde6b570aa53f5 100644
--- a/Examples/Classification/ScalarImageMarkovRandomField1.cxx
+++ b/Examples/Classification/ScalarImageMarkovRandomField1.cxx
@@ -66,7 +66,6 @@
 #include "itkMRFImageFilter.h"
 #include "itkDistanceToCentroidMembershipFunction.h"
 #include "itkMinimumDecisionRule.h"
-#include "itkImageClassifierBase.h"
 // Software Guide : EndCodeSnippet
 
 int main(int argc, char * argv[])
diff --git a/Examples/Classification/SupervisedImageClassificationExample.cxx b/Examples/Classification/SupervisedImageClassificationExample.cxx
index f4bee8994e6348e74c9f71f82454434192be859d..5b6dd910dada8de3bdfd92c77221b98b5eda210b 100644
--- a/Examples/Classification/SupervisedImageClassificationExample.cxx
+++ b/Examples/Classification/SupervisedImageClassificationExample.cxx
@@ -34,7 +34,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbMacro.h"
 #include "otbMachineLearningModelFactory.h"
 #include "otbImageClassificationFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/DataRepresentation/Containers/TreeContainer.cxx b/Examples/DataRepresentation/Containers/TreeContainer.cxx
index 339c7ca515ffe8948029882cca73e9b98f2ec5f3..05201a968f798fbcdf6df2a50bffbec871de3ac8 100644
--- a/Examples/DataRepresentation/Containers/TreeContainer.cxx
+++ b/Examples/DataRepresentation/Containers/TreeContainer.cxx
@@ -44,7 +44,6 @@
 #include "itkLevelOrderTreeIterator.h"
 #include "itkInOrderTreeIterator.h"
 #include "itkPostOrderTreeIterator.h"
-#include "itkPreOrderTreeIterator.h"
 #include "itkRootTreeIterator.h"
 #include "itkTreeIteratorClone.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/DataRepresentation/Image/ImageAdaptor3.cxx b/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
index fe4064828715e9e26c670b68cb867e237f489f31..e3d0214b61436fbb0a10a4e15f97a6ec38c91a34 100644
--- a/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
+++ b/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
@@ -43,7 +43,6 @@
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
-#include "itkCovariantVector.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/DimensionReduction/ICAExample.cxx b/Examples/DimensionReduction/ICAExample.cxx
index e92b8ecfb9f2a7fb828ec8aa54f661bcab3b6224..8f25aa138686d387af8c7294eb1b9029d06377b1 100644
--- a/Examples/DimensionReduction/ICAExample.cxx
+++ b/Examples/DimensionReduction/ICAExample.cxx
@@ -16,7 +16,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/DimensionReduction/MNFExample.cxx b/Examples/DimensionReduction/MNFExample.cxx
index 07230bc5d4bbf5c1c4d714e1464b55f0ba267e33..796b18c2ca993bfde4cbf8e3456dc8eea8e4512c 100644
--- a/Examples/DimensionReduction/MNFExample.cxx
+++ b/Examples/DimensionReduction/MNFExample.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/DimensionReduction/NAPCAExample.cxx b/Examples/DimensionReduction/NAPCAExample.cxx
index 10a6559af11a2c181b9a95f7876e22443f725dbd..f8bba4243eed568700d92de6eab876e39bd0cc13 100644
--- a/Examples/DimensionReduction/NAPCAExample.cxx
+++ b/Examples/DimensionReduction/NAPCAExample.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/DimensionReduction/PCAExample.cxx b/Examples/DimensionReduction/PCAExample.cxx
index effc860babd4b2493768dc06d7ff8d29869981fd..715a808c050c3940a6e86a6f23f6666be31f6689 100644
--- a/Examples/DimensionReduction/PCAExample.cxx
+++ b/Examples/DimensionReduction/PCAExample.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
index d90b9b2c656538c32517436f41cd5953dfb7e57a..a26830fdbf70a501c107bf06621c23f1b567f579 100644
--- a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
+++ b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
@@ -38,7 +38,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 #include "itkRecursiveGaussianImageFilter.h"
diff --git a/Examples/DisparityMap/NCCRegistrationFilterExample.cxx b/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
index 64e78889df205e9572ea3f7e7be13fda38ce7876..16e3473da2837e117928833c64c147d5e6a149a3 100644
--- a/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
+++ b/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
@@ -32,7 +32,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 #include "otbCommandLineArgumentParser.h"
diff --git a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
index 36e0fba10408f57343fd19d98189717eb5e745b6..5144ad2e85b1c9d38160493086a1e31ccbf261dc 100644
--- a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
+++ b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
@@ -42,13 +42,11 @@
 #include "itkTranslationTransform.h"
 #include "itkNormalizedCorrelationImageToImageMetric.h"
 #include "itkWindowedSincInterpolateImageFunction.h"
-#include "itkZeroFluxNeumannBoundaryCondition.h"
 #include "itkGradientDescentOptimizer.h"
 #include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
 #include "otbWarpImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/DisparityMap/StereoReconstructionExample.cxx b/Examples/DisparityMap/StereoReconstructionExample.cxx
index c7e92205b35d1e15c204dcfb1ca527fce843155b..0534291b7fde57403ce0004ea4a52b9950c4edd3 100644
--- a/Examples/DisparityMap/StereoReconstructionExample.cxx
+++ b/Examples/DisparityMap/StereoReconstructionExample.cxx
@@ -44,13 +44,11 @@
 // Software Guide : BeginCodeSnippet
 #include "otbStereorectificationDisplacementFieldSource.h"
 #include "otbStreamingWarpImageFilter.h"
-#include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "otbBandMathImageFilter.h"
 #include "otbSubPixelDisparityImageFilter.h"
 #include "otbDisparityMapMedianFilter.h"
 #include "otbDisparityMapToDEMFilter.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/FeatureExtraction/AlignmentsExample.cxx b/Examples/FeatureExtraction/AlignmentsExample.cxx
index 692c7c1a4a49b84fd783af3d291099d90d3a9fd4..252666c004ee593c9afb29d559fafe364648ea97 100644
--- a/Examples/FeatureExtraction/AlignmentsExample.cxx
+++ b/Examples/FeatureExtraction/AlignmentsExample.cxx
@@ -58,7 +58,6 @@
 #include "otbDrawPathFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 
 #include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/CloudDetectionExample.cxx b/Examples/FeatureExtraction/CloudDetectionExample.cxx
index 446757676afddb697f35795e5b5a14ab52c55e21..dc1fe18b8f810d0b9680877d525d221ed68304e2 100644
--- a/Examples/FeatureExtraction/CloudDetectionExample.cxx
+++ b/Examples/FeatureExtraction/CloudDetectionExample.cxx
@@ -43,13 +43,10 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbCloudDetectionFunctor.h"
 #include "otbCloudDetectionFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "itkMacro.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
index dd66a2e9bcce47f435163aa8fbf431ef4f5231dc..593c6b531f07447b4363aa613da2436b829f8ab9 100644
--- a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
@@ -45,9 +45,7 @@
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkSqrtImageFilter.h"
 
-#include "itkCovariantVector.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Examples/FeatureExtraction/ExtractRoadExample.cxx b/Examples/FeatureExtraction/ExtractRoadExample.cxx
index b65efd1c1cb38648974d9b3f927f7ebda8351d54..fbe1b2eab927ada314f03c140db5ab37a76b27cf 100644
--- a/Examples/FeatureExtraction/ExtractRoadExample.cxx
+++ b/Examples/FeatureExtraction/ExtractRoadExample.cxx
@@ -45,7 +45,6 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
index 7e9b68102b59608f43eb38e1689f9cf88cd78ca0..d80acf83be29e10c9335c2e4d58efc7d627733d2 100644
--- a/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractSegmentsByStepsExample.cxx
@@ -39,7 +39,6 @@
 #include "otbDrawLineSpatialObjectListFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
-#include "otbLineSpatialObjectList.h"
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
diff --git a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
index 6102f55c6d8eb3e1fbd797e94053ecce517423f2..542679b71a8bf6dffa330c327d683673b7a381b7 100644
--- a/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractSegmentsExample.cxx
@@ -38,7 +38,6 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
 
 int main(int argc, char * argv[])
diff --git a/Examples/FeatureExtraction/HarrisExample.cxx b/Examples/FeatureExtraction/HarrisExample.cxx
index cc51f2b4fdea1cae7d1a0d465fa3f2004cea9d2a..900528ab7935b928bfd5c6b5117e3a92b93f8eeb 100644
--- a/Examples/FeatureExtraction/HarrisExample.cxx
+++ b/Examples/FeatureExtraction/HarrisExample.cxx
@@ -38,7 +38,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbHarrisImageFilter.h"
 // Software Guide : EndCodeSnippet
 #include "otbHarrisImageToPointSetFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
index 3f019abaadbd305282d74ec6774dd5a03bb11204..eaed300046249f05a4625a4cb6ed940d6c838ca8 100644
--- a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
+++ b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorData.h"
 
 #include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/LocalHoughExample.cxx b/Examples/FeatureExtraction/LocalHoughExample.cxx
index b350a4bf68ee6f867f8f6ed5ed70720c935673f8..212039901012240632aeea0a57d41ad42b2cd08c 100644
--- a/Examples/FeatureExtraction/LocalHoughExample.cxx
+++ b/Examples/FeatureExtraction/LocalHoughExample.cxx
@@ -33,7 +33,6 @@
 // Software Guide : BeginCodeSnippet
 #include "otbLocalHoughFilter.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
-#include "otbLineSpatialObjectList.h"
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
diff --git a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
index 838c9d8c313b22d61131784177fb66ce4cfab2b4..9223a44c28818bd809882a8ab43266cabfd04700 100644
--- a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
+++ b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorData.h"
 
 #include "otbImageFileReader.h"
diff --git a/Examples/FeatureExtraction/SURFExample.cxx b/Examples/FeatureExtraction/SURFExample.cxx
index 254ef42a5c34def51c5cc4d4c5f39b8e924e64a3..a054251ac735e36d07662233e2b498a223b7f1d5 100644
--- a/Examples/FeatureExtraction/SURFExample.cxx
+++ b/Examples/FeatureExtraction/SURFExample.cxx
@@ -40,7 +40,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 #include "itkRGBPixel.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/FeatureExtraction/ThresholdToPointSetExample.cxx b/Examples/FeatureExtraction/ThresholdToPointSetExample.cxx
index fb6d538592093c8f53c551008c2bd19f7413bff2..b05a2ca468b5e1398d04b178ad1a09b67258b164 100644
--- a/Examples/FeatureExtraction/ThresholdToPointSetExample.cxx
+++ b/Examples/FeatureExtraction/ThresholdToPointSetExample.cxx
@@ -49,7 +49,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "otbThresholdImageToPointSetFilter.h"
-#include "itkPointSet.h"
 // Software Guide : EndCodeSnippet
 
 int main(int argc, char * argv[])
diff --git a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
index 9ad0712ae3228ab2df2e7fbbe7f08d8a3875d288..967fafc4a658419df9ff7e980c968660a9301bd6 100644
--- a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
+++ b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
@@ -49,7 +49,6 @@
 #include "otbTouziEdgeDetectorImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/Filtering/CompositeFilterExample.cxx b/Examples/Filtering/CompositeFilterExample.cxx
index 2843790c8e7b065f1bc76967a2a6ee8093067c80..3e03a5324f794ddb13ed21bf06a80bc75420e29c 100644
--- a/Examples/Filtering/CompositeFilterExample.cxx
+++ b/Examples/Filtering/CompositeFilterExample.cxx
@@ -32,7 +32,6 @@
 //  Software Guide : EndLatex
 
 //  Software Guide : BeginCodeSnippet
-#include "itkImageToImageFilter.h"
 //  Software Guide : EndCodeSnippet
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/GeometriesChangeSpatialReference.cxx b/Examples/Filtering/GeometriesChangeSpatialReference.cxx
index a896631fdfcf0c1db430cf95acfa9b0b3e8704a3..3567ef88ff5eee80bef7f24872d7ef78984a6db3 100644
--- a/Examples/Filtering/GeometriesChangeSpatialReference.cxx
+++ b/Examples/Filtering/GeometriesChangeSpatialReference.cxx
@@ -22,7 +22,6 @@
 #include "otbGeometriesToGeometriesFilter.h"
 #include <string>
 #include <iostream>
-#include "otbOGRDataSourceWrapper.h"
 #include "otbGeometriesSet.h"
 #include "otbOGRGeometryWrapper.h"
 
diff --git a/Examples/Filtering/GeometriesFilter.cxx b/Examples/Filtering/GeometriesFilter.cxx
index 9847384479e8c765f5758c207bdf2d3b1cbb40f6..93d1b355ad394a182c2ce396cbda4b47958e596e 100644
--- a/Examples/Filtering/GeometriesFilter.cxx
+++ b/Examples/Filtering/GeometriesFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbGeometriesToGeometriesFilter.h"
 #include <string>
 #include <iostream>
-#include "otbOGRDataSourceWrapper.h"
 #include "otbGeometriesSet.h"
 
 /*===========================================================================*/
diff --git a/Examples/Filtering/RasterizationExample.cxx b/Examples/Filtering/RasterizationExample.cxx
index 1807abbb73b531e6c1aa3ff9992717a72af81796..a39a09e187f436d55e04c2de8fbc7cd80e71bb71 100644
--- a/Examples/Filtering/RasterizationExample.cxx
+++ b/Examples/Filtering/RasterizationExample.cxx
@@ -41,7 +41,6 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImageFileWriter.h"
-#include "otbVectorDataExtractROI.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "itkRGBAPixel.h"
 #include "itkChangeLabelImageFilter.h"
diff --git a/Examples/Fusion/BayesianFusionImageFilter.cxx b/Examples/Fusion/BayesianFusionImageFilter.cxx
index e5d458cd32e0c63897d1b3bfb4f5327d7f7da111..24c244a19187ce7b881831e7329692b78641faa7 100644
--- a/Examples/Fusion/BayesianFusionImageFilter.cxx
+++ b/Examples/Fusion/BayesianFusionImageFilter.cxx
@@ -71,14 +71,12 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "itkCastImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMultiChannelExtractROI.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
-#include "otbImageToVectorImageCastFilter.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/Examples/Fusion/PanSharpeningExample.cxx b/Examples/Fusion/PanSharpeningExample.cxx
index 4db04f259611e2965e031ba0de8d38f1408d138f..98938f564a76aa913d0ce3b5a7f161904d1c162a 100644
--- a/Examples/Fusion/PanSharpeningExample.cxx
+++ b/Examples/Fusion/PanSharpeningExample.cxx
@@ -69,7 +69,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
@@ -79,7 +78,6 @@
 #include "otbPrintableImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
-#include "otbVectorRescaleIntensityImageFilter.h"
 // Software Guide : BeginCodeSnippet
 int main(int argc, char* argv[])
 {
diff --git a/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx b/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
index 6c4ca29ffe2c4db7f0c97f2baee365777740bfba..47677b11dbea0f3cd570f1d7c013f871fba1942a 100644
--- a/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
+++ b/Examples/Hyperspectral/HyperspectralUnmixingExample.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
-#include "otbVectorImageToMatrixImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Examples/IO/DEMToImageGenerator.cxx b/Examples/IO/DEMToImageGenerator.cxx
index f94bd87577e6e91e75c95603ec92710acfd34ed8..55418b329d4f5e77246dca8132247194d8dbbe4f 100644
--- a/Examples/IO/DEMToImageGenerator.cxx
+++ b/Examples/IO/DEMToImageGenerator.cxx
@@ -47,7 +47,6 @@
 #include "itkThresholdImageFilter.h"
 #include "itkMacro.h"
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 
 int main(int argc, char * argv[])
 {
diff --git a/Examples/IO/ExplicitStreamingExample.cxx b/Examples/IO/ExplicitStreamingExample.cxx
index de2b7aa4d7b7fa367c565310a07c6a0590f2e7b1..b8e226519bc778fd0715c9ac9fbf90020e979653 100644
--- a/Examples/IO/ExplicitStreamingExample.cxx
+++ b/Examples/IO/ExplicitStreamingExample.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "itkImageRegionConstIterator.h"
 //  Software Guide : BeginLatex
@@ -34,7 +33,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/IO/ExtractROI.cxx b/Examples/IO/ExtractROI.cxx
index 5806a403660dc175b0eea45f0987503947f292fb..41325412c155dffc37201f2f12d1793eff736eb5 100644
--- a/Examples/IO/ExtractROI.cxx
+++ b/Examples/IO/ExtractROI.cxx
@@ -51,7 +51,6 @@
 #include "otbMultiToMonoChannelExtractROI.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 
 int main(int argc, char * argv[])
 {
diff --git a/Examples/IO/ImageReadRegionOfInterestWrite.cxx b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
index 828fb45129895b3772a6bced112657ee47117fe7..72afcfab84e6cb196414584e4e11122b2b3665d5 100644
--- a/Examples/IO/ImageReadRegionOfInterestWrite.cxx
+++ b/Examples/IO/ImageReadRegionOfInterestWrite.cxx
@@ -51,7 +51,6 @@
 #include "otbExtractROI.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbImage.h"
 
 int main(int argc, char * argv[])
 {
diff --git a/Examples/IO/ImageSeriesIOExample.cxx b/Examples/IO/ImageSeriesIOExample.cxx
index 14f19cfadfa24ae150adc432c46888cc7ada4c69..8b68d9e400475ce3926efb8816abb2728bffb6c8 100644
--- a/Examples/IO/ImageSeriesIOExample.cxx
+++ b/Examples/IO/ImageSeriesIOExample.cxx
@@ -38,7 +38,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
-#include "otbObjectList.h"
 #include "otbImageList.h"
 #include "otbImageListToVectorImageFilter.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/IO/TileMapImageIOExample.cxx b/Examples/IO/TileMapImageIOExample.cxx
index 8aae89cc95a32358f5c36b71f6d3964b3be3056e..afb77ba300bac72b51008763a2dc9b15f4d29b80 100644
--- a/Examples/IO/TileMapImageIOExample.cxx
+++ b/Examples/IO/TileMapImageIOExample.cxx
@@ -38,7 +38,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "itkRGBPixel.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbTileMapImageIO.h"
 #include "otbInverseSensorModel.h"
diff --git a/Examples/Iterators/ImageLinearIteratorWithIndex.cxx b/Examples/Iterators/ImageLinearIteratorWithIndex.cxx
index f56a35a7f66fde302e6ff8df3d77bc9b4ebff1a8..12ea597729e0bd3682132c79936fe9cebd7c7df9 100644
--- a/Examples/Iterators/ImageLinearIteratorWithIndex.cxx
+++ b/Examples/Iterators/ImageLinearIteratorWithIndex.cxx
@@ -95,7 +95,6 @@
 #include "otbImage.h"
 #include "itkRGBPixel.h"
 // Software Guide : BeginCodeSnippet
-#include "itkImageLinearConstIteratorWithIndex.h"
 #include "itkImageLinearIteratorWithIndex.h"
 // Software Guide : EndCodeSnippet
 #include "otbImageFileReader.h"
diff --git a/Examples/Iterators/ImageRegionIterator.cxx b/Examples/Iterators/ImageRegionIterator.cxx
index 81370364013ebc40941ea187fc30fb07f274e4b4..d88ea0ee008140aae815f65bc952b7d912a9c2e8 100644
--- a/Examples/Iterators/ImageRegionIterator.cxx
+++ b/Examples/Iterators/ImageRegionIterator.cxx
@@ -45,7 +45,6 @@
 
 #include "otbImage.h"
 // Software Guide : BeginCodeSnippet
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 // Software Guide : EndCodeSnippet
 #include "otbImageFileReader.h"
diff --git a/Examples/Iterators/NeighborhoodIterators6.cxx b/Examples/Iterators/NeighborhoodIterators6.cxx
index 0dd33948f17dcc2871ebed55c7804479419b3804..f569e2207f7f1691d945f82c6fd76288e697109e 100644
--- a/Examples/Iterators/NeighborhoodIterators6.cxx
+++ b/Examples/Iterators/NeighborhoodIterators6.cxx
@@ -23,7 +23,6 @@
 #include "itkNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
 #include "itkFastMarchingImageFilter.h"
-#include "itkNumericTraits.h"
 #include "itkAddImageFilter.h"
 
 //  Software Guide : BeginCommandLineArgs
diff --git a/Examples/Learning/SEMModelEstimatorExample.cxx b/Examples/Learning/SEMModelEstimatorExample.cxx
index e4ffedce75d4cd4f34f1acae093db0b0126863f2..e5dfca9b67cfdbc00900fa43f54516589bf36021 100644
--- a/Examples/Learning/SEMModelEstimatorExample.cxx
+++ b/Examples/Learning/SEMModelEstimatorExample.cxx
@@ -40,7 +40,6 @@
 
 #include <iostream>
 
-#include "itkListSample.h"
 #include "itkVector.h"
 #include "itkVariableLengthVector.h"
 #include "itkRescaleIntensityImageFilter.h"
@@ -64,7 +63,6 @@
 // Software Guide : EndLatex
 
 //  Software Guide : BeginCodeSnippet
-#include "otbGaussianModelComponent.h"
 #include "otbSEMClassifier.h"
 //  Software Guide : EndCodeSnippet
 
diff --git a/Examples/Learning/SOMClassifierExample.cxx b/Examples/Learning/SOMClassifierExample.cxx
index 0fa46638a859e410ed47aa361fdf6566e99f1355..f262cdf4cbef4afd993e3cf5f4013c95817ade98 100644
--- a/Examples/Learning/SOMClassifierExample.cxx
+++ b/Examples/Learning/SOMClassifierExample.cxx
@@ -19,7 +19,6 @@
 
 #include <fstream>
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbSOMMap.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/Learning/SOMExample.cxx b/Examples/Learning/SOMExample.cxx
index ce300f9b752d6c314fc53690863ab7a28a2225f9..1fa479d201207007283fc4bc98f755537b506a3d 100644
--- a/Examples/Learning/SOMExample.cxx
+++ b/Examples/Learning/SOMExample.cxx
@@ -51,9 +51,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
-#include "itkVariableLengthVector.h"
 
 #include "itkVectorExpandImageFilter.h"
 #include "itkVectorNearestNeighborInterpolateImageFunction.h"
@@ -71,7 +69,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "itkEuclideanDistanceMetric.h"
 // Software Guide : EndCodeSnippet
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx b/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx
index c2e7a7737684cf8c9cf2d2a9da5b3f14f684f140..e11095a98a716d217f337f4a825db1f3caa308dc 100644
--- a/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx
+++ b/Examples/Learning/SVMGenericKernelImageClassificationExample.cxx
@@ -23,7 +23,6 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkImageRegionIterator.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbVectorImage.h"
@@ -42,7 +41,6 @@
 //  Software Guide : EndLatex
 
 #include "itkImageToListSampleAdaptor.h"
-#include "itkListSample.h"
 
 //  Software Guide : BeginCodeSnippet
 #include "otbSVMClassifier.h"
diff --git a/Examples/Learning/SVMImageClassificationExample.cxx b/Examples/Learning/SVMImageClassificationExample.cxx
index 159091c20c313460dfe19b7239b0a2a60ac48666..7f7db00eac12c22dc6d3e42b01f50e43df842ff2 100644
--- a/Examples/Learning/SVMImageClassificationExample.cxx
+++ b/Examples/Learning/SVMImageClassificationExample.cxx
@@ -21,7 +21,6 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkImageRegionIterator.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 
@@ -51,7 +50,6 @@
 #include "itkImageToListSampleAdaptor.h"
 
 // Software Guide : BeginCodeSnippet
-#include "itkListSample.h"
 #include "otbSVMClassifier.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
index a5f59464a16dd72d9d24b2d68d1737640687e928..86b8a42e1fcf184bc79b64b6eea2c547e63932cc 100644
--- a/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
+++ b/Examples/Learning/SVMImageEstimatorClassificationMultiExample.cxx
@@ -51,12 +51,10 @@
 //  Software Guide : BeginCodeSnippet
 #include "otbSVMImageModelEstimator.h"
 #include "itkImageToListSampleAdaptor.h"
-#include "itkListSample.h"
 #include "otbSVMClassifier.h"
 //  Software Guide : EndCodeSnippet
 
 #include "otbImageFileWriter.h"
-#include "itkImageRegionIterator.h"
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
diff --git a/Examples/Learning/SVMPointSetClassificationExample.cxx b/Examples/Learning/SVMPointSetClassificationExample.cxx
index 8b3968fb5cdb3aa733f5e5e21acaa08348d58d16..150fa75c0394515bbbeac7622ca1b427ec53429f 100644
--- a/Examples/Learning/SVMPointSetClassificationExample.cxx
+++ b/Examples/Learning/SVMPointSetClassificationExample.cxx
@@ -23,7 +23,6 @@
 //  Software Guide : EndCommandLineArgs
 
 #include "itkMacro.h"
-#include "itkPointSet.h"
 #include <iostream>
 #include <cstdlib>
 
@@ -42,7 +41,6 @@
 
 //  Software Guide : BeginCodeSnippet
 #include "itkPointSetToListSampleAdaptor.h"
-#include "itkListSample.h"
 #include "otbSVMClassifier.h"
 //  Software Guide : EndCodeSnippet
 
diff --git a/Examples/Learning/SVMPointSetExample.cxx b/Examples/Learning/SVMPointSetExample.cxx
index 95086099edf98e9b43fe2ea03b2dcbb48e117de1..974ecbcb15ff6582ef8e439244d10d4c29d98ac4 100644
--- a/Examples/Learning/SVMPointSetExample.cxx
+++ b/Examples/Learning/SVMPointSetExample.cxx
@@ -18,13 +18,11 @@
 
 
 #include "itkMacro.h"
-#include "itkPointSet.h"
 #include <iostream>
 #include <cstdlib>
 
 #include "otbSVMPointSetModelEstimator.h"
 #include "itkPointSetToListSampleAdaptor.h"
-#include "itkListSample.h"
 #include "otbSVMClassifier.h"
 
 int main(int itkNotUsed(argc), char* itkNotUsed(argv)[])
diff --git a/Examples/Learning/TrainMachineLearningModelFromSamplesExample.cxx b/Examples/Learning/TrainMachineLearningModelFromSamplesExample.cxx
index 8f248ef79f1129d8f65a3e4099be44ac81e38815..158b00793886987108562d268f61af633b048742 100644
--- a/Examples/Learning/TrainMachineLearningModelFromSamplesExample.cxx
+++ b/Examples/Learning/TrainMachineLearningModelFromSamplesExample.cxx
@@ -35,7 +35,6 @@
 #include "otbListSampleGenerator.h"
 
 // Random number generator
-#include "itkMersenneTwisterRandomVariateGenerator.h"
 
 // SVM model Estimator
 #include "otbSVMMachineLearningModel.h"
diff --git a/Examples/Markov/MarkovClassification3Example.cxx b/Examples/Markov/MarkovClassification3Example.cxx
index b6f40454392d2c617b17541f482b8a226c0d90e4..a6188d8b7cd91d2eb3251bbb5ae59e0292faac0e 100644
--- a/Examples/Markov/MarkovClassification3Example.cxx
+++ b/Examples/Markov/MarkovClassification3Example.cxx
@@ -48,7 +48,6 @@
 #include "itkRescaleIntensityImageFilter.h"
 
 
-#include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
 
 
diff --git a/Examples/OBIA/HooverMetricsEstimation.cxx b/Examples/OBIA/HooverMetricsEstimation.cxx
index d0e5bd796ab48f979a701f640e872dc2d0a934bf..2cc490037b938f9a5f651adcbf954663fc3abf48 100644
--- a/Examples/OBIA/HooverMetricsEstimation.cxx
+++ b/Examples/OBIA/HooverMetricsEstimation.cxx
@@ -64,7 +64,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkLabelMap.h"
 #include "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
diff --git a/Examples/OBIA/ImageToLabelToImage.cxx b/Examples/OBIA/ImageToLabelToImage.cxx
index 5fb66e55a5de857aef82275718c066dfb6534fd7..25d98c5657ec85b2ab604a254d77f3f45d7dd3d9 100644
--- a/Examples/OBIA/ImageToLabelToImage.cxx
+++ b/Examples/OBIA/ImageToLabelToImage.cxx
@@ -32,7 +32,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "itkLabelObject.h"
 #include "itkLabelMap.h"
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "itkLabelMapToLabelImageFilter.h"
diff --git a/Examples/OBIA/KeepNObjects.cxx b/Examples/OBIA/KeepNObjects.cxx
index 6e0bfc81083ce33847420059db1cd756719da897..281442f7b6b170e3095c6c5c990a3a9084182509 100644
--- a/Examples/OBIA/KeepNObjects.cxx
+++ b/Examples/OBIA/KeepNObjects.cxx
@@ -37,7 +37,6 @@
 //#include "itkLabelStatisticsKeepNObjectsImageFilter.h"
 
 #include "itkLabelImageToLabelMapFilter.h"
-#include "itkStatisticsLabelObject.h"
 #include "itkStatisticsLabelMapFilter.h"
 #include "itkStatisticsKeepNObjectsLabelMapFilter.h"
 #include "itkLabelMapToLabelImageFilter.h"
diff --git a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
index 2e625f4cf56954a37112af617ec039f5f874ddae..dc156eb37fc77aab81608f32fca37044aace6cc4 100644
--- a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
+++ b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
@@ -38,23 +38,19 @@
 //
 //  Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
 #include "otbMeanShiftVectorImageFilter.h"
 #include "itkLabelImageToLabelMapFilter.h"
-#include "otbAttributesMapLabelObject.h"
 #include "itkLabelMap.h"
 #include "otbShapeAttributesLabelMapFilter.h"
-#include "otbStatisticsAttributesLabelMapFilter.h"
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "itkLabelMapToBinaryImageFilter.h"
 #include "otbMultiChannelExtractROI.h"
 #include "otbAttributesMapOpeningLabelMapFilter.h"
 #include "otbVectorRescaleIntensityImageFilter.h"
-#include "otbVegetationIndicesFunctor.h"
 #include "otbMultiChannelRAndNIRIndexImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 
diff --git a/Examples/OBIA/ShapeAttributeComputation.cxx b/Examples/OBIA/ShapeAttributeComputation.cxx
index 132fcf98ad4e3caf821d1376033a942e50ac6e01..bf5e3bf246ffbdba33664f38dc74883f3782f25c 100644
--- a/Examples/OBIA/ShapeAttributeComputation.cxx
+++ b/Examples/OBIA/ShapeAttributeComputation.cxx
@@ -32,7 +32,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "itkShapeLabelObject.h"
-#include "itkLabelMap.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "itkShapeLabelMapFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Patented/SIFTDisparityMapEstimation.cxx b/Examples/Patented/SIFTDisparityMapEstimation.cxx
index 64c3a04fafc195fa94b89c9ec0b743fbb4d084ee..e4d2d3d0b7ad0b0bde2cca033efc62e320ba870f 100644
--- a/Examples/Patented/SIFTDisparityMapEstimation.cxx
+++ b/Examples/Patented/SIFTDisparityMapEstimation.cxx
@@ -47,7 +47,6 @@
 // Software Guide : EndCodeSnippet
 
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/Patented/SIFTFastExample.cxx b/Examples/Patented/SIFTFastExample.cxx
index 45ac1a83f5985f152d86f69a7bff67c8150b107c..e2a65371f19300b11f9ea49ea8613b187099da58 100644
--- a/Examples/Patented/SIFTFastExample.cxx
+++ b/Examples/Patented/SIFTFastExample.cxx
@@ -41,7 +41,6 @@
 // Software Guide : BeginCodeSnippet
 #include "otbSiftFastImageFilter.h"
 // Software Guide : EndCodeSnippet
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkPointSet.h"
diff --git a/Examples/Projections/OrthoRectificationExample.cxx b/Examples/Projections/OrthoRectificationExample.cxx
index f5410cbf72926885fe9f7f18e13e8030e1109f10..fd36cab37d99b140b0a3da6bd82bd7c361f48951 100644
--- a/Examples/Projections/OrthoRectificationExample.cxx
+++ b/Examples/Projections/OrthoRectificationExample.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Examples/Projections/VectorDataExtractROIExample.cxx b/Examples/Projections/VectorDataExtractROIExample.cxx
index 747f505cf48fd8af1f3862a9cf75da7df0a5cceb..fb4aef1561d9a250486b8ceeb234f7ce0840d027 100644
--- a/Examples/Projections/VectorDataExtractROIExample.cxx
+++ b/Examples/Projections/VectorDataExtractROIExample.cxx
@@ -37,12 +37,10 @@
 
 #include "otbVectorData.h"
 #include "otbVectorDataExtractROI.h"
-#include "otbRemoteSensingRegion.h"
 
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 #include "otbImageMetadataInterfaceFactory.h"
-#include "otbImageMetadataInterfaceBase.h"
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index 067be2a05df851b87a02a6344814e3f19f1e1541..072c8f6628b5de35b73bce8f112db1096418599f 100644
--- a/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/ARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -83,9 +83,7 @@
 #include "otbMultiChannelRAndBAndNIRIndexImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "itkMacro.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
index 57e8d175e4b531bd34fcdac960ec90dafda91bfa..fbc7ded5b9afb7996b502cab1b7c7229b15bfc11 100644
--- a/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/AVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -68,9 +68,7 @@
 #include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "itkMacro.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
index ed65d7153ef3faa67b1d44cec0a8799791e47910..8eccb45eeeb7c53529a50b13393584805652a91b 100644
--- a/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
+++ b/Examples/Radiometry/AtmosphericCorrectionSequencement.cxx
@@ -101,7 +101,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 // Software Guide : EndCodeSnippet
 
 #include "otbVectorImage.h"
diff --git a/Examples/Registration/ImageRegistration1.cxx b/Examples/Registration/ImageRegistration1.cxx
index 728f71f51a1450ac820ca579965b6d1d4f12bae9..839b4f87c048bf2ac05318600737ecfab4362e76 100644
--- a/Examples/Registration/ImageRegistration1.cxx
+++ b/Examples/Registration/ImageRegistration1.cxx
@@ -48,7 +48,6 @@
 #include "itkImageRegistrationMethod.h"
 #include "itkTranslationTransform.h"
 #include "itkMeanSquaresImageToImageMetric.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkRegularStepGradientDescentOptimizer.h"
 #include "otbImage.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Registration/ImageRegistration2.cxx b/Examples/Registration/ImageRegistration2.cxx
index b1c078768249e88f50b4af58bbd3922cf7e0a837..5b7cd0572dac7979d2ff9b71176fd82b2210d92a 100644
--- a/Examples/Registration/ImageRegistration2.cxx
+++ b/Examples/Registration/ImageRegistration2.cxx
@@ -41,7 +41,6 @@
 #include "itkImageRegistrationMethod.h"
 #include "itkTranslationTransform.h"
 #include "itkMutualInformationImageToImageMetric.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkGradientDescentOptimizer.h"
 #include "otbImage.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Registration/ImageRegistration5.cxx b/Examples/Registration/ImageRegistration5.cxx
index b22b60552175a4953c6686364ce1b695f502297c..5c4110ab2bfeae5d620fce8f6834fb7a41e3b81c 100644
--- a/Examples/Registration/ImageRegistration5.cxx
+++ b/Examples/Registration/ImageRegistration5.cxx
@@ -50,7 +50,6 @@
 
 #include "itkImageRegistrationMethod.h"
 #include "itkMeanSquaresImageToImageMetric.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkRegularStepGradientDescentOptimizer.h"
 #include "otbImage.h"
 #include "itkMeanImageFilter.h"
diff --git a/Examples/Registration/ImageRegistration9.cxx b/Examples/Registration/ImageRegistration9.cxx
index c4cd572d8a112157751f4c980c8c0b2efa9cd13b..3cc37f2bda712f50418034bf03e62258b86035cf 100644
--- a/Examples/Registration/ImageRegistration9.cxx
+++ b/Examples/Registration/ImageRegistration9.cxx
@@ -42,7 +42,6 @@
 
 #include "itkImageRegistrationMethod.h"
 #include "itkMeanSquaresImageToImageMetric.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkRegularStepGradientDescentOptimizer.h"
 #include "otbImage.h"
 
diff --git a/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx b/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx
index 8b421c1fd39ab09974130e98d9d4c5a521593124..d5b202e032c4968c14ac1e1b089343f808fde38a 100644
--- a/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx
+++ b/Examples/Segmentation/LabelizeNeighborhoodConnectedImageFilter.cxx
@@ -26,7 +26,6 @@
 
 #include <iostream>
 
-#include "itkRGBPixel.h"
 #include "itkScalarToRGBPixelFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
index f6522362e88e938a651e769d5a273fcdb6087633..a1051f25bda8bdcbdb88af277ccf3ab7f6b4cbdd 100644
--- a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
+++ b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
@@ -38,7 +38,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
-#include "otbMeanShiftVectorImageFilter.h"
 #include "otbOGRDataSourceWrapper.h"
 #include "otbOGRLayerStreamStitchingFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Segmentation/WatershedSegmentation.cxx b/Examples/Segmentation/WatershedSegmentation.cxx
index 96525043b8cb2d0282f72413972d8a9d64090210..4d8f358111b6ec861fc3e955634589922ab4d597 100644
--- a/Examples/Segmentation/WatershedSegmentation.cxx
+++ b/Examples/Segmentation/WatershedSegmentation.cxx
@@ -66,7 +66,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkVectorCastImageFilter.h"
-#include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
 
 int main(int argc, char *argv[])
diff --git a/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx b/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
index 145384e74fa717cd154db807f14bb8233ca991ad..6a829ed057a0c606b86294d477598b7136e9174c 100644
--- a/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
+++ b/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
@@ -36,7 +36,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
@@ -47,17 +46,13 @@
 #include "itkOrImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
-#include "otbProspectModel.h"
 #include "otbSailModel.h"
 #include "otbLeafParameters.h"
-#include "otbSatelliteRSR.h"
 #include "otbReduceSpectralResponse.h"
 #include "otbImageSimulationMethod.h"
 #include "otbSpatialisationFilter.h"
 #include "otbAttributesMapLabelObject.h"
-#include "otbSpectralResponse.h"
 #include "itkTernaryFunctorImageFilter.h"
-#include "otbVegetationIndicesFunctor.h"
 #include "otbRAndNIRIndexImageFilter.h"
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Simulation/LAIFromNDVIImageTransform.cxx b/Examples/Simulation/LAIFromNDVIImageTransform.cxx
index 07ff2bb3cfedbec04d49eb93a1124130cd4f9f1e..5e34a716bd26b805b11a6c8493ed916ee328df06 100644
--- a/Examples/Simulation/LAIFromNDVIImageTransform.cxx
+++ b/Examples/Simulation/LAIFromNDVIImageTransform.cxx
@@ -35,7 +35,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "otbMultiChannelRAndNIRIndexImageFilter.h"
-#include "otbVegetationIndicesFunctor.h"
 // Software Guide : EndCodeSnippet
 
 #include "otbCommandLineArgumentParser.h"
diff --git a/Examples/Simulation/ProsailModel.cxx b/Examples/Simulation/ProsailModel.cxx
index 50009b8566f85bf1637c2abee6e5535845c2f794..ec99e3049ece7820861559cf649f76183f2e3731 100644
--- a/Examples/Simulation/ProsailModel.cxx
+++ b/Examples/Simulation/ProsailModel.cxx
@@ -37,7 +37,6 @@
 // Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbLeafParameters.h"
 #include "otbSailModel.h"
 #include "otbProspectModel.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Tutorials/Multispectral.cxx b/Examples/Tutorials/Multispectral.cxx
index 8827627a938a671f4e0634237626c3a4979d16db..886e700f1d56ce7403c49ad3f4bbd534750d7607 100644
--- a/Examples/Tutorials/Multispectral.cxx
+++ b/Examples/Tutorials/Multispectral.cxx
@@ -29,7 +29,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbVectorImage.h"
 // Software Guide : EndCodeSnippet
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Tutorials/OrthoFusion.cxx b/Examples/Tutorials/OrthoFusion.cxx
index 0639a044bb26830c07a93ee4c3cff8bb53fe32ed..6b5e80947e540b4f7385a0b56b2d2ebb8a11fd06 100644
--- a/Examples/Tutorials/OrthoFusion.cxx
+++ b/Examples/Tutorials/OrthoFusion.cxx
@@ -28,7 +28,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx b/Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx
index 53a164c02bff7c00ab818591586acde2422d8049..3a9e346d9487aafeee49d839286a249ee139de83 100644
--- a/Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx
+++ b/Testing/Code/ApplicationEngine/otbWrapperApplicationHtmlDocGeneratorTest.cxx
@@ -21,7 +21,6 @@
 
 #include "otbWrapperApplicationHtmlDocGenerator.h"
 #include "otbWrapperApplicationRegistry.h"
-#include "otbWrapperApplication.h"
 
 int otbWrapperApplicationHtmlDocGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx b/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx
index 92d513c7ac3ec9d4fca66df107956edf1a8aeade..0e49e0f24acd127fe3517845e780080047ca9604 100644
--- a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkFixedArray.h"
 #include "itkListSample.h"
 
 #include "otbMath.h"
diff --git a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx b/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx
index c408cb9a1b2b1cc3ea5833e54af115bc113fe4d2..734f247c0c7556b9623df3086f27323838866c09 100644
--- a/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbAngularProjectionSetImageFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkFixedArray.h"
 #include "itkListSample.h"
 
 #include "otbMath.h"
diff --git a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
index a86f91eb0c4365bcea41fe2b23451b1ca677782a..194bcae410a70d4a3e5b9397b34738dac29615c4 100644
--- a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbBCOInterpolateImageFunction.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include <fstream>
diff --git a/Testing/Code/BasicFilters/otbBasicFiltersTests10.cxx b/Testing/Code/BasicFilters/otbBasicFiltersTests10.cxx
index c451a2b941c28f5a4de68e23d3e0404dcc6d0797..e86717be3d8a06a746df329c66fb0698c8f52f57 100644
--- a/Testing/Code/BasicFilters/otbBasicFiltersTests10.cxx
+++ b/Testing/Code/BasicFilters/otbBasicFiltersTests10.cxx
@@ -20,7 +20,6 @@
 // and all it expects is that you have a function called RegisterTests
 
 
-#include "otbConfigure.h"
 
 #include "otbTestMain.h"
 
diff --git a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
index 54f47e94ec1d46aa5adf20a8bed689b7ec045194..2ffb96e1abdd5ad81d442450d13701afc367f1bc 100644
--- a/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbBoxAndWhiskerImageFilter.cxx
@@ -18,12 +18,10 @@
 
 
 #include "otbBoxAndWhiskerImageFilter.h"
-#include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImage.h"
 #include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 int otbBoxAndWhiskerImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx b/Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx
index 88154d2b12a678077365274348185c2ff1dd4dc2..5f1d93efa3b4778a7ba73249a0ebd41aee01e4ad 100644
--- a/Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx
+++ b/Testing/Code/BasicFilters/otbConcatenateVectorDataFilter.cxx
@@ -19,7 +19,6 @@
 #include "otbCommandLineArgumentParser.h"
 
 // Images
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 
diff --git a/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx b/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
index b9b4b8b99be37119314bca7cee1543eda61bfb31..d8634f59a28614db36c0f8f258cf08ca13dceaf0 100644
--- a/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
+++ b/Testing/Code/BasicFilters/otbConnectedComponentMuParserFunctorTest.cxx
@@ -24,7 +24,6 @@
 #include "otbConnectedComponentMuParserFunctor.h"
 #include <itkConnectedComponentFunctorImageFilter.h>
 
-#include "otbParser.h"
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx b/Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx
index 5fcaa35e1d97bbb61c6bebb9b8c6c68ef0e70c40..68e1d4e5ebbab7c08767101963fbb4eb26b2777f 100644
--- a/Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx
+++ b/Testing/Code/BasicFilters/otbDBOverlapDataNodeFeatureFunction.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
-#include "itkPreOrderTreeIterator.h"
 
 int otbDBOverlapDataNodeFeatureFunctionNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/BasicFilters/otbExtractROIResample.cxx b/Testing/Code/BasicFilters/otbExtractROIResample.cxx
index 6c1bbf9424407bb95231362a6a64ab165a81b2f3..d997a1293f1488226e20fd537556f2c52dc52429 100644
--- a/Testing/Code/BasicFilters/otbExtractROIResample.cxx
+++ b/Testing/Code/BasicFilters/otbExtractROIResample.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/BasicFilters/otbFastICAImageFilter.cxx b/Testing/Code/BasicFilters/otbFastICAImageFilter.cxx
index c86341119d0b02a2d240baeb3f41f51485568081..8c7d5b1b088bb8c678c6d4b45ae31145ac8b78fa 100644
--- a/Testing/Code/BasicFilters/otbFastICAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbFastICAImageFilter.cxx
@@ -23,7 +23,6 @@
 #include "otbCommandLineArgumentParser.h"
 
 #include "otbFastICAImageFilter.h"
-#include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 int otbFastICAInternalOptimizerVectorImageFilterNewTest ( int itkNotUsed(argc), char* itkNotUsed(argv) [] )
 {
diff --git a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
index 71e0020fad76eadb5066fa523f12fc69dde3a354..7d86bfd77f82d1ad32de324480f00ee84b7ceae0 100644
--- a/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbFunctionWithNeighborhoodToImageFilterNew.cxx
@@ -22,7 +22,6 @@
 //#include "itkConstNeighborhoodIterator.h"
 #include "otbTextureImageFunction.h"
 #include "otbFunctionWithNeighborhoodToImageFilter.h"
-#include "itkOffset.h"
 //#include "otbTextureFunctorBase.h"
 
 template <class TInputScalarType, class TOutputScalarType> //IterInput1, class TIterInput2, class TOutput>
diff --git a/Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx b/Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx
index de8b0bc33ac1be2bb758b9acb529958aa82d2809..57e1e399034a564d7ad54fd68e59d667a48202c4 100644
--- a/Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbImageListToSingleImageFilterTest.cxx
@@ -20,7 +20,6 @@
 #include "otbVectorImageToImageListFilter.h"
 #include "otbImageListToSingleImageFilter.h"
 #include "otbVectorImage.h"
-#include "otbImageList.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
index 1fbffe8540af496ee213476f390a12d24a34fcbd..c0f885be9a14229a27c2e64188c2e29adc5d725b 100644
--- a/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
+++ b/Testing/Code/BasicFilters/otbImagePCAShapeModelEstimatorTest.cxx
@@ -20,7 +20,6 @@
 #include "itkVector.h"
 #include "vnl/vnl_matrix_fixed.h"
 #include "vnl/vnl_math.h"
-#include "itkImageRegionIterator.h"
 #include "itkLightProcessObject.h"
 #include "itkTextOutput.h"
 
diff --git a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
index b5318fdd0ef85c911efc952e486e40b0ce23e275..0d48e14dcab627157a832ccc29699cc910803536 100644
--- a/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
+++ b/Testing/Code/BasicFilters/otbImportGeoInformationImageFilterWithKeywordList.cxx
@@ -20,7 +20,6 @@
 #include "otbImportGeoInformationImageFilter.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "otbImageKeywordlist.h"
 
 int otbImportGeoInformationImageFilterWithKeywordList(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
index 08462deb571ca2a15a58ebf9f52f2c8c5ef0d9f5..ba133038939f6e89ab0b89db88a26d7533befb61 100644
--- a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx b/Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx
index f4212ba1c85bf3cff6f14a1cd8a322fae7207c0a..418babb5a2cdd87925f75eb6f2024f4ae1728b7f 100644
--- a/Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx
+++ b/Testing/Code/BasicFilters/otbInverseLogPolarTransformResample.cxx
@@ -17,10 +17,8 @@
 =========================================================================*/
 #include "otbInverseLogPolarTransform.h"
 #include "otbImage.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkResampleImageFilter.h"
 #include "itkPoint.h"
-#include "otbMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
index b9fb53075216d44d48196863acd211be30cce722..586e791560001b089fa2a975732a5473f5023fde 100644
--- a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
index d4f9af0dced1f7a26a406f2f6535e987951f40d9..a0ce3f0d50b4bd1fc9a6faab3de26b83698926dd 100644
--- a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
index 395ec2310f866c9fef420dc028f56e8bd8fa3b73..28a394502b110c9bbd1384f354bb1bb9a0b3a91c 100644
--- a/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbLabelObjectOpeningMuParserFilterTest.cxx
@@ -19,11 +19,9 @@
 
 #include <iostream>
 
-#include "otbImage.h"
 
 #include "otbAttributesMapLabelObject.h"
 #include "otbLabelObjectOpeningMuParserFilter.h"
-#include "otbParser.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbShapeAttributesLabelMapFilter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx b/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx
index 3644854a132dbdbf758d91cc180eadd9317e3b64..bac39f507525e830e69837d5c97e033be65204a4 100644
--- a/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelizeConfidenceConnectedImageFilter.cxx
@@ -19,9 +19,7 @@
 
 #include <iostream>
 
-#include "itkRGBPixel.h"
 #include "itkScalarToRGBPixelFunctor.h"
-#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 #include "otbLabelizeConfidenceConnectedImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx b/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx
index d2201abf9bfe86110e9414acbf12c15b630083b1..052497641090565614f6df7f8af0065f71ca1566 100644
--- a/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelizeConnectedThresholdImageFilter.cxx
@@ -19,7 +19,6 @@
 
 #include <iostream>
 
-#include "itkRGBPixel.h"
 #include "itkScalarToRGBPixelFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx b/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx
index b41346e93977a4496c49765afaf2eba1a55d9285..04cf9ddfda544713b0be5055e02d806c7b62ba2c 100644
--- a/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelizeNeighborhoodConnectedImageFilter.cxx
@@ -19,7 +19,6 @@
 
 #include <iostream>
 
-#include "itkRGBPixel.h"
 #include "itkScalarToRGBPixelFunctor.h"
 #include "itkUnaryFunctorImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx b/Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx
index c6917a3d82232bb39139c82e849c14a0dd03ddf8..8176d54e21af1f4afd8ed58cba56a7646454603c 100644
--- a/Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx
+++ b/Testing/Code/BasicFilters/otbLogPolarTransformResample.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "otbLogPolarTransform.h"
 #include "otbImage.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkResampleImageFilter.h"
 #include "itkPoint.h"
 #include "otbMacro.h"
diff --git a/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx b/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
index bc8cc61127684854609b202ee7045ae4fc1c0a40..da9f84f99aa5efaa79b826de0d93172642ce52fc 100644
--- a/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbMaskMuParserFilterTest.cxx
@@ -23,7 +23,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbParser.h"
 
 #include "otbMaskMuParserFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
index 7e13c81ca9b8246386597c6eac7d6f45c4afa9d5..bdfb4f170d3ac868f4f0d29600d1dc257e2c0566 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMeanShiftImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
index 97f029e391e68fc04e6eed4e8f33ece0d2e0d90a..431d7e81b9b5cee2f2b814f5c58aeb7b29b67627 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftImageFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbMeanShiftImageFilter.h"
 
 int otbMeanShiftImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
index b6b07016be2a0a9dea70f3f7bfa5c3cd8a3325fe..f0e877ea43199b1d9cb03f369d8dc0f488989e4f 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx
index c80225551b4437c397efe49bee63e0444552b8c6..38304d480d0ffd0338b25c7d9dc9a64c6b335e00 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
 
 int otbMeanShiftSmoothingImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
index e9514f3225d2e7268aee03fe03f81e62fe0bd0e1..09ae2c112d0d0d2189f8887a4b9b88e716218dd7 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
@@ -15,9 +15,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
index 0fa0c32604c5e7ff32f8356e620dbe86aa5e5b96..9d03c2e5107675283c2cf2e8f00eb77ea6150907 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx
index d8e917ee6bc59572f9a2d74a698476391db494ca..b22c4835b18f3b03c2f6abcaf08265193a9a1637 100644
--- a/Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbNormalizeVectorImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbCommandProgressUpdate.h"
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
index cdb6c049f50b0c0c3c5f4058cefd22b95948cce2..7c3be25d0ffab98c9534df142321039310ef0511 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterNew.cxx
@@ -19,7 +19,6 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "itkMeanImageFilter.h"
 
 int otbPerBandVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
index d8594c303d770200fac795cb2d927b3e68f8e88e..9dec737c8c1789e9dc7ed3262a2fd4a4bea953f5 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithMeanFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "itkMeanImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
index 5a32549a0536a5d88ca98e5a1179c5f8f8359475..f8050a0d03728259e7401c040edd04024715035a 100644
--- a/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
+++ b/Testing/Code/BasicFilters/otbPerBandVectorImageFilterWithSobelFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "itkSobelEdgeDetectionImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
index 68c603e91d5efe530b1637dcb9440206487fa985..595be2587b7dfcaa8e90fb66860c5a8f9c6318f0 100644
--- a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterNew.cxx
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include "otbImage.h"
 #include "otbPointSetToDensityImageFilter.h"
-#include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 
 int otbPointSetToDensityImageFilterNew(int, char*[])
diff --git a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
index 84d334e7de2acfe46657933ba90692e4bedddb69..93f406e1fd147706a3945b8a1cef46fd77d18343 100644
--- a/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
+++ b/Testing/Code/BasicFilters/otbPointSetToDensityImageFilterTest.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include <stdio.h>
-#include "itkPointSet.h"
 #include "otbImage.h"
 #include "otbPointSetToDensityImageFilter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
index 12524dbe2ab53ca046ed8737ee25872c5c0c4181..646abbe92c10993f2be16de2b2c8414372794fcd 100644
--- a/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbProlateInterpolateImageFunction.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbProlateInterpolateImageFunction.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include <fstream>
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbProlateValidationTest.cxx b/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
index 9b33a3af5d0cdf835eb5acc492656a1c55491aa9..0e4d9421953da96f0633b52e2708d83fc012b98a 100644
--- a/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
+++ b/Testing/Code/BasicFilters/otbProlateValidationTest.cxx
@@ -19,7 +19,6 @@
 
 #include "otbProlateInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include <fstream>
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbResampleSLCImage.cxx b/Testing/Code/BasicFilters/otbResampleSLCImage.cxx
index ff9dcbb804bba3cf9a39b39ba4e2309520865f53..45f611b5375d7bc94ea5e301fd516b45a5fa7a05 100644
--- a/Testing/Code/BasicFilters/otbResampleSLCImage.cxx
+++ b/Testing/Code/BasicFilters/otbResampleSLCImage.cxx
@@ -15,10 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbStreamingResampleImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
 #include "itkTranslationTransform.h"
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
index 502c05d3e80c1e0918a43a87e1c9ce758d44e225..22302bea8b44b633bd8940e6abcb3a088a4a4120 100644
--- a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbMacro.h"
 #include "otbObjectList.h"
 #include "otbImage.h"
 #include "otbWaveletOperator.h"
@@ -27,7 +26,6 @@
 #include "otbCommandLineArgumentParser.h"
 
 #include "itkListSample.h"
-#include "itkFixedArray.h"
 
 #include "otbSparseWvltToAngleMapperListFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
index c2698d588495ad4cf95be014350cf2ed3952c98b..e43e9450d35e4aeba958af3b11c7e9f25a1c1bf2 100644
--- a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbMacro.h"
 #include "otbObjectList.h"
 #include "otbImage.h"
 #include "otbWaveletOperator.h"
@@ -27,7 +26,6 @@
 #include "otbCommandLineArgumentParser.h"
 
 #include "itkListSample.h"
-#include "itkFixedArray.h"
 
 #include "otbSparseWvltToAngleMapperListFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
index b6ca3f6fd3d785bf45de8b9c2b7f5be4b9305217..0a20cb5207e1cfc32ff7d0e349ecfb2954e9cf03 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbStreamingMinMaxVectorImageFilter.h"
 #include "otbImageFileReader.h"
-#include "otbVectorImage.h"
 #include <fstream>
 #include "otbStreamingTraits.h"
 #include "otbStandardFilterWatcher.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
index 4a42b96526b2cd92225d83b731cc20d7f075a55b..e8ef2ae81cad007fb79433bb740f9fc1d9a7fa00 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilter.cxx
@@ -15,10 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbStreamingResampleImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkTranslationTransform.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
index 9a7f1d31e7de5e771d8b62f4f5ea0bf63ea6270f..dfdc819d85baa30ce26366cc6f6b23ebd55d51a8 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterCompareWithITK.cxx
@@ -15,15 +15,12 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbStreamingResampleImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
 #include "itkTranslationTransform.h"
-#include "itkNearestNeighborInterpolateImageFunction.h"
 #include "otbStreamingTraits.h"
 #include "itkResampleImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
index 320a55dd25a73f1f9b34667ab9b1fc04ffc387e3..c885c5d2cb012dc9c5ee87a4d6b70ac68b83e173 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbStreamingResampleImageFilter.h"
-#include "otbImage.h"
 
 int otbStreamingResampleImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx
index f8165cd59b479e46bebaffe03f9ad35377910805..503e12fb35c3ffaee6435703a7843138f1bb8bd3 100644
--- a/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingResampleImageFilterWithAffineTransform.cxx
@@ -18,11 +18,9 @@
 
 #include "otbStreamingResampleImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkVector.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 
 // Transform
 #include "itkTransform.h"
diff --git a/Testing/Code/BasicFilters/otbStreamingTraits.cxx b/Testing/Code/BasicFilters/otbStreamingTraits.cxx
index b705dc7785940f2c43f43cb60993810f2ae58736..4a21b2c7f6b66dc0f1d48e166537333a4d788771 100644
--- a/Testing/Code/BasicFilters/otbStreamingTraits.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingTraits.cxx
@@ -19,7 +19,6 @@
 #include "otbStreamingTraits.h"
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 
 #include <iostream>
 
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
index 1ede567bdf60ca97148a3b9d2116627aa1f95000..56b3084e6240a66d1568efe3568eba960ffb019f 100644
--- a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilter.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
index 1d8c8624be02b6a001b4b9f79a8e04a562fafeb8..dd8425ceddadfa7e4a2a32841afc846445e16089 100644
--- a/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbUnaryImageFunctorWithVectorImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "itkCosImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx b/Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx
index ad60b055145a9fef26ccc0ebf1af49cf3c7d6d20..f6081560de938eb2b97e7d816b5b35406996d878 100644
--- a/Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx
+++ b/Testing/Code/BasicFilters/otbVectorDataToRandomLineGenerator.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 #include "otbVectorDataToRandomLineGenerator.h"
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
index 6ca2a1fcff5564ee5324b8c495db1d226d7053fd..ff351ddeceba0b067cd9b0e7254a5bbadc9a8af1 100644
--- a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageRegionIterator.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
 
diff --git a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
index a32a311ad6d4d806b22d393903413a81a288f6b3..76a14bd5157629d65ec5111eb1d976c6773941cd 100644
--- a/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbVectorImageTo3DScalarImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 #include "otbVectorImage.h"
 #include "otbImage.h"
-#include "otbVectorImageTo3DScalarImageFilter.h"
 
 int otbVectorImageTo3DScalarImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
index 49dc10b5ca97c5325c3ba6119c78124ce2935224..c4c9637f426e18dcdb930b071240c60faf8c36ba 100644
--- a/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.cxx
@@ -15,10 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbVectorRescaleIntensityImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx b/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
index 4cf33cabb75bfe38184632427f1bb6842991e0ef..709a0feb35939d5529ce49cf1a55519aca0a6fa6 100644
--- a/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
+++ b/Testing/Code/Common/otbConcatenateVectorImageFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbConcatenateVectorImageFilter.h"
diff --git a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
index 972b01076208e88112192b32ed023a72870777d2..8a5e1953216f8d412de7c115538eb4ca05f77079 100644
--- a/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
+++ b/Testing/Code/Common/otbConcatenateVectorImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbConcatenateVectorImageFilter.h"
-#include "otbVectorImage.h"
 
 int otbConcatenateVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Common/otbDrawLineSpatialObject.cxx b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
index 059b66432f2ac07fad156470ac28370017b71902..02e6aac2a39e00df361c8a26a3286c922732ba7b 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObject.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObject.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "itkLineSpatialObject.h"
 #include <iostream>
 #include <list>
 
diff --git a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
index 761ce2deb64f17cf69ba7dc8d78098676843a88f..825a08919943bcd6011ffc856e5a470fd294ba1f 100644
--- a/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
+++ b/Testing/Code/Common/otbDrawLineSpatialObjectList.cxx
@@ -26,7 +26,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbLineSpatialObjectList.h"
 
 #include "otbDrawLineSpatialObjectListFilter.h"
 
diff --git a/Testing/Code/Common/otbExtractROI.cxx b/Testing/Code/Common/otbExtractROI.cxx
index eb3337a4a7829b826e24855bc190b9a32fd2cb6b..dac843237401812a1b79a1e9532e5b5c007b8bab 100644
--- a/Testing/Code/Common/otbExtractROI.cxx
+++ b/Testing/Code/Common/otbExtractROI.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Testing/Code/Common/otbExtractROI2.cxx b/Testing/Code/Common/otbExtractROI2.cxx
index 93463991f21c7b09937ad5450a40c907336cb00c..88eaad1d9d5801b42a9c97a70e47c83fd15ee424 100644
--- a/Testing/Code/Common/otbExtractROI2.cxx
+++ b/Testing/Code/Common/otbExtractROI2.cxx
@@ -16,10 +16,8 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 
 #include "otbExtractROI.h"
 
diff --git a/Testing/Code/Common/otbExtractROINew.cxx b/Testing/Code/Common/otbExtractROINew.cxx
index a7ce011fd806159dcf83be556b7d797da603b44e..2ee255aa5a6e1c9bf3f296b20ba9f82e0c740447 100644
--- a/Testing/Code/Common/otbExtractROINew.cxx
+++ b/Testing/Code/Common/otbExtractROINew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 
 #include "otbExtractROI.h"
 
diff --git a/Testing/Code/Common/otbExtractROITestMetaData.cxx b/Testing/Code/Common/otbExtractROITestMetaData.cxx
index e561c2b75f1d4b4c3fc966ec9424fea3353aa61c..e2ed5f7faa8618d3bec7dc70e59be55d0d3004d0 100644
--- a/Testing/Code/Common/otbExtractROITestMetaData.cxx
+++ b/Testing/Code/Common/otbExtractROITestMetaData.cxx
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 
 #include "itkExtractImageFilter.h"
diff --git a/Testing/Code/Common/otbExtractROI_RGB.cxx b/Testing/Code/Common/otbExtractROI_RGB.cxx
index 3bb1acf5de02ad9b849aab9071d7f74d0c865a3b..79c489d6a86b4017490b1b42a64e8efce791a0a1 100644
--- a/Testing/Code/Common/otbExtractROI_RGB.cxx
+++ b/Testing/Code/Common/otbExtractROI_RGB.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
index d13ec4069dc39edc0394c15ef12032d14836ed9f..2a515f21870a5b1657b87faf01fee24e47e2dfb4 100644
--- a/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
+++ b/Testing/Code/Common/otbGenericInterpolateImageFunctionNew.cxx
@@ -19,7 +19,6 @@
 
 #include "otbGenericInterpolateImageFunction.h"
 #include "otbImage.h"
-#include "itkConstantBoundaryCondition.h"
 
 namespace Function
 {
diff --git a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx
index 83f5f471f5f01b3d719290d405e8a3d3afca62ca..f5b69bfe6c9ec6562508ad73450c2849c41e992b 100644
--- a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROI.cxx
@@ -18,7 +18,6 @@
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 
 int otbImageOfVectorsToMonoChannelExtractROI(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx
index abd5ed4a300d9bf11d0efcdae00a630c801c051e..4bcb6dba0136fcae2b9c51421ba87c714c119ae9 100644
--- a/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbImageOfVectorsToMonoChannelExtractROINew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
-#include "otbImage.h"
 
 int otbImageOfVectorsToMonoChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx b/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx
index 5f430d1ff0bdc71c80c49491d1f40715cae04031..f9f23db0b3f8c5e79ede407568728703b90170b1 100644
--- a/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx
+++ b/Testing/Code/Common/otbLineSpatialObjectListToPointSetFilterNew.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkPointSet.h"
-#include "otbLineSpatialObjectList.h"
 #include <iostream>
 
 #include "otbLineSpatialObjectListToPointSetFilter.h"
diff --git a/Testing/Code/Common/otbMultiChannelExtractROI.cxx b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
index 2b73c620894ed6ebc0fe107ea601a1ef86d52f4a..910d3aa4861dd57e75e413e400d25382016b2edc 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROI.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
index c315ce0ff2f3759715892d31694aab75765eecdd..4c2137432e57b18a702efc2c5f7018e88cc7af18 100644
--- a/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiChannelExtractROINew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 #include "otbMultiChannelExtractROI.h"
 
 int otbMultiChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
index ed3957d71f28a8c6ea556da5b6ec2b7b50ae0447..d992ab51fa76abaf61814808eff3c6d22650728f 100644
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROI.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
index d2b63a829c6d1b682eb79859a418b1147ce7a471..0a52f3f920479e655748f95850a93bd221870a34 100644
--- a/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
+++ b/Testing/Code/Common/otbMultiToMonoChannelExtractROINew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkMacro.h"
 #include "otbMultiToMonoChannelExtractROI.h"
 
 int otbMultiToMonoChannelExtractROINew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx b/Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx
index 2cafc7a74b2dd97e01f2581113e44c78aed9ac78..681dbc61f6632d6c9c2bec7629c840fcdf021501 100644
--- a/Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx
+++ b/Testing/Code/Common/otbOGRDataSourceToLabelImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbOGRDataSourceWrapper.h"
 
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "otbStandardOneLineFilterWatcher.h"
diff --git a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
index 6bb427e724a37a708546ff33ee84704a43b5e504..452de085bef510df92c1f5ccf90ad162eb6af70b 100644
--- a/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
+++ b/Testing/Code/Common/otbObjectListToObjectListFilterNew.cxx
@@ -19,7 +19,6 @@
 #include "otbObjectListToObjectListFilter.h"
 #include "otbObjectList.h"
 #include <complex>
-#include "otbPolyLineParametricPathWithValue.h"
 #include "otbPolygon.h"
 
 int otbObjectListToObjectListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
index eab97a3165ad13891809e19b19241a4f4200b831..7452ea115f198f0ab587401a5deec9cd8285a24f 100644
--- a/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
+++ b/Testing/Code/Common/otbPathListToHistogramGenerator.cxx
@@ -23,7 +23,6 @@
 #include "otbOrientationPathFunction.h"
 #include "otbPathListToHistogramGenerator.h"
 #include "otbMath.h"
-#include "otbObjectList.h"
 
 int otbPathListToHistogramGenerator(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx b/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx
index df5f69d20b08302e6b6cb9b2f1b753d739fbce99..df6921448a8e451d49df493344143ac7f2416e32 100644
--- a/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx
+++ b/Testing/Code/Common/otbPolygonizationRasterizationTest.cxx
@@ -20,7 +20,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 
 #include "otbLabelImageToVectorDataFilter.h"
diff --git a/Testing/Code/Common/otbStreamingManager.cxx b/Testing/Code/Common/otbStreamingManager.cxx
index 9cae248beada7cc8407f9a773686fab5cf3c18bd..8b97c5f4dd18648d329e8c78ffc520f3b23fe843 100644
--- a/Testing/Code/Common/otbStreamingManager.cxx
+++ b/Testing/Code/Common/otbStreamingManager.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbStreamingManager.h"
 
 #include "otbVectorImage.h"
 #include "otbNumberOfLinesStrippedStreamingManager.h"
diff --git a/Testing/Code/Common/otbSystemTest.cxx b/Testing/Code/Common/otbSystemTest.cxx
index 0a7a3f30ebf1a5de3bfcfb7cc6f1fc032f827ec5..f8fd3ecf5d89f7473bf625cea1f8fa7f267dcc0b 100644
--- a/Testing/Code/Common/otbSystemTest.cxx
+++ b/Testing/Code/Common/otbSystemTest.cxx
@@ -19,7 +19,6 @@
 #include <iostream>
 #include <cstdlib>
 
-#include "itkMacro.h"
 #include "itksys/SystemTools.hxx"
 #include "otbSystem.h"
 
diff --git a/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx b/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
index b3b3fec67728ebcb55e80566420a5a3d8846d9fd..0b5a3e6330e7103614dde715c3bf5b5df3a34322 100644
--- a/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
+++ b/Testing/Code/Common/otbTestMultiExtractMultiUpdate.cxx
@@ -15,10 +15,8 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbMultiChannelExtractROI.h"
 
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
index 816e01e43e077c5d08a532506e4866aa722ea690..653c10daa5023f86caef173c72831203cc3310ab 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
index ed59cdeb1e0043cd1f141b3bfe005db13c76d609..2bba2c3913e4853c6faa9ce0cd4e789e96be58b7 100644
--- a/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
+++ b/Testing/Code/Common/otbUnaryFunctorNeighborhoodWithOffsetImageFilterNew.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkOffset.h"
 
 namespace Functor
diff --git a/Testing/Code/Common/otbVariableLengthVectorConverter.cxx b/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
index 6e8f6f7a50e59521af52a598fa95a06832b49341..b36389c69fef3d02e95060d9a5f863a03268a401 100644
--- a/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
+++ b/Testing/Code/Common/otbVariableLengthVectorConverter.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include <cstdlib>
 #include <cmath>
 
diff --git a/Testing/Code/Common/otbVectorData.cxx b/Testing/Code/Common/otbVectorData.cxx
index b125c5f77a262ed337780623f3945827cde363ac..684d3e931c14c2963e7b1555af417e540b457c10 100644
--- a/Testing/Code/Common/otbVectorData.cxx
+++ b/Testing/Code/Common/otbVectorData.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbMacro.h"
 #include <fstream>
 #include "otbVectorData.h"
diff --git a/Testing/Code/Common/otbVectorDataExtractROI.cxx b/Testing/Code/Common/otbVectorDataExtractROI.cxx
index f0f7444374aab19d3a4acf03bf49cead6eed8aa3..4ec886c8e68ff2d6dda07bb0f84b2ddc52d577b5 100644
--- a/Testing/Code/Common/otbVectorDataExtractROI.cxx
+++ b/Testing/Code/Common/otbVectorDataExtractROI.cxx
@@ -15,9 +15,7 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbVectorData.h"
 #include "otbVectorDataExtractROI.h"
-#include "otbRemoteSensingRegion.h"
 
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx b/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx
index 232aec58496f528baa83cefa2c4c5b86b4c6cad0..2e073dd958d0911abb49bfab8f73206e9c4bc2af 100644
--- a/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataRasterizeFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataProjectionFilter.h"
 
diff --git a/Testing/Code/Common/otbVectorDataToImageFilter.cxx b/Testing/Code/Common/otbVectorDataToImageFilter.cxx
index 589d9bcd4cdca76aa844b1d4b413909033d17821..731cde9e52a8b7ff123d4d5301e1d6ca2e0d6475 100644
--- a/Testing/Code/Common/otbVectorDataToImageFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataToImageFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileWriter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProjectionFilter.h"
-#include "otbVectorDataExtractROI.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx b/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx
index 6ad177c873823b850021faa9f2e1a11c24e88e16..04619bd5a928dc2d70f5373dc5872c36f6ea7fd6 100644
--- a/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataToLabelImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataProjectionFilter.h"
 
diff --git a/Testing/Code/Common/otbVectorDataToMapFilter.cxx b/Testing/Code/Common/otbVectorDataToMapFilter.cxx
index fc441b8edd0ab8028a6756b4549f5bccd2f9d6e4..4bc7fcb2f8a3832f50a12d023613d2a7fd62af53 100644
--- a/Testing/Code/Common/otbVectorDataToMapFilter.cxx
+++ b/Testing/Code/Common/otbVectorDataToMapFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileWriter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProjectionFilter.h"
-#include "otbVectorDataExtractROI.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx b/Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx
index 99853625f4833941bc5da36cad2c3fbd065d686c..2dfb8366cb46f3d3edf128c9722be51240193370 100644
--- a/Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx
+++ b/Testing/Code/Common/otbVectorDataToMapFilterNoFonts.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileWriter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProjectionFilter.h"
-#include "otbVectorDataExtractROI.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx b/Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx
index f39a86e4c418224bdb37c72df7fd62e8c4f667f3..3deff9f0887a54541ed7dff5900cf2c8e892f1e5 100644
--- a/Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx
+++ b/Testing/Code/Common/otbVectorDataToMapFilterWorld.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileWriter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProjectionFilter.h"
-#include "otbVectorDataExtractROI.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx b/Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx
index 8260ab5e99db73e74c7f4064304ee513e2e0b24b..ef599697cc4bc8b1c236388cd0fd23cc621ed8f4 100644
--- a/Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx
+++ b/Testing/Code/DisparityMap/otbAdhesionCorrectionFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbAdhesionCorrectionFilter.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx b/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx
index dec4badbcfe6c2a487d94ecff05df0e91a83b27c..30efaf4f4f93812096d019f6d112915d84d22263 100644
--- a/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx
+++ b/Testing/Code/DisparityMap/otbBijectionCoherencyFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbBijectionCoherencyFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx
index a05063a3f91ca5289168236057c6b09f7c67278a..275440b5826e4190ebbf9a3c71e7c1b6e4f10c13 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapEstimationMethodNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityMapEstimationMethod.h"
-#include "itkPointSet.h"
 #include "otbImage.h"
 #include "itkTranslationTransform.h"
 
diff --git a/Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx b/Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx
index 30038b058499d7f17011ef196b17cf340f0b4760..0ab36b8c813ffa8e1cdbdaf671c0e09dcf18693e 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapMedianFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityMapMedianFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx b/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
index e77cb57992c5d926bda5e6ea9041663e9c068993..17f3392356974cdc8388b32f1408f04c07802e3e 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbDisparityMapTo3DFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx b/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
index efcec0b79eed377f26b3326c766dd50826c9aadd..c898447864fb230cc2647672178935262ca656af 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityMapToDEMFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx b/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
index 222e30f29328b594616ca7f3c7c484755caebe26..a8c45a99e49a2375f122e878e6ef4bac34c5ebbe 100644
--- a/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityTranslateFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx b/Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx
index e4d20fbdc6f4e18afa509208039b294765cf3b92..9f0fb19aad883b3580baaa9ef663cad3c4f6c59a 100644
--- a/Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx
+++ b/Testing/Code/DisparityMap/otbFineRegistrationImageFilterTest.cxx
@@ -18,7 +18,6 @@
 
 
 #include "itkFixedArray.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbFineRegistrationImageFilter.h"
diff --git a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
index 30c169f26b10b18b06de5fd0c05a12a2dfda76b2..c4121e5e0d6822ba2c2a6a7da96d630163ca0442 100644
--- a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
+++ b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
@@ -17,13 +17,11 @@
 =========================================================================*/
 
 #include "otbMulti3DMapToDEMFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImageToImageListFilter.h"
 #include <string>
-#include "otbObjectList.h"
 #include "otbGeoInformationConversion.h"
 
 typedef otb::Image<double, 2>                    ImageType;
diff --git a/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx b/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
index 49a7bc3a573fc753ea1491224419f97de4227145..f8ff048194a3c6f80bc1c3caa5beb52a405a8f0a 100644
--- a/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
+++ b/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbMultiDisparityMapTo3DFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx b/Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx
index 2da113a42b8af9e9a319862c689d5efa2c5a06fd..b3dfa47073d3fd35b27c136aabf83c32ae4b8feb 100644
--- a/Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx
+++ b/Testing/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx b/Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx
index 2b5992810c3e4daa09bab8307345e0d519864921..9070ea0ce2e356285f87320855ecc15b7ca91926 100644
--- a/Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx
+++ b/Testing/Code/DisparityMap/otbStereorectificationDisplacementFieldSource.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkVector.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx b/Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx
index ce5a5e2bc4d1dd6da61f3e36117cf32fc52478fc..7943b9b8b39bcf9f8c1b02d64988f75ea6c5e6e6 100644
--- a/Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx
+++ b/Testing/Code/DisparityMap/otbSubPixelDisparityImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSubPixelDisparityImageFilter.h"
-#include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index e77221f92cd53f47e94264a769d009d40bcc830b..c248caf2f78d3d46b573a73912a31dadaa114483 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -18,23 +18,18 @@
 
 
 
-#include "otbMacro.h"
 
 #include <iostream>
 #include "itkParametricPath.h"
 #include "itkPolyLineParametricPath.h"
-#include "itkVectorContainer.h"
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageToPathListAlignFilter.h"
 
-#include "itkPath.h"
 #include "itkPathSource.h"
-#include "otbPathListSource.h"
 #include "otbImageToPathListFilter.h"
-#include "itkContinuousIndex.h"
 
 #include <stdio.h>
 
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
index 4e2539016e1db7f470d7c7a39631333402bcb27e..aa59a2cd5fac7427ba1605dab68c89e384f71c55 100644
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetector.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include <iostream>
 
 #include "otbImage.h"
diff --git a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
index cc48ba095d728dfcf45012b4ca16f44d57492781..511a61a8d52f387ea702e2cd11e2ca012c163c76 100644
--- a/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbAssymmetricFusionOfLineDetectorNew.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "itkLinearInterpolateImageFunction.h"
 
 #include <iostream>
 
diff --git a/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx b/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
index 82d9bf4fb094152c73a480d80cda84cf3ffaba71..e9bdf485cdd4f639749f1b818f80c18c0fb45cf8 100644
--- a/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbCloudDetectionFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbVectorImage.h"
 #include "otbImage.h"
-#include "otbCloudDetectionFunctor.h"
 #include "otbCloudDetectionFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx b/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
index 573017e0e44a473c63266a43881be625bb90dcdd..e18679742a5dbdc1186c8188ffe47121f8fe204a 100644
--- a/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbCloudEstimatorDefaultFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbVectorImage.h"
 #include "otbImage.h"
-#include "otbSpectralAngleFunctor.h"
 #include "otbCloudEstimatorFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
index cb69a1bba14f88931214e0df9552ca84f6ec534f..178fe87d0f82e9a5683997b855565639ad8e5a56 100644
--- a/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbComplexMomentsImageFunction.cxx
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <fstream>
 #include "itkMacro.h"
-#include "otbImage.h"
 
 #include "otbImageFileReader.h"
 #include "otbComplexMomentsImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
index 70ed79f0f19489158ce25ed447b9da2e55321072..cd3cda6c82278b91331862ecc020609ba63c3a42 100644
--- a/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
+++ b/Testing/Code/FeatureExtraction/otbDrawPathAlign.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "itkPolyLineParametricPath.h"
 
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
index a9af7ce46cdf0ec160fab91b29df2d874c82d28f..ba9c2de70113f575dba9262534d91a0d840c105f 100644
--- a/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
+++ b/Testing/Code/FeatureExtraction/otbExtractSegments.cxx
@@ -26,7 +26,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractSegmentsImageFilter.h"
-#include "itkRescaleIntensityImageFilter.h"
 
 int otbExtractSegments(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests1.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests1.cxx
index ad0af6ad887304f317e0f52479117bfd50289a99..fe9386c785ab7d0b9896aa303572fb88929baf2f 100644
--- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests1.cxx
+++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests1.cxx
@@ -20,7 +20,6 @@
 // and all it expects is that you have a function called RegisterTests
 
 
-#include "otbConfigure.h"
 
 #include "otbTestMain.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
index c4f412651bac992f7d25e32ed5004e4dbdfdf417..67a24f44f44d219ee95d805c467c4cf1b7c0bfa6 100644
--- a/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFillGapsFilter.cxx
@@ -20,7 +20,6 @@
 
 #include "itkMacro.h"
 #include "otbFillGapsFilter.h"
-#include "otbLineSpatialObjectList.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
index 9b2efa2c542da9e1fe41a45beebd4e3db8a2e31d..076baafc67743d9c03dea8a661b6ba19bc04029f 100644
--- a/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbFlusserMomentsImageFunction.cxx
@@ -22,12 +22,10 @@
 #include <iomanip>
 #include <fstream>
 #include "itkMacro.h"
-#include "otbImage.h"
 
 #include "otbImageFileReader.h"
 #include "otbFlusserMomentsImageFunction.h"
 #include "otbBCOInterpolateImageFunction.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbStreamingResampleImageFilter.h"
 #include "itkResampleImageFilter.h"
 #include "itkAffineTransform.h"
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
index d1f75a1efd413448505bcd849921aea290d8ab1d..0a5ee28f9133df47c4980931948a64ee49929ede 100644
--- a/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
+++ b/Testing/Code/FeatureExtraction/otbFourierMellinDescriptors.cxx
@@ -20,7 +20,6 @@
 #include "itkMacro.h"
 
 #include "otbFourierMellinDescriptorsImageFunction.h"
-#include "otbImage.h"
 
 #include "otbImageFileReader.h"
 #include "otbBCOInterpolateImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx
index 9e270d799e44615a7edcd784366b940046c6a3cd..704b85d45560a3033a9acd817ecb62a7a6eb8cce 100644
--- a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilter.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbForwardFourierMellinTransformImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx
index b8c7f6c059af19a5bfd8b1793763d5fa83a64962..d984278a64d8a5a7d9713361da58836d40936c98 100644
--- a/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbFourierMellinImageFilterNew.cxx
@@ -18,9 +18,7 @@
 
 
 
-#include "otbImage.h"
 #include "otbForwardFourierMellinTransformImageFilter.h"
-#include "itkLinearInterpolateImageFunction.h"
 
 int otbFourierMellinImageFilterNew(int itkNotUsed(argc), char* itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx
index 50caa51e9412526c82c16412adb971d291d7b1da..f9380652a6870b2c0626de3554c24f81ae8b7857 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceIndexedList.cxx
@@ -15,7 +15,6 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
index 87f481166d720a5bea3c011a91d4e1a9d153802a..b72f37b94d8565eec208cc5d35ed4f50909d5827 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "itkHistogram.h"
 #include "vnl/vnl_math.h"
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
index 24899c4e80e6aeb2cbac61975d9514f832ddb559..6ce2347643fa614b5d03b51f7839d308070f533e 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculatorNew.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
index b95318d682226bdd4e2556cbe9d0785d154db4db..a9e815a9b6d1816a73eafbeebe3afe6863b132c6 100644
--- a/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbHoughTransform2DLinesImageTest.cxx
@@ -25,7 +25,6 @@
 
 #include <list>
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 
 /**
diff --git a/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx b/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
index ab1c9aa9b7669d5c8252281d8b5152793bbf1d05..a1fcbb5eff999ec3366c0df514816bf2bc3adec5 100644
--- a/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbHuMomentsImageFunction.cxx
@@ -22,7 +22,6 @@
 #include <iomanip>
 #include <fstream>
 #include "itkMacro.h"
-#include "otbImage.h"
 
 #include "otbImageFileReader.h"
 #include "otbHuMomentsImageFunction.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
index 10604fdd2bdf71c2539ea9799ea9a584035de613..d892fe13d2f3013226f5f661cc55896538ddaa69 100644
--- a/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageFittingPolygonListFilter.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbImageFittingPolygonListFilter.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx b/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
index 4e2fcf4d7ff45058b60174c286f9d454abefcd64..da01b91234b892386cd231984fdbd660e9c58cab 100644
--- a/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageFunctionAdaptor.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbStreamingMinMaxImageFilter.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
index 1ee9a1bedbb3ae408caf773fed6d952be00b0f6b..676cd205de44b694960119429a2045fe47f2ce94 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSiftFastImageFilter.h"
-#include "otbImage.h"
 #include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
index d56a4b67ef3dd2a4b9f4f50c4fcbab174bd62beb..160288b0449e42d1f44f78f1ea9f3b658674f1c3 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -22,7 +22,6 @@
 #include <algorithm>
 
 #include "otbSiftFastImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
index 0576cb530f704dd95e58d64ea531089157869c3e..946774d4c8528560f7948023eba228920a8393d7 100644
--- a/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -21,7 +21,6 @@
 #include <algorithm>
 
 #include "otbSiftFastImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkPointSet.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
index ec7ee6d257b50936965bb5efb7073ae818db4ebd..4d378bc7eb06bcdb714759ed6ed8825edf1d8e8e 100644
--- a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilter.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbImageToHessianDeterminantImageFilter.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
index 3964a8fd9b8ceae28eccbda40b6aa25cd7c0bb50..62d8694ed51f04f52ab20c3268ca49e1533ee667 100644
--- a/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToHessianDeterminantImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbImageToHessianDeterminantImageFilter.h"
-#include "otbImage.h"
 
 int otbImageToHessianDeterminantImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
index 2d996fa4d92677b9d3b6307bf502d7b4abfa3a6f..6aee01c0660f2161f43785c1e1930b115cfd0c3f 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
@@ -19,13 +19,10 @@
 #include <fstream>
 
 #include "itkPointSet.h"
-#include "itkImageRegionIterator.h"
 #include "itkVariableLengthVector.h"
 #include "itkResampleImageFilter.h"
 #include "itkDanielssonDistanceMapImageFilter.h"
-#include "itkSubtractImageFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
-#include "itkShrinkImageFilter.h"
 #include "itkExpandImageFilter.h"
 #include "itkPointSetToImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx
index a92dd56eadd0b42095fec98ad5c9bed2344a18c7..d99089c61eec402e3abd0cf3984aa3393798f5a1 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterNew.cxx
@@ -19,7 +19,6 @@
 =========================================================================*/
 #include "otbImageToSURFKeyPointSetFilter.h"
 #include "otbImage.h"
-#include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 
 int otbImageToSURFKeyPointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
index 029e283c2ac075a4a5e1a3b47fc580ae3a963632..5e2e1194d1f01970f9278bfead3a6de999a9ab3c 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputDescriptorAscii.cxx
@@ -25,7 +25,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 #include "itkRGBPixel.h"
 #include "itkImageRegionIterator.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
index 1c1ac29166995229df222ee2c34daf55a8c8782d..6374269eeb60867d2772189e8579db9f5c518669 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSURFKeyPointSetFilterOutputInterestPointAscii.cxx
@@ -26,7 +26,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 #include "itkRGBPixel.h"
 #include "itkImageRegionIterator.h"
diff --git a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
index 23861ab842f27a9f7d99abb57ae5693178b010f8..23fc9283a6cd8dd59ee0f49a52054b1d81da3806 100644
--- a/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineCorrelationDetectorLinear.cxx
@@ -26,7 +26,6 @@
 #include "otbImageFileWriter.h"
 #include "otbLineCorrelationDetectorImageFilter.h"
 
-#include "itkLinearInterpolateImageFunction.h"
 
 int otbLineCorrelationDetectorLinear(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
index 7453d91a93df678263d8c151e35af533e0055b4e..b5572782b703a171628e8482a909f5a12ffff7bc 100644
--- a/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineDetectorBaseNew.cxx
@@ -18,7 +18,6 @@
 
 
 #include "itkMacro.h"
-#include "otbImage.h"
 #include <iostream>
 
 #include "otbLineDetectorImageFilterBase.h"
diff --git a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
index a1f0ebf84bcb46d282dd9da0efedec207ee0d0b8..74bb2292df4270a504d35684fc43c601145aa996 100644
--- a/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineRatioDetectorLinear.cxx
@@ -26,7 +26,6 @@
 #include "otbImageFileWriter.h"
 #include "otbLineRatioDetectorImageFilter.h"
 
-#include "itkLinearInterpolateImageFunction.h"
 
 int otbLineRatioDetectorLinear(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
index 756b4be5a4291db169975ce6d92442e221f3c001..6c91d42b3769a0c90f7c59b22320ac331ea2953d 100644
--- a/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSegmentDetector.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbLineSegmentDetector.h"
 
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
index 0104f9b65d82b1c08788422677f3e2090bc9f641..b281203461b7df10ebf7a46352d63624333c4085 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbImage.h"
-#include "itkPointSet.h"
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "otbLineSpatialObjectList.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
index 0ed4bc189fe689074e7ba91eb2983529caaf7bdf..076f47876004bf84c5005f60ad951b36059089a0 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterByStepsOutputAscii.cxx
@@ -17,9 +17,7 @@
 =========================================================================*/
 
 #include "otbImage.h"
-#include "itkPointSet.h"
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
-#include "otbLineSpatialObjectList.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
 
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
index cd0e6856fd5ef210e5a99866b9b4905378bafe33..d9691c212d7c4c3c2bb40714dcef628bb6531c68 100644
--- a/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbLineSpatialObjectListToRightAnglePointSetFilterNew.cxx
@@ -19,7 +19,6 @@
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "otbImage.h"
 #include "otbLineSpatialObjectList.h"
-#include "itkPointSet.h"
 
 int otbLineSpatialObjectListToRightAnglePointSetFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/FeatureExtraction/otbLocalHough.cxx b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
index 0853af0feb34f9df516597529bbedff5b75de088..fc4579509e80b5415c103b074bb874634c12ba8d 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHough.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHough.cxx
@@ -22,9 +22,7 @@
 
 #include <iostream>
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "otbLineSpatialObjectList.h"
 
 #include "otbLocalHoughFilter.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
index d3b1387dba24b422c7b69b91a3003c95e1182d1a..b702b4bfba798aae31449c9c453e4b888af2766f 100644
--- a/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
+++ b/Testing/Code/FeatureExtraction/otbLocalHoughDraw.cxx
@@ -23,16 +23,13 @@
 #include <iostream>
 #include <list>
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbLineSpatialObjectList.h"
 
 #include "otbLocalHoughFilter.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
 
-#include "otbImageToLineSpatialObjectListFilter.h"
 
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
index b622f184fd1b51e0ec465e1c8992d5f2f01f1b74..e088c294b2879de526044720c50535f4ab07a838 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.cxx
@@ -19,7 +19,6 @@
 #include "otbRegionImageToRectangularPathListFilter.h"
 #include "itkPolyLineParametricPath.h"
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 
 #include <stdio.h>
diff --git a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
index b3f62ed2d203a90b3f762dac614c118daf08eb5a..02af0f93ed756df5c3e26d641cbe61826e1d5923 100644
--- a/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbRegionImageToRectangularPathListFilter.h"
-#include "otbImage.h"
 #include "itkPolyLineParametricPath.h"
 
 int otbRegionImageToRectangularPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
index 44781be9b577c80a55091a95ec1a536f1596b9aa..bef88cbd2927095308b016426411bbe83a2ea194 100644
--- a/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbRoadExtractionFilter.cxx
@@ -17,9 +17,7 @@
 =========================================================================*/
 #include "itkMacro.h"
 
-#include "itkPolyLineParametricPath.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbRoadExtractionFilter.h"
 #include "otbDrawPathListFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx b/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
index b25129f85aae3aca4701e862f42b4ba25cef7c05..679ccc522d07bae94074a44bd02440b48e6ce607 100644
--- a/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbRoadExtractionFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "itkPolyLineParametricPath.h"
-#include "otbVectorImage.h"
 #include "otbRoadExtractionFilter.h"
 
 int otbRoadExtractionFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
index 49113b70260ac6ead2d316b270d8d30026f17ca0..f20e65b35e5faa63b00f21a78a98ab1110e0e686 100644
--- a/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileWriter.h"
 
-#include "otbPersistentImageToVectorDataFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
 
 int otbStreamingLineSegmentDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx b/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
index e81e62c9ebb11b5f8850516b6b51e176e8e13d37..735b5758d75c59b3a18fba2f748c267e5500266d 100644
--- a/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureFunctor.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "otbVectorImage.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbTextureFunctors.h"
diff --git a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
index 01ebb53eac2a0d3b29d846d6d949fa472f25500d..5f50f0fec009d6f2041f0da39d75c8092fe15b9c 100644
--- a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
@@ -15,14 +15,12 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbFunctionWithNeighborhoodToImageFilter.h"
 #include "otbTextureImageFunction.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkConstNeighborhoodIterator.h"
 #include "itkVariableLengthVector.h"
 
 #include "otbTextureFunctors.h"
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
index aec35c1fc2d6b8f4afc1b387d85b6c0746d17195..8d6a130e9c0c46246573a5f9886280f5c4493cf1 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetFilterNew.cxx
@@ -21,7 +21,6 @@
 #include "itkMacro.h"
 
 #include "otbThresholdImageToPointSetFilter.h"
-#include "itkPointSet.h"
 #include "otbImage.h"
 
 #include <iostream>
diff --git a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
index 9b00571afeaca950eb911c48d0b21d0343517ac9..555820780527ab1b9d4f37e2eee3c88a70ec8abe 100644
--- a/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
+++ b/Testing/Code/FeatureExtraction/otbThresholdImageToPointSetTest.cxx
@@ -23,7 +23,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbThresholdImageToPointSetFilter.h"
-#include "itkPointSet.h"
 
 int otbThresholdImageToPointSetTest(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
index 7d357e5bef5f4166ad5c11392d8aaae589fd529c..39f6b66fa4b4405899cbd5628eed950dd5f89c39 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetector.cxx
@@ -21,7 +21,6 @@
 #include "itkMacro.h"
 #include <iostream>
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbTouziEdgeDetectorImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
index 581e9bc3fd4c0da4065f555dc83469f44be4cbc3..e9a707c5b0d9fb3dab8b99eceafacd0def0c33d8 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorDirection.cxx
@@ -21,7 +21,6 @@
 #include "itkMacro.h"
 #include <iostream>
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbTouziEdgeDetectorImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
index f1141b32f2dc45d681c6ad44ce2c6da7c7908a2d..2f13450fdfaa6fe358da7d7b21b4f53cdd7af69e 100644
--- a/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbTouziEdgeDetectorNew.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "otbImage.h"
 #include <iostream>
 
 #include "otbTouziEdgeDetectorImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx b/Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx
index 15593b46afe4e4b582aa157896efe00325d93f82..c562bc68c06f2de6e70313dc5106129631d2a1b1 100644
--- a/Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbVectorDataToRightAngleVectorDataFilter.cxx
@@ -25,7 +25,6 @@
 #include "otbImage.h"
 #include "otbImageFileWriter.h"
 
-#include "otbMath.h"
 
 int otbVectorDataToRightAngleVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
index 5fbfe6a4537ef2b4ed7e776a6ff5c981ffe30056..7a2c153380355fedaafd60c4b7777558dc745f04 100644
--- a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
+++ b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbVectorizationPathListFilter.h"
-#include "otbImage.h"
 #include "itkPolyLineParametricPath.h"
 #include "otbImageFileReader.h"
 #include <fstream>
diff --git a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
index 79a5630f77b6368040a423cb18a1f96ba24472f5..9a3827e672988419899ba0d93c438fea7649a4d3 100644
--- a/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
+++ b/Testing/Code/FeatureExtraction/otbVectorizationPathListFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbVectorizationPathListFilter.h"
-#include "otbImage.h"
 #include "itkPolyLineParametricPath.h"
 
 int otbVectorizationPathListFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilter.cxx b/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
index c8ecd71c7cbda7db43f83f1c3dbd2a0c38c5f6fb..1f7b6c6a6d83039c4cf0cb7df40395303e0d99b1 100644
--- a/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
+++ b/Testing/Code/Fusion/otbBayesianFusionFilter.cxx
@@ -19,7 +19,6 @@
 #include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 
 #include "otbBayesianFusionFilter.h"
diff --git a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
index 529f6a44fba6e807d90742a9788d8e71fa9cf4d1..b42e5a24d41f6385158d1b424eee1bf4a80a0bd7 100644
--- a/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
+++ b/Testing/Code/Fusion/otbBayesianFusionFilterNew.cxx
@@ -19,7 +19,6 @@
 #include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 
 #include "otbBayesianFusionFilter.h"
diff --git a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx
index 8ae09e7db184cbc3979e966cf8aa755383f4bcb2..b3c2b61c83f670a22f5fe67b4275aec2b0228a85 100644
--- a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx
+++ b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilter.cxx
@@ -19,7 +19,6 @@
 #include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 
 #include "otbLmvmPanSharpeningFusionImageFilter.h"
diff --git a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx
index 702ed170a1d895056ea9760c15770770393111fd..6e816886c4967bb1ccf224aae65f6210305c96ee 100644
--- a/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx
+++ b/Testing/Code/Fusion/otbLmvmPanSharpeningFusionImageFilterNew.cxx
@@ -19,7 +19,6 @@
 #include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 
 #include "otbLmvmPanSharpeningFusionImageFilter.h"
diff --git a/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx b/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
index 6ee1de92a317ec4091a616f464c49717cb473797..799f81a65a1afaedbbb8bd7e4e3ab5cdb1a0d1b8 100644
--- a/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
+++ b/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
@@ -20,7 +20,6 @@
 #include "otbImageListToVectorImageFilter.h"
 #include "otbConfusionMatrixToMassOfBelief.h"
 
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageList.h"
 
diff --git a/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx b/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
index 172a1650e269efc7f558f459ae88a5d856894d23..678b49ccde4c56bec40ebaffcdf24c3ac1368221 100644
--- a/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
+++ b/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
@@ -19,7 +19,6 @@
 
 #include "otbStandardDSCostFunction.h"
 
-#include "otbVectorData.h"
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
 
 int otbStandardDSCostFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
diff --git a/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx b/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
index 6dff2be2faa62bce38063be90f9c36127df98fed..b031c777d188fca57d89f8e905aa7a062b154e5b 100644
--- a/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
+++ b/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
@@ -18,12 +18,10 @@
 
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
-#include "otbMassOfBelief.h"
 
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
-#include "otbFuzzyDescriptorsModelManager.h"
 
 int otbVectorDataToDSValidatedVectorDataFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
index fba3067a1fce7f1417d21e5a9e8bc157cbf8e4e6..47f39f5db40eecc920fb7687d545533e356fc87e 100644
--- a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
+++ b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
@@ -19,13 +19,11 @@
 
 #include "otbVectorDataToRoadDescriptionFilter.h"
 
-#include "otbVectorData.h"
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
-#include "otbVectorDataExtractROI.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorDataProperties.h"
 #include "otbRemoteSensingRegion.h"
diff --git a/Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx b/Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx
index 8ef6581e87e6cf072632a736d08e26459460c2bb..6cc603993f9cbbe92a93954a0b18340971c34a94 100644
--- a/Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx
+++ b/Testing/Code/Hyperspectral/otbLocalRxDetectorRoiTest.cxx
@@ -1,5 +1,4 @@
 #include "otbImageFileReader.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbLocalRxDetectorNonThreadFilter.h"
diff --git a/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx b/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx
index b80e069d3d5f10517e4daa1f5681a35ed05adde5..940a4768af40a49aeeccff325327c7406a567d5a 100644
--- a/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx
+++ b/Testing/Code/Hyperspectral/otbMDMDNMFImageFilter.cxx
@@ -19,7 +19,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbMDMDNMFImageFilter.h"
-#include "otbVectorImageToMatrixImageFilter.h"
 #include "otbStandardWriterWatcher.h"
 
 int otbMDMDNMFImageFilterNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
diff --git a/Testing/Code/IO/otbCompareWritingComplexImage.cxx b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
index 48269431527766c4172176b9eb27c8d85c4521fa..64ea7459e17bef5b04854d757be341cc827b14d3 100644
--- a/Testing/Code/IO/otbCompareWritingComplexImage.cxx
+++ b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbImage.h"
 #include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
index e8d8be2576e79a738a42df1d215f243bd633985f..f8fe3054c649ee79852bcd163b4b3bd54c00fbf0 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx b/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
index 9943d6270ebc4c29a1dfa59631247a2e8ad6c0d2..e687bbb8f30898c399cd1e0bf9932c8a293accfa 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbDEMToImageGenerator.h"
-#include "otbImage.h"
 
 int otbDEMToImageGeneratorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
index 27bb5757984884d2a22be2b589e0b4751e04d957..eae614d8cb95a58ce62c86d58597300be6dc3c5d 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorTest.cxx
@@ -19,7 +19,6 @@
 
 #include "otbDEMToImageGenerator.h"
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 #include "otbStandardFilterWatcher.h"
 
 int otbDEMToImageGeneratorTest(int argc, char * argv[])
diff --git a/Testing/Code/IO/otbImageFileReaderMSTAR.cxx b/Testing/Code/IO/otbImageFileReaderMSTAR.cxx
index b0d7236aa1cde419b95a21b410cb01cb5e56c4ab..0e249f9bfef747610e7a4420a8b4e0cade5e0dda 100644
--- a/Testing/Code/IO/otbImageFileReaderMSTAR.cxx
+++ b/Testing/Code/IO/otbImageFileReaderMSTAR.cxx
@@ -21,7 +21,6 @@
 #include "otbVectorImage.h"
 #include "otbImage.h"
 
-#include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
 
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Testing/Code/IO/otbImageFileReaderONERA.cxx b/Testing/Code/IO/otbImageFileReaderONERA.cxx
index 38249b2939dc764691348d267fd57330fe2dea72..9770188af00d7a263c57b12cebf3f69ed5c5ba8d 100644
--- a/Testing/Code/IO/otbImageFileReaderONERA.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERA.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbVectorImage.h"
 #include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
index 60254a630d4ea6df0cab99057e94ccbf77824c78..21e05d4731b1cf59bdf1c65c9711e0304324fb00 100644
--- a/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERAComplex.cxx
@@ -18,11 +18,9 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "itkComplexToRealImageFilter.h"
 #include "itkComplexToImaginaryImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADChar.cxx b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
index 3d33f11d171f095e0845ae45a7d4cfbf33a5ba9e..7a1db476a26c4898adf5505ff0daf198bb910200 100644
--- a/Testing/Code/IO/otbImageFileReaderRADChar.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
index 50649c2922f1d8080def82cd45f3c3707454930e..0648d4c00adbbacfcb2c3b63b0063074157d8fba 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
index 9131f1ad421894924d5a60596b339ce116d0361c..649f39ebf84186b2ced7e66c8af8f201c5a820cd 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
index a91ef1caa39fd2928db1270b3c41fe8f7b996620..2a051fedd72f5c03702afe9da3be4f2b8fec1a64 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbVectorImage.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
index dc09731549f0fae85fa71bc710078d976d53c3dc..0435d7ae67998594a776fd37c582439915a61141 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADInt.cxx b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
index 244f999695940b754048b171204ca6f6591d7738..7db4cd82ae0c3b71a49eb7a185d3847ac7824067 100644
--- a/Testing/Code/IO/otbImageFileReaderRADInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
index 140862814f731e2282cd8e24235d9e98853827a2..79c6f54f14d06838b715c5f84f22752bd87bedbc 100644
--- a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
+++ b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
@@ -18,9 +18,7 @@
 
 
 
-#include "otbImage.h"
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
index ebfc6541891298f6ecfad31ff7c87b5b6b922ede..1624ec4f351159eb6fbd7acab00a9d31dbc7f193 100644
--- a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbImage.h"
 #include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
index 68e3bf7354dfdc036906573ad0b1c6297baf72ac..c8bd6bb82bc514c7c72afb184f10ee9a7bf61b7e 100644
--- a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
+++ b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "otbVectorImage.h"
 #include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx b/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
index 7584a348a617b298b9a6fbe98c79340300515867..2a5bff23cf84c1b8949f3d299d3753d84c345764 100644
--- a/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
+++ b/Testing/Code/IO/otbImageMetadataInterfaceBaseTest.cxx
@@ -24,7 +24,6 @@
 #include <iostream>
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
-#include "otbImageMetadataInterfaceBase.h"
 #include "otbImageMetadataInterfaceFactory.h"
 
 int otbImageMetadataInterfaceBaseTest(int itkNotUsed(argc), char* argv[])
diff --git a/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx b/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
index c6ef5bd52488ae8aa486eaeecb18513b3c9d0839..4494e53aee33125061a82e4ba33bbf3f27f4a351 100644
--- a/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
+++ b/Testing/Code/IO/otbImageMetadataInterfaceTest2.cxx
@@ -24,7 +24,6 @@
 #include <iostream>
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "otbImageMetadataInterfaceBase.h"
 #include "otbImageMetadataInterfaceFactory.h"
 
 int otbImageMetadataInterfaceTest2(int itkNotUsed(argc), char* argv[])
diff --git a/Testing/Code/IO/otbImageSeriesFileReader.cxx b/Testing/Code/IO/otbImageSeriesFileReader.cxx
index 376062784eb2912915f668db656d1781ee223147..47bf8c64c53d0b81819e4c567cd317559dc7f799 100644
--- a/Testing/Code/IO/otbImageSeriesFileReader.cxx
+++ b/Testing/Code/IO/otbImageSeriesFileReader.cxx
@@ -19,7 +19,6 @@
 =========================================================================*/
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageList.h"
 #include "otbImageSeriesFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx b/Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx
index 2522f788667a52ddf72ca2eaa077316d9395f0d7..23d4ee208944529b302e8b2bb7c834961afcbd96 100644
--- a/Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx
+++ b/Testing/Code/IO/otbKMLVectorDataIOTestFileReader.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbKMLVectorDataIO.h"
-#include "otbVectorData.h"
 #include <iostream>
 
 int otbKMLVectorDataIOTestFileReader(int argc, char* argv[])
diff --git a/Testing/Code/IO/otbKmzProductWriter.cxx b/Testing/Code/IO/otbKmzProductWriter.cxx
index e7077b3e7ec96d9a51a1725ec55d8b36a70ff906..867350adca63af9e7d4221a9d7c17a38d74a091a 100644
--- a/Testing/Code/IO/otbKmzProductWriter.cxx
+++ b/Testing/Code/IO/otbKmzProductWriter.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbMacro.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbKmzProductWriter.h"
diff --git a/Testing/Code/IO/otbOGRVectorDataIONew.cxx b/Testing/Code/IO/otbOGRVectorDataIONew.cxx
index 1a9fb258f7a0531dd62d3a3cc3d0254bd0afbfe3..e7e7d901718303c09b301a7a8558c9b1b1f4a996 100644
--- a/Testing/Code/IO/otbOGRVectorDataIONew.cxx
+++ b/Testing/Code/IO/otbOGRVectorDataIONew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbOGRVectorDataIO.h"
-#include "otbVectorData.h"
 
 int otbOGRVectorDataIONew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx b/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
index 82db1ce551ab5d67b3751c8f9c5f3795ec63fa37..7fa13622e6801af441cce0bc4e33a0ce60abfd95 100644
--- a/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
+++ b/Testing/Code/IO/otbOpticalImageMetadataInterfaceTest.cxx
@@ -24,7 +24,6 @@
 #include <iostream>
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
-#include "otbOpticalImageMetadataInterface.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 
 int otbOpticalImageMetadataInterfaceTest(int itkNotUsed(argc), char* argv[])
diff --git a/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx b/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
index f60a650505c2409d345def8cf63494ce2e54b1b0..b438671b82b5d86ba0bfc21c2f37c6f02e47703e 100644
--- a/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
+++ b/Testing/Code/IO/otbSarImageMetadataInterfaceTest.cxx
@@ -24,7 +24,6 @@
 #include <iostream>
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
-#include "otbSarImageMetadataInterface.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
 
 void printPointSet(otb::SarImageMetadataInterface::PointSetPointer pointSet, std::ostream& stream )
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
index 035a7c9f7bf1f78c11e1193e3fa7db25055c8c46..6679dc218b3fcbf67d01fac4aab9ff6b748fcac6 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTest.cxx
@@ -25,7 +25,6 @@
 
 #include "otbImageFileReader.h"
 #include "otbStreamingImageFileWriter.h"
-#include "otbImageFileWriter.h"
 
 int otbStreamingImageFileWriterTest(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Code/IO/otbTileMapImageIOTest.cxx b/Testing/Code/IO/otbTileMapImageIOTest.cxx
index 385eeaaa736b856682361a81c5c727ebc84a28c2..8d0daa0a9fa639541ce735010bd3e7d26ffb0bb9 100644
--- a/Testing/Code/IO/otbTileMapImageIOTest.cxx
+++ b/Testing/Code/IO/otbTileMapImageIOTest.cxx
@@ -18,7 +18,6 @@
 
 
 #include "itkRGBPixel.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbTileMapImageIO.h"
 #include "otbTileMapTransform.h"
diff --git a/Testing/Code/IO/otbTileMapWriter.cxx b/Testing/Code/IO/otbTileMapWriter.cxx
index e06b64eab50b912e3b3f65e06a1ce1beac1e2cf8..49e54f5a24c5e414d48cce8de48d413427e25772 100644
--- a/Testing/Code/IO/otbTileMapWriter.cxx
+++ b/Testing/Code/IO/otbTileMapWriter.cxx
@@ -16,21 +16,17 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "itkRGBPixel.h"
-#include "otbImage.h"
 #include "otbTileMapTransform.h"
 #include "otbOrthoRectificationFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkPoint.h"
-#include "otbImageRegionTileMapSplitter.h"
 #include "otbTileMapImageIO.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbPerBandVectorImageFilter.h"
 #include "otbPrintableImageFilter.h"
-#include "otbMultiChannelExtractROI.h"
 
 int otbTileMapWriter(int argc, char *argv[])
 {
diff --git a/Testing/Code/IO/otbVectorDataFileReader.cxx b/Testing/Code/IO/otbVectorDataFileReader.cxx
index 75aaeefd24c771324cf7f0001fddbed695593278..d54e27a5344bf8b68afaeb389ce713d92b447ed9 100644
--- a/Testing/Code/IO/otbVectorDataFileReader.cxx
+++ b/Testing/Code/IO/otbVectorDataFileReader.cxx
@@ -20,9 +20,7 @@
 #include "otbVectorData.h"
 #include <fstream>
 
-#include "itkTreeContainer.h"
 #include "itkDataObject.h"
-#include "otbDataNode.h"
 
 int otbVectorDataFileReader(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx b/Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx
index 87cb7e227101d75ac8a541fbb5343a8d502f223e..cb490a2e5a3f27a6a4133af3fd083a69c9ab6ceb 100644
--- a/Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx
+++ b/Testing/Code/IO/otbWavelengthSpectralBandsTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbFilterFunctionValues.h"
 #include "otbWavelengthSpectralBands.h"
 
 using namespace otb;
diff --git a/Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx b/Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx
index bc905e8caf92bd7a7ff1a42e5de673487e506e7a..1f060e9ef94028dea08ddecc2526108e35cc5ead 100644
--- a/Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx
+++ b/Testing/Code/IO/otbWritingComplexDataWithComplexImageTest.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
-#include "otbImage.h"
 #include "otbMacro.h"
 
 int otbWritingComplexDataWithComplexImageTest(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Learning/otbMachineLearningModelCanRead.cxx b/Testing/Code/Learning/otbMachineLearningModelCanRead.cxx
index 051d31ae385ce346af403712f5e1ef116be971c0..752f5895d5ab38925591cac1a7d73b41cd301163 100644
--- a/Testing/Code/Learning/otbMachineLearningModelCanRead.cxx
+++ b/Testing/Code/Learning/otbMachineLearningModelCanRead.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include <iostream>
-#include "otbMachineLearningModel.h"
 #include "otbLibSVMMachineLearningModel.h"
 #include "otbSVMMachineLearningModel.h"
 #include "otbRandomForestsMachineLearningModel.h"
diff --git a/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx b/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx
index 0b62b5a7254c0de05c1ccb96443cdd3cf7e646f5..0b8e0d87a9c1addc2af874199acc0b8272a7a822 100644
--- a/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx
+++ b/Testing/Code/Learning/otbNeighborhoodMajorityVotingImageFilterNew.cxx
@@ -19,7 +19,6 @@
 #include "otbImage.h"
 #include <iostream>
 
-#include "itkBinaryBallStructuringElement.h"
 #include "otbNeighborhoodMajorityVotingImageFilter.h"
 
 int otbNeighborhoodMajorityVotingImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbPeriodicSOM.cxx b/Testing/Code/Learning/otbPeriodicSOM.cxx
index deb2f90a0f54f6118072d0e12ddacb89b03a3a2d..f570a7ef264402b467f3bcf3a1f4070283b4018b 100644
--- a/Testing/Code/Learning/otbPeriodicSOM.cxx
+++ b/Testing/Code/Learning/otbPeriodicSOM.cxx
@@ -16,11 +16,9 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbSOMMap.h"
 #include "otbPeriodicSOM.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkListSample.h"
diff --git a/Testing/Code/Learning/otbPeriodicSOMNew.cxx b/Testing/Code/Learning/otbPeriodicSOMNew.cxx
index 5519841a8b7c8bc87d31531bacb80162721a229f..19438da4df72c82a86ab2bd6c18decf13d6587ba 100644
--- a/Testing/Code/Learning/otbPeriodicSOMNew.cxx
+++ b/Testing/Code/Learning/otbPeriodicSOMNew.cxx
@@ -19,7 +19,6 @@
 #include "otbSOMMap.h"
 #include "otbPeriodicSOM.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkListSample.h"
 
 int otbPeriodicSOMNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbROIdataConversion.cxx b/Testing/Code/Learning/otbROIdataConversion.cxx
index b7bf481a3b42d29cecd65714611507a33149d082..d69d1b2c1deb83632b75ea9164dc82cecf882e4f 100644
--- a/Testing/Code/Learning/otbROIdataConversion.cxx
+++ b/Testing/Code/Learning/otbROIdataConversion.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbROIdataConversion.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Learning/otbROIdataConversionNew.cxx b/Testing/Code/Learning/otbROIdataConversionNew.cxx
index 40bcc9f1a8dfeef03d472f58097bee1231a1dfdb..05072fce4dfd92019d0ab6f97f245111b5d44ca0 100644
--- a/Testing/Code/Learning/otbROIdataConversionNew.cxx
+++ b/Testing/Code/Learning/otbROIdataConversionNew.cxx
@@ -19,7 +19,6 @@
 
 
 #include "otbROIdataConversion.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 
 int otbROIdataConversionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbSEMClassifierNew.cxx b/Testing/Code/Learning/otbSEMClassifierNew.cxx
index 21319c36c435e6f8c35d2c2178e8324262631414..3f6606df5d4a534b82f7f4abba85153667eed5b3 100644
--- a/Testing/Code/Learning/otbSEMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSEMClassifierNew.cxx
@@ -20,9 +20,7 @@
 
 #include "itkMacro.h"
 #include "otbImage.h"
-#include "itkListSample.h"
 #include "otbVectorImage.h"
-#include "otbModelComponentBase.h"
 #include "otbSEMClassifier.h"
 
 #include <iostream>
diff --git a/Testing/Code/Learning/otbSOM.cxx b/Testing/Code/Learning/otbSOM.cxx
index 9af697fc5fbb09047b3215f84d4c4af00427bdbb..da9a039d271d0aa91d4adbf4a6eaad1846d4f8cf 100644
--- a/Testing/Code/Learning/otbSOM.cxx
+++ b/Testing/Code/Learning/otbSOM.cxx
@@ -16,11 +16,9 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbSOMMap.h"
 #include "otbSOM.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkListSample.h"
diff --git a/Testing/Code/Learning/otbSOMActivationBuilder.cxx b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
index 7edb04527ecbf5d52aa3abd52356b4c5ae5501fc..e6f5bd07fc886d67c393d4c6e3959da792473583 100644
--- a/Testing/Code/Learning/otbSOMActivationBuilder.cxx
+++ b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
@@ -19,12 +19,10 @@
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbSOMActivationBuilder.h"
-#include "itkVariableLengthVector.h"
 #include "itkEuclideanDistanceMetric.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkListSample.h"
-#include "otbVectorImage.h"
 #include "itkImageRegionIterator.h"
 
 int otbSOMActivationBuilder(int itkNotUsed(argc), char* argv[])
diff --git a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
index ed6df72cb6ccfeebfd424a32bed69a4966301f06..c15d2eb0698467435cbdd971e39a05cfd3dc4a9f 100644
--- a/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
+++ b/Testing/Code/Learning/otbSOMActivationBuilderNew.cxx
@@ -19,11 +19,8 @@
 #include "otbSOMMap.h"
 #include "otbSOM.h"
 #include "otbSOMActivationBuilder.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkListSample.h"
-#include "itkVariableLengthVector.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 
 int otbSOMActivationBuilderNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Learning/otbSOMClassifier.cxx b/Testing/Code/Learning/otbSOMClassifier.cxx
index e139c274715fef8d5289227c1dc543325ee86de4..f9317889144c5b777242a3aea8fd34c91fe50978 100644
--- a/Testing/Code/Learning/otbSOMClassifier.cxx
+++ b/Testing/Code/Learning/otbSOMClassifier.cxx
@@ -19,7 +19,6 @@
 
 
 #include <fstream>
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbSOMClassifier.h"
diff --git a/Testing/Code/Learning/otbSOMClassifierNew.cxx b/Testing/Code/Learning/otbSOMClassifierNew.cxx
index 7c4c52e7f9fb15c48a15b77e89bdb537e1c6c4e6..f8cb6acbf4a4371dd3f9e06711baea91589a07d2 100644
--- a/Testing/Code/Learning/otbSOMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSOMClassifierNew.cxx
@@ -22,7 +22,6 @@
 #include "otbSOMMap.h"
 #include "otbSOMClassifier.h"
 #include "itkListSample.h"
-#include "otbVectorImage.h"
 
 int otbSOMClassifierNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx b/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
index f072d5ae72c3be9f11f2557cc8578cf3a526cdbe..3e2348fb5eba53bb14878591412710425356b5d9 100644
--- a/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
+++ b/Testing/Code/Learning/otbSOMImageClassificationFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSOMImageClassificationFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx b/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
index a4db227ddfe01a0fe327eeae9ed9a6452c2b4fda..c679af70ad6a39fc3c8a4c26f8a4d28039e94e3c 100644
--- a/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
+++ b/Testing/Code/Learning/otbSOMImageClassificationFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSOMImageClassificationFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbSOMMap.h"
 
diff --git a/Testing/Code/Learning/otbSOMMap.cxx b/Testing/Code/Learning/otbSOMMap.cxx
index d2d786755dfc6aa92e4312a12870ffe1af7e41ed..974ed9fe61186a807cb0b3dc7dee4487ee915a88 100644
--- a/Testing/Code/Learning/otbSOMMap.cxx
+++ b/Testing/Code/Learning/otbSOMMap.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 #include "otbSOMMap.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkVariableLengthVector.h"
 
 int otbSOMMap(int itkNotUsed(argc), char* itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbSOMMapNew.cxx b/Testing/Code/Learning/otbSOMMapNew.cxx
index a479c1cdf2726cd69089400f93ce3c890f25cd83..100dd2d163852fd67dbdf8d93216ab576e572a79 100644
--- a/Testing/Code/Learning/otbSOMMapNew.cxx
+++ b/Testing/Code/Learning/otbSOMMapNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 #include "otbSOMMap.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 
 int otbSOMMapNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Learning/otbSOMNew.cxx b/Testing/Code/Learning/otbSOMNew.cxx
index 0a05920133f4e7d7cacfc30c09ef11d8c313fa3e..bbb0d9b7755414f3b53473a8c78ae7266bec65d2 100644
--- a/Testing/Code/Learning/otbSOMNew.cxx
+++ b/Testing/Code/Learning/otbSOMNew.cxx
@@ -19,7 +19,6 @@
 #include "otbSOMMap.h"
 #include "otbSOM.h"
 #include "itkRGBPixel.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "itkListSample.h"
 
 int otbSOMNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbSOMWithMissingValue.cxx b/Testing/Code/Learning/otbSOMWithMissingValue.cxx
index 646d6cbb19c3e896c613778c476f1b0b142685d9..85de7c3adac51e4a1a6e738ff618b22e60bb5b32 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValue.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValue.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbSOMMap.h"
 #include "itkRGBPixel.h"
 #include "otbImageFileReader.h"
@@ -24,7 +23,6 @@
 #include "itkListSample.h"
 #include "itkImageRegionIterator.h"
 
-#include "itkVariableLengthVector.h"
 #include "otbSOMWithMissingValue.h"
 #include "otbFlexibleDistanceWithMissingValue.h"
 
diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
index 9e19650be9e28545a145381b0c41bd87a0067658..0d780e2cb37129fe966d02c7baa790ec5da15289 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
@@ -19,7 +19,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "itkVariableLengthVector.h"
 #include "itkListSample.h"
 
diff --git a/Testing/Code/Learning/otbSOMbasedImageFilter.cxx b/Testing/Code/Learning/otbSOMbasedImageFilter.cxx
index 5c5c6049573b79741dcbdf9e32a2b154db63e48a..a2521b81f8fdb95d4aa10ecf12c907461e206d29 100644
--- a/Testing/Code/Learning/otbSOMbasedImageFilter.cxx
+++ b/Testing/Code/Learning/otbSOMbasedImageFilter.cxx
@@ -16,12 +16,10 @@
 
 =========================================================================*/
 #include "otbSOMbasedImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkEuclideanDistanceMetric.h"
 
 
 int otbSOMbasedImageFilterTest(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Learning/otbSVMClassifierImage.cxx b/Testing/Code/Learning/otbSVMClassifierImage.cxx
index cf874cf79ab7b99e6d18541c69d556ffd54be37c..76387f44e4f1995654a5f0ddbda9f4bc8f5c0769 100644
--- a/Testing/Code/Learning/otbSVMClassifierImage.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierImage.cxx
@@ -20,14 +20,12 @@
 
 #include <fstream>
 
-#include "itkListSample.h"
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "itkImageToListSampleAdaptor.h"
 #include "otbSVMClassifier.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkImageRegionIterator.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 namespace otb
diff --git a/Testing/Code/Learning/otbSVMClassifierNew.cxx b/Testing/Code/Learning/otbSVMClassifierNew.cxx
index a1c1d57fd49853c43b05005fb9b60f1789c8c609..68883c73abffa7f2ac2ed2956987811c24069d69 100644
--- a/Testing/Code/Learning/otbSVMClassifierNew.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierNew.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkPointSet.h"
 #include "itkPointSetToListSampleAdaptor.h"
 #include "itkSubsample.h"
 #include "otbSVMClassifier.h"
diff --git a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
index f58a4972efe8a4eec949270e78465bdf2e984d66..6e84b537f560107d7886f20c650f894629fe897c 100644
--- a/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
+++ b/Testing/Code/Learning/otbSVMClassifierPointSet.cxx
@@ -21,11 +21,9 @@
 #include <fstream>
 
 #include "itkPoint.h"
-#include "itkPointSet.h"
 
 #include "itkPointSetToListSampleAdaptor.h"
 #include "itkSubsample.h"
-#include "itkListSample.h"
 #include "otbSVMClassifier.h"
 
 int otbSVMClassifierPointSet(int argc, char* argv[])
diff --git a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
index cee0700d72b3b78222328c8091519bafdb93cfa9..63c0f534fec10a9326b3bad872e7dd5a268efceb 100644
--- a/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
+++ b/Testing/Code/Learning/otbSVMCrossValidationCostFunctionNew.cxx
@@ -22,7 +22,6 @@
 #include "otbImage.h"
 #include <iostream>
 
-#include "otbSVMModel.h"
 #include "otbSVMCrossValidationCostFunction.h"
 
 int otbSVMCrossValidationCostFunctionNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx
index 3fe98dbe26f94e1b1c7c11102112b4529c0f966d..520bbd5a24b29f91a6670d8b06046579d6c5b093 100644
--- a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx
+++ b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSVMImageClassificationWithRuleFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx
index 699739780943848b56ede1b89793f52e8e1b2933..b2bc2d51b9b8239ff77c3cb555ea702d23f7c4e9 100644
--- a/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx
+++ b/Testing/Code/Learning/otbSVMImageClassificationWithRuleFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbSVMImageClassificationWithRuleFilter.h"
-#include "otbVectorImage.h"
 #include "otbImage.h"
 
 int otbSVMImageClassificationWithRuleFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Testing/Code/Learning/otbSVMMarginSampler.cxx b/Testing/Code/Learning/otbSVMMarginSampler.cxx
index be0f21547c093df5e0078347208696e26943f874..ebd353b07279753c37cd83be00647c9674d84405 100644
--- a/Testing/Code/Learning/otbSVMMarginSampler.cxx
+++ b/Testing/Code/Learning/otbSVMMarginSampler.cxx
@@ -20,7 +20,6 @@
 #pragma warning ( disable : 4786 )
 #endif
 
-#include "itkVariableLengthVector.h"
 #include "itkListSample.h"
 #include "otbSVMMarginSampler.h"
 #include "otbSVMModel.h"
diff --git a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
index 2f6a3f404f1a1303ff8ce19c10602649bfe47e3a..24fd314ae6145eb7be9625342042c6a28602ceaf 100644
--- a/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
+++ b/Testing/Code/Learning/otbSVMModelGenericKernelsTest.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include "otbImage.h"
 #include <iostream>
 
diff --git a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
index 80865d50f118288dd58e1f1f6e5446393c81cb69..504afc565c38285e13b5d6871d8fcdf5190b1442 100644
--- a/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
+++ b/Testing/Code/Learning/otbSVMSampleListModelEstimatorTest.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "itkListSample.h"
 #include <iostream>
 
 #include "otbSVMSampleListModelEstimator.h"
diff --git a/Testing/Code/Learning/otbTrainMachineLearningModel.cxx b/Testing/Code/Learning/otbTrainMachineLearningModel.cxx
index 77abf113c9b90ab2cb02148fe208c8adbf92a76e..13e3a2814549b3c11aaefcb53bfaed9e9576fb88 100644
--- a/Testing/Code/Learning/otbTrainMachineLearningModel.cxx
+++ b/Testing/Code/Learning/otbTrainMachineLearningModel.cxx
@@ -20,7 +20,6 @@
 #include <string>
 #include <algorithm>
 
-#include "otbMachineLearningModel.h"
 #include "otbLibSVMMachineLearningModel.h"
 #include "otbSVMMachineLearningModel.h"
 #include "otbKNearestNeighborsMachineLearningModel.h"
diff --git a/Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx b/Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx
index 761b69e37f936d10e2779185bb44de1a7a147df1..15467cafac32d6a2e4c13a908bd38cd84079c3c7 100644
--- a/Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx
+++ b/Testing/Code/Markov/otbMarkovRandomFieldFilter.cxx
@@ -23,7 +23,6 @@
 #include "otbMarkovRandomFieldFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
-#include "otbMRFEnergy.h"
 #include "otbMRFEnergyPotts.h"
 #include "otbMRFEnergyGaussianClassification.h"
 #include "otbMRFOptimizerMetropolis.h"
diff --git a/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
index cd835ac593aebd6c8f042ba8aa79d9874694c4c6..8735db6bd7c2db507785c62c2ab1e439eb8c8867 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketInverseTransformNew.cxx
@@ -22,7 +22,6 @@
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
 #include "otbWaveletPacketTransform.h"
-#include "otbWaveletPacketDecompositionCosts.h"
 
 int otbWaveletPacketInverseTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
index 87c69e6e727970b3e1e45940e455692b2c87e3fb..5726576a4f779aee308b800f1e3b8b8c774ac825 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransform.cxx
@@ -26,7 +26,6 @@
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
 #include "otbWaveletPacketTransform.h"
-#include "otbWaveletPacketDecompositionCosts.h"
 
 template<otb::Wavelet::Wavelet TWavelet>
 int otbWaveletPacketTransform_generic(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
index 81b0e02be4bf46232a109868a7c0ebb2a33fafed..a6b28fba67c36a3f0752866ccdbce65bd2745b7a 100644
--- a/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
+++ b/Testing/Code/MultiScale/otbWaveletPacketTransformNew.cxx
@@ -20,7 +20,6 @@
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
 #include "otbWaveletPacketTransform.h"
-#include "otbWaveletPacketDecompositionCosts.h"
 
 int otbWaveletPacketTransformNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx b/Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
index c1d14a09475bf6f7cfa511daaaf1bf0626dc0e37..fca8b57f8515f4e934e779effb97cd5bdbc27c3b 100644
--- a/Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
+++ b/Testing/Code/MultiTemporal/otbEnvelopeSavitzkyGolayInterpolationFunctorTest.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbEnvelopeSavitzkyGolayInterpolationFunctor.h"
 #include "otbTimeSeries.h"
 
diff --git a/Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx b/Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx
index f16ec2b3fca047b2d842f2c37b4371e524234132..8cc32755e59c944faaca146c67a9e1aaa2476929 100644
--- a/Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx
+++ b/Testing/Code/MultiTemporal/otbPolynomialTimeSeriesTest.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbTimeSeries.h"
 
 int otbPolynomialTimeSeriesTest(int itkNotUsed(argc), char* itkNotUsed(argv)[])
diff --git a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx b/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx
index 7d8aec56f2f3ac812ddc85289d50cc837b9e8021..69c7484b01c128bbc89c7d397855b75a20d0f74b 100644
--- a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx
+++ b/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorNew.cxx
@@ -17,9 +17,7 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbSavitzkyGolayInterpolationFunctor.h"
-#include "otbTimeSeries.h"
 
 int otbSavitzkyGolayInterpolationFunctorNew(int itkNotUsed(argc), char* itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx b/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx
index 87f6879b1c5cfd566af86332065f4ba8dc6f30ae..bf542fed0cdfcb0f8ce55d5af90566839904558d 100644
--- a/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx
+++ b/Testing/Code/MultiTemporal/otbSavitzkyGolayInterpolationFunctorTest.cxx
@@ -17,9 +17,7 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbSavitzkyGolayInterpolationFunctor.h"
-#include "otbTimeSeries.h"
 
 int otbSavitzkyGolayInterpolationFunctorTest(int itkNotUsed(argc), char* itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
index 2113342213401f828dc81640a18b68d77beaaf24..bb90d4a8a06230f424f6c62529dcc38cb84c0c62 100644
--- a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
+++ b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbTimeSeriesLeastSquareFittingFunctor.h"
 #include "otbTimeSeries.h"
 
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
index 20826ab3bed407ccc8d1f4a10649590540f984ed..ece29e4e3c0973d5bfffac9ce6efe5a6a5608479 100644
--- a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
+++ b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorTest.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbTimeSeriesLeastSquareFittingFunctor.h"
 #include "otbTimeSeries.h"
 
diff --git a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
index 9d125b0f1d5e2632843591c42497825b42619b96..29cc70406ed5f137cddac25362d9ef0d58f1501a 100644
--- a/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
+++ b/Testing/Code/MultiTemporal/otbTimeSeriesLeastSquareFittingFunctorWeightsTest.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkFixedArray.h"
 #include "otbTimeSeriesLeastSquareFittingFunctor.h"
 #include "otbTimeSeries.h"
 
diff --git a/Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx b/Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx
index 09c60f87abd55255549c8d85fe09a5479d76b293..10dca1ce6a4dd264c9b1d1271559781fac603ac6 100644
--- a/Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx
+++ b/Testing/Code/OBIA/otbAttributesMapOpeningLabelMapFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbAttributesMapLabelObject.h"
 #include "itkLabelMap.h"
 #include "otbAttributesMapOpeningLabelMapFilter.h"
 
diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx
index 475b53282db7a2bf1f4a42858543616dc35651c1..fa31ffa1fdfc9814a4d40d58f6971bb935bbbb76 100644
--- a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx
+++ b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilter.cxx
@@ -20,9 +20,7 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
-#include "itkLabelMap.h"
 #include "otbImageFileReader.h"
-#include "otbAttributesMapLabelObjectWithClassLabel.h"
 
 int otbImageToLabelMapWithAttributesFilter(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx
index 92a621bf8a100aa93f835b3155cfbe72643543b0..808c2e2c46897a61451151ca6e489c63f6f8baf8 100644
--- a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx
+++ b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
-#include "itkLabelMap.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
 
 int otbImageToLabelMapWithAttributesFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
diff --git a/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx b/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
index b3def1e9d0f8d1825db59fb1b6b82e4b8acd8054..4dc4e84aae2c388880748e78cf10e91ab31da30a 100644
--- a/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
@@ -21,14 +21,11 @@
 #include <fstream>
 #include <iostream>
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
-#include "otbAttributesMapLabelObjectWithClassLabel.h"
 #include "itkLabelMap.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "otbKMeansAttributesLabelMapFilter.h"
-#include "otbShapeAttributesLabelMapFilter.h"
 
 const unsigned int Dimension = 2;
 typedef unsigned short LabelType;
diff --git a/Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx b/Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
index 9c3c1c5d93b9de7472f441b003f4ca2a00da8d22..54c8873bf673ff44cb716176a14814d2bdedd86d 100644
--- a/Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
+++ b/Testing/Code/OBIA/otbLabelImageToLabelMapWithAdjacencyFilter.cxx
@@ -17,10 +17,8 @@
 =========================================================================*/
 
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
-#include "otbLabelMapWithAdjacency.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "itkLabelObject.h"
 #include "itkNumericTraits.h"
 
 #include <fstream>
diff --git a/Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx b/Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx
index a8b42beb9a5f1f060e2500538711a2da3e52ee21..ac4020d9e693288e792107af997b9b040d26249e 100644
--- a/Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx
+++ b/Testing/Code/OBIA/otbLabelMapSVMClassifier.cxx
@@ -22,7 +22,6 @@
 #include <fstream>
 #include <iostream>
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
 #include "itkLabelImageToLabelMapFilter.h"
diff --git a/Testing/Code/OBIA/otbLabelMapSourceNew.cxx b/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
index 0cc75055f3c91cf8f807d5b9effca96443f62aed..bc29c2bf8c8f52433ea2ddcf5702e6e80a9c16f4 100644
--- a/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
+++ b/Testing/Code/OBIA/otbLabelMapSourceNew.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbLabelMapSource.h"
 #include "itkLabelMap.h"
diff --git a/Testing/Code/OBIA/otbLabelMapToGISTableFilter.cxx b/Testing/Code/OBIA/otbLabelMapToGISTableFilter.cxx
index 8bd6055ca9e0de857e4c077fd6d935675fbc7675..663b4d1bc4f3833c5848f3a29e9420b1d3b8b585 100644
--- a/Testing/Code/OBIA/otbLabelMapToGISTableFilter.cxx
+++ b/Testing/Code/OBIA/otbLabelMapToGISTableFilter.cxx
@@ -22,7 +22,6 @@
 #include <fstream>
 #include <iostream>
 
-#include "otbPolygon.h"
 #include "otbImage.h"
 #include "otbLabelMapToGISTableFilter.h"
 #include "otbAttributesMapLabelObject.h"
diff --git a/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx b/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
index 448fff253c2172e916ad535feca69043d29c34a7..bc0209690579d0ef0e8212a5b8b47e940cf9e264 100644
--- a/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
+++ b/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
@@ -17,13 +17,11 @@
 =========================================================================*/
 
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
 #include "itkBinaryImageToLabelMapFilter.h"
-#include "otbAttributesMapLabelObject.h"
 #include "itkLabelMap.h"
 #include "otbShapeAttributesLabelMapFilter.h"
 
diff --git a/Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx b/Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx
index a1db87ed42ffab124ef256f0bc51437e3ffaf43c..3ccbed187e6d0f514c828cc9209539ec2db0670b 100644
--- a/Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx
+++ b/Testing/Code/OBIA/otbLabelMapToSampleListFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbAttributesMapLabelObject.h"
 #include "itkLabelMap.h"
 #include "otbLabelMapToSampleListFilter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx b/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
index 970fab4fe28f4e1875b3dc0b4178cb1d0992fd18..f207662c9ec3e7e00bb7dfc250aac467c80b5bca 100644
--- a/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
+++ b/Testing/Code/OBIA/otbLabelMapWithClassLabelToLabeledSampleListFilter.cxx
@@ -17,14 +17,12 @@
 =========================================================================*/
 
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
-#include "itkLabelMap.h"
 #include "otbShapeAttributesLabelMapFilter.h"
 
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx b/Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx
index 66f60e2ce9a6952eab8cbd249a8774bec6a23b84..62033fecfa57baa578eced4be75c4f8a68c0463d 100644
--- a/Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx
+++ b/Testing/Code/OBIA/otbLabelObjectMapVectorizer.cxx
@@ -17,10 +17,8 @@
 =========================================================================*/
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "otbPolygon.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "otbAttributesMapLabelObject.h"
-#include "itkLabelMap.h"
 #include "otbLabelObjectToPolygonFunctor.h"
 #include "otbVectorData.h"
 #include "otbVectorDataProjectionFilter.h"
diff --git a/Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx b/Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx
index 25797f552f0be5691bc53f9cfcae81300ed40dc4..46afabba59af47bab6f68dcfde2b42852536788a 100644
--- a/Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx
+++ b/Testing/Code/OBIA/otbLabelObjectToPolygonFunctorNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbLabelObjectToPolygonFunctor.h"
-#include "otbPolygon.h"
 #include "otbAttributesMapLabelObject.h"
 #include <cstdlib>
 
diff --git a/Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx b/Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
index f538e275bbbea08459a57001f2144a5e249ff16c..617f46520c24fbb114f35187edf18105f5a6e419 100644
--- a/Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
+++ b/Testing/Code/OBIA/otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
@@ -15,11 +15,9 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbMeanShiftSmoothingImageFilter.h"
 #include "otbMeanShiftConnectedComponentSegmentationFilter.h"
 
 typedef float InputPixelType;
diff --git a/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx b/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
index 9d2d1fa792a08ea951fc1f57c2b41f7a55e3c9e6..822149ba53a320032eff25c093bb75fc7b9876c1 100644
--- a/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
+++ b/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbVectorData.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx b/Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx
index e18b15e7beb90880e530e31c526bc61cbbd37de0..0ba6d84b94abe6aabb6f6943a72ab4067e3eec5f 100644
--- a/Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbMinMaxAttributesLabelMapFilter.cxx
@@ -24,7 +24,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbAttributesMapLabelObject.h"
-#include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "otbMinMaxAttributesLabelMapFilter.h"
 
diff --git a/Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx b/Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx
index 7f9de29e6807fe98982c3be03fb8df4a92e368e8..6ea0f9a93b31a0be31621155c2f809329ee132ea 100644
--- a/Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbNormalizeAttributesLabelMapFilter.cxx
@@ -24,7 +24,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbAttributesMapLabelObject.h"
-#include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "otbMinMaxAttributesLabelMapFilter.h"
 #include "otbNormalizeAttributesLabelMapFilter.h"
diff --git a/Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx b/Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx
index cb384d0777f3b9542310b9ac33c9a261b9403fb8..04731d1488b06b2bb536fd5d5818a2cf500c21c8 100644
--- a/Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx
+++ b/Testing/Code/OBIA/otbStatisticsAttributesLabelMapFilterNew.cxx
@@ -18,7 +18,6 @@
 
 
 #include "otbAttributesMapLabelObject.h"
-#include "itkLabelMap.h"
 #include "otbStatisticsAttributesLabelMapFilter.h"
 #include "otbImage.h"
 
diff --git a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
index 7101a715e2f67e5c98bf26993018cf644b287124..07e6c4c45bdaa45aee69365a5b1383ee29d56e3d 100644
--- a/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbVectorDataToLabelMapFilter.cxx
@@ -15,7 +15,6 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkLabelMapToLabelImageFilter.h"
 
 #include "itkTimeProbe.h"
diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
index bc48ead5c62c0ceffcc3ef7ba2a2cde68caf4e16..086d33e8d79b993c41f5b408db5ead412abad624 100644
--- a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
@@ -20,11 +20,8 @@
 #include <iterator>
 
 #include "otbImage.h"
-#include "otbVectorData.h"
 #include "otbRadiometricMomentsImageFunction.h"
-#include "itkListSample.h"
 #include "itkFixedArray.h"
-#include "itkVariableLengthVector.h"
 #include "otbDescriptorsListSampleGenerator.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx b/Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx
index 57623921fc4bb1f272d43211bb2725633b9d5035..8e026ca615303f12f4817c89530701190a08c823 100644
--- a/Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbLabeledSampleLocalizationGenerator.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 #include "otbLabeledSampleLocalizationGenerator.h"
diff --git a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
index 8f808303768ba0b75bafbfacf8372ba92836f530..7ce85c69261ff2beb8a74616404a2857a4d184f9 100644
--- a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
+++ b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
@@ -21,10 +21,8 @@
 #include <iterator>
 
 #include "otbImage.h"
-#include "otbVectorData.h"
 #include "otbRadiometricMomentsImageFunction.h"
 #include "itkListSample.h"
-#include "itkFixedArray.h"
 #include "itkVariableLengthVector.h"
 #include "otbObjectDetectionClassifier.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx b/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx
index c33e4d5d688239f6e7c1b81955bac6a3da1a8598..92d9233ce5c80b44b4e1a8ada43cc3f98271f48c 100644
--- a/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx
+++ b/Testing/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.cxx
@@ -18,7 +18,6 @@
 
 
 #include "otbStandardMetaImageFunctionBuilder.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 
diff --git a/Testing/Code/Projections/otbCompositeTransform.cxx b/Testing/Code/Projections/otbCompositeTransform.cxx
index c5095e72d807adefb51954f04c3d1ffd351fcc1a..787498c187fb6342104d5e30fbe3c0154bf82da0 100644
--- a/Testing/Code/Projections/otbCompositeTransform.cxx
+++ b/Testing/Code/Projections/otbCompositeTransform.cxx
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <iomanip>
 
-#include "itkMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 
diff --git a/Testing/Code/Projections/otbCompositeTransformNew.cxx b/Testing/Code/Projections/otbCompositeTransformNew.cxx
index e51f1d46e9300c698fd34ad0f8922d27af045911..fdb799c9a73123ad4eab56cbd12c4d0accaece46 100644
--- a/Testing/Code/Projections/otbCompositeTransformNew.cxx
+++ b/Testing/Code/Projections/otbCompositeTransformNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include <iostream>
 
 #include "otbCompositeTransform.h"
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
index 4cc8c0356bc21b17c93087cfa668a0be3b826dd4..edf5a90fe0cf957088e5f2860f7b2cb3149ac304 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx
@@ -31,7 +31,6 @@
 #include <iterator>
 #include <stdlib.h>
 
-#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
index fd59e35d63ca92fdf1733db80c3371b18098b334..5569243756fe55b277d86090d0165eadfd0d3198 100644
--- a/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
+++ b/Testing/Code/Projections/otbCreateProjectionWithOTB.cxx
@@ -31,7 +31,6 @@
 #include <iterator>
 #include <stdlib.h>
 
-#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
index 453e22a0ed968f2953dacfef380bd8aa26afec1d..76769005c22faa88529f96bfa28a44d07eae5599 100644
--- a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
+++ b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
index fb42be80817a7cb2572e6cc4673184b335adfe69..19bf9c3a84375059dd69eac64c50b08434338bcf 100644
--- a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
+++ b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterCheckRpcModel.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbCommandLineArgumentParser.h"
-#include "otbMacro.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
diff --git a/Testing/Code/Projections/otbGenericMapProjectionNew.cxx b/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
index 02de3d7198f0d29a4549e284e7eab937e0528a29..71461997176ebfadd29723fc993888b6c4fce16c 100644
--- a/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
+++ b/Testing/Code/Projections/otbGenericMapProjectionNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include <iostream>
 
 #include "otbGenericMapProjection.h"
diff --git a/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx b/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
index 160c74aa8c8fd4603282e396aa85778431b9150f..1d8bdab4a7acabde0c5d022116c677e59e333057 100644
--- a/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
+++ b/Testing/Code/Projections/otbGenericRSResampleImageFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbGenericRSResampleImageFilter.h"
-#include "otbVectorImage.h"
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbGenericRSTransformNew.cxx b/Testing/Code/Projections/otbGenericRSTransformNew.cxx
index 7046a7c449a6e9a4cef501ab3f1ef92d123a5aaf..ed12e7f513db93021b78eaf8bf8915c0a5f13389 100644
--- a/Testing/Code/Projections/otbGenericRSTransformNew.cxx
+++ b/Testing/Code/Projections/otbGenericRSTransformNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include <iostream>
 
 #include "otbGenericRSTransform.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
index 6fa51f05f2b194337e41324e067981d68025675c..6d7ce9328909518a486ab01d79dde6149b3c6723 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "otbMacro.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
index ac3c888f2b7b0c653cd32085cef0ba92d93b891c..f6fed26c349f799ace4ffccfe71fe05359a53dfa 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbMacro.h"
-#include "otbImage.h"
 #include "otbMapProjections.h"
 #include "otbOrthoRectificationFilter.h"
 
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
index 027239c6129f72c97577ddee118cce2c08734903..abfcc206e6197b8159a4ee8ade33f4825f9aa160 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
@@ -22,12 +22,10 @@
 #include <iterator>
 #include <stdlib.h>
 
-#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
-#include "otbInverseSensorModel.h"
 #include "otbStreamingResampleImageFilter.h"
 
 
@@ -35,7 +33,6 @@
 #include "itkResampleImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkChangeInformationImageFilter.h"
 
 #include "otbOrthoRectificationFilter.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
index 056886c6c64e8fd23126bfc016550a15c18011f3..019a590baca5bcc6a0093d677e1b2bd40731af5d 100644
--- a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
@@ -21,12 +21,9 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "otbMacro.h"
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbInverseSensorModel.h"
 #include "otbStreamingResampleImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Testing/Code/Projections/otbRegionProjectionResampler.cxx b/Testing/Code/Projections/otbRegionProjectionResampler.cxx
index 5b5f66a76736dc8b6fe50b3e1f2c2631a683f594..2d30869c1ddcb3a5c86df54640bae93079a1de40 100644
--- a/Testing/Code/Projections/otbRegionProjectionResampler.cxx
+++ b/Testing/Code/Projections/otbRegionProjectionResampler.cxx
@@ -29,7 +29,6 @@
 // iostream is used for general output
 #include <iostream>
 
-#include "otbMacro.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
@@ -41,7 +40,6 @@
 #include "itkResampleImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
-#include "itkLinearInterpolateImageFunction.h"
 #include "itkTranslationTransform.h"
 
 #include "otbInverseSensorModel.h"
diff --git a/Testing/Code/Projections/otbSensorModelsNew.cxx b/Testing/Code/Projections/otbSensorModelsNew.cxx
index 937fa8fe8346dd1f782877a69ac7f6de194b6aaa..0008193438c24abde3027de53f7431b6ce566fd7 100644
--- a/Testing/Code/Projections/otbSensorModelsNew.cxx
+++ b/Testing/Code/Projections/otbSensorModelsNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include <iostream>
 
 #include "otbSensorModelBase.h"
diff --git a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
index 2b0396c951cdfbc84e0502edbc7ad6ce96c9b132..31a6e72a23aedf3d04af33a3efc2db8feed1d215 100644
--- a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
+++ b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
@@ -20,7 +20,6 @@
 
 #include "otbMacro.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbVectorData.h"
@@ -29,7 +28,6 @@
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
 
-#include "otbVectorDataExtractROI.h"
 #include "otbVectorDataProjectionFilter.h"
 
 /*
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
index 02a6a1138c427f1481bc79261b2486162c21469c..8e1e7ae97471a500d026767dd236694d55d22d4b 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilter.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
index 1212ec6cae22b2cecfdfe9f294ae5e27f8a11d8d..ebf6c3563dae55bcf91e504b263d53bc41a3453f 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromGeoToMap.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
index e24c0f957cc79b73ccd6c035a4cfde9b5b4fbfe4..cef91347fceefcafa1e3e5aba1339430cb82deb6 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToGeo.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
index 9c57d190bde5f39946448fbd736af48527e1a915..b762da839b6808494ca727ca8dd98b13985fd068 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToImage.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
index 30c4a4250afacb59c15c07fb6bc82eedf5b496b4..242abb0f871e502acd15d99ae96de1b64518dedc 100644
--- a/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
+++ b/Testing/Code/Projections/otbVectorDataProjectionFilterFromMapToSensor.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbVectorDataProjectionFilter.h"
 #include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbVectorDataTransformFilter.cxx b/Testing/Code/Projections/otbVectorDataTransformFilter.cxx
index 8dcadb633cf3756c3f55c3609f18240c7a4add16..36c5bd5f08195f94b29e9bee3785a3942ef38eff 100644
--- a/Testing/Code/Projections/otbVectorDataTransformFilter.cxx
+++ b/Testing/Code/Projections/otbVectorDataTransformFilter.cxx
@@ -20,7 +20,6 @@
 #include "itkAffineTransform.h"
 
 #include "otbVectorImage.h"
-#include "otbVectorData.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
index 3f9a5cbe0834c293e50887d8bcbd58765bc4824e..54d261440f01a2f345aaa8c7d3b15ca900d03213 100644
--- a/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbAVIMultiChannelRAndGAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
index a45e8f21de1db6a41bff0abea7052a25bdf08703..b90fcec0b78a394e0330f3011bbd775af290a598 100644
--- a/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbAVIRAndGAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbAVIRAndGAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
index bb55df19c6f5ae7d58b4f22fcf48d245e2186408..90aa4402eb3dbc7eed7cd8cecd84c6b63ce1aef0 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionParametersNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include "otbAtmosphericCorrectionParameters.h"
 
 #include <cstdlib>
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 33ce4496f45e6e02328c56e8ccf8f107bdd64922..2e445c070678be188749e46540f94b7dfd7c2bc8 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -19,13 +19,10 @@
 
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include <string>
diff --git a/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx b/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
index 8fea0ba508abef15607f575005f5cb227bf1174c..71120fb7e3a416542e85ffd8c30cea1b641013f5 100644
--- a/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericRadiativeTermsTest.cxx
@@ -19,7 +19,6 @@
 
 #include <fstream>
 
-#include "itkMacro.h"
 #include "otbAtmosphericRadiativeTerms.h"
 #include <cstdlib>
 
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
index d790c5bd33c695078a2122dd5ef4f120be90602a..37b8dc705b9438afd334cec16b25718474ccfaf2 100644
--- a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
+++ b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractor.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbDEMCaracteristicsExtractor.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 
diff --git a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
index efb70d53f15739a3fc4473f6c4ffcc6d4aa181d0..5bf7f99fb0d699d8945f2f7baaabcf5f6bef6640 100644
--- a/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
+++ b/Testing/Code/Radiometry/otbDEMCaracteristicsExtractorNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbDEMCaracteristicsExtractor.h"
-#include "otbImage.h"
 
 int otbDEMCaracteristicsExtractorNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index 37445a18bfc2438697a8d2d69bcf308f63d4473b..416011315f42737235ca7efff34d05a126d4b998 100644
--- a/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbEVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputImage, class TOutputImage, class TFunction>
 int generic_EVIMultiChannelRAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
index a7817729e4d831d08a3796782576ca2d378c3e6c..d523330810d9082121a31d8c2a29a9afee4c0fa5 100644
--- a/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbEVIRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputRImage, class TInputBImage, class TInputNIRImage, class TOutputImage, class TFunction>
 int generic_EVIRAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
index 2384f0aa0f7c17a010cdf3202a5dcb328c0d0ee2..8b6e4d6760b140adf3f26edea18fc9d3ae24dca6 100644
--- a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
+++ b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
@@ -18,7 +18,6 @@
 
 
 #include "itkMacro.h"
-#include "otbAtmosphericCorrectionParameters.h"
 #include "otbSIXSTraits.h"
 #include <fstream>
 #include <cstdlib>
diff --git a/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx b/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
index 4361f8dc29f57cd75cf011373072c313256cb457..52d9cce693846d73aa9e70e4b61208fb748dfa76 100644
--- a/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbGAndRIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbSoilIndicesFunctor.h"
 
 template<class TInputGImage, class TInputRImage, class TOutputImage, class TFunction>
 int generic_GAndRIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
index 43c1e604a36577d5ffb5e867b940cb0364997d8b..4ce7d4e7941f18c1e4c5d36f8e49e19e1d9d98b5 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilter.cxx
@@ -18,10 +18,8 @@
 #include "itkMacro.h"
 
 #include "otbImageToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 
 int otbImageToLuminanceImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
index 1cd9d92d4955a5acb9159a655e83d7e0a9bfd3d7..0f68a9808008ab7577c9491007dace977491715f 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterAuto.cxx
@@ -15,13 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbImageToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 #include "otbMultiChannelExtractROI.h"
 
 //Test the retrieval of parameters from the image metadata
diff --git a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
index 902498a6184e43e4f31524c8e2b8aac6e2875346..f56e6d0ee0b364adeb459cdb54df527a566d641b 100644
--- a/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbImageToLuminanceImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbImageToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 
 int otbImageToLuminanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
index f0590df6def3083cc421848f8cb1a17886030f30..7f4418e309e02fc8870b2cffc2308a1b44fce005 100644
--- a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterAuto.cxx
@@ -15,13 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbImageToReflectanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 #include "otbMultiChannelExtractROI.h"
 
 int otbImageToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
index 7d816c988d3ac8ed32af482410d20eedd6c42ad4..e55cfe7264cc557dd939bfffac1bcbe6b6c06a15 100644
--- a/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbImageToReflectanceImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbImageToReflectanceImageFilter.h"
-#include "otbVectorImage.h"
 
 int otbImageToReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
index 7654496aef993af1db36fd3b9ca910f135379397..a6d513dd5126a0b8c1df2c50febf9f3b55b8edb8 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexBIOTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
index b4789972768fbf7cc591aeac8d07fc87220bb3e9..bbfcd339bf3b816fa9ba2218aa81bf3f6f4c42ff 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexBrightTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
index f98f91c475d6d9c11e62f29e90352650a976ede7..f4004c4fd6ba9215a0152c334f2c7f7be19b2ed3 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIR1Test.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
index 83fa3454835e4523cb536072ca34d7e7ab98ef95..aede24e65005c40e1dbe17561f9123b0a8eff843 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIR2Test.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
index 1cd45af4a2efffae11f2d71506cf391cecb75ebb..eb328340575a85a7451efd3190af70fb8565dbc5 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexMIRTIRTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
index 5402c9471d4f414d40f1d989801e882884dfc501..494ef664ba5b74942b7714a42fd1cfe6f182afe3 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDBBBITest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
index 4d4ffa3e93c7af70ea72a4ec260a3552405ec7e3..109e0e6e691235be722004bb4e3eacfb7b885df3 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDBSITest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
index 07bda88c829deda3537f9e8333b5a53e9ffbb81b..359a832ab21b4ab44f081cc48ecc11a997e5071e 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDSITest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
index 1a1b2de0e6cdd8f89119fdbecf5d8321bf88ee7a..cdd1998b6da2e230c7eca2a2f3172a98658955d6 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDSIVisTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
index 0e36085eae39334af018cb016529e847272702fe..6bde3d56552fffc306d4da0c5b86c3d44503efbb 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNDVITest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
index b1dc6f7f77b1ec3ad307d841c898aba16d45c9c9..06d35fbe900ea77578cd90361d29feb34ce321fc 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexNIRTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
index b2f95b139b74eb7113cf0c487277eaaf2d162432..e528337607c9258fbf5323d0ae0b169e1787ecb8 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexTIRTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx b/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
index 0b10153bdd21057ded1898f0718b35db68e1ec0a..d3f5cf2a888f92ef146a2730e231198464c05579 100644
--- a/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMIndexVisTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx b/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
index 75113c2678f1508a99096a37c2d3c80618f23fe7..9f2ece244da1799a80a5530722fa6b4ddddbeb0a 100644
--- a/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMKernelSpectralRules.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 #include <vector>
diff --git a/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx b/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
index bf48745c59daf3894800f1f196427de940c55121..2ef9455c5542080a0539671ec4ac7d4c711d15d7 100644
--- a/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMLinguisticLabelsTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 
diff --git a/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx b/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
index feb76672c8436a36c849eea1c87f6b1dbec74c80..627028e16a357a52474ef7d17a97d1b9f0b1ec1a 100644
--- a/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMThinCloudTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 #include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx b/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
index 139d74ddb8da42975f553f4d96c2fbdfa1f47092..3a0a2ef406a352f9077b6b3f4f76190ca4fcc513 100644
--- a/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
+++ b/Testing/Code/Radiometry/otbLandsatTMVegetationTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "otbLandsatTMIndices.h"
 #include "otbImage.h"
diff --git a/Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx b/Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx
index e1ebde3b260e140c8ef174260234b965959d33aa..a00be71ce3c7de6bc989e3d9ac79bd174af38b08 100644
--- a/Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToImageImageFilterAuto.cxx
@@ -15,13 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbLuminanceToImageImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 #include "otbMultiChannelExtractROI.h"
 
 //Test the retrieval of parameters from the image metadata
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
index 005964619b0bb128095a513d1f2777c41fef7d12..94a6b0cababba034e38ca9b9af9e5471f97b2c1a 100644
--- a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 
 int otbLuminanceToReflectanceImageFilter(int argc, char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
index 633dec116383f335192efabbc591d3fb9deed7b2..ad45f148cac8d80fd5f97b3cb5ce7e84c9df7c26 100644
--- a/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbLuminanceToReflectanceImageFilterAuto.cxx
@@ -15,14 +15,11 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 #include "otbMultiChannelExtractROI.h"
 
 int otbLuminanceToReflectanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index e6dfe71816e0edb3b142514454585d848991089d..77b3b90c628a80214a64f4738642860544c9331e 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputImage, class TOutputImage, class TFunction>
 int generic_MultiChannelRAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index 284cd0717d9b0795ad23f06ea0ad35d065aa4c86..9d54068d839f348993dcbbfa0d96f784f5641193 100644
--- a/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputImage, class TOutputImage, class TFunction>
 int generic_MultiChannelRAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
index 0174ae6365222bacb873dd0f6fab62100ce2b2a5..ceb51e7e45191c24b4ab5a0c16515f4eb3974d96 100644
--- a/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputRImage, class TInputBImage, class TInputNIRImage, class TOutputImage, class TFunction>
 int generic_RAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
index 7bfaa42127fe274980d540eb83dd5f3d9d05297b..86e508886007b744a4d4db1f4a07a377ab28ec4b 100644
--- a/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputRImage, class TInputNIRImage, class TOutputImage, class TFunction>
 int generic_RAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
index 1ad9654e4d018bd1aa16a6c04948bfe195f693c1..0cb7cca9c83c32bf8fb0fc99c8253b53d6330f27 100644
--- a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
+++ b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
@@ -18,7 +18,6 @@
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbImageMetadataCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"
 #include <vector>
 #include <fstream>
diff --git a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx b/Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx
index f6d143fe9bce0a5c124a4878c3b929be94548cc2..6edea333639882bd6e7259b8ac16dd5bb0fee6d2 100644
--- a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToImageImageFilterAuto.cxx
@@ -15,10 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbReflectanceToImageImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx b/Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx
index c2c0ddada0e0ca8bbc0f17d6c482940cbbd8a19c..218c1f2e23ba3582dad4e975030fbc10fb643f39 100644
--- a/Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToImageImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbReflectanceToImageImageFilter.h"
-#include "otbVectorImage.h"
 
 int otbReflectanceToImageImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx
index e0088841f84ce41367ceeab4808e1d58005f4f2a..4a4ae855fa69eddaf3a8286ffae7b3764e203818 100644
--- a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilter.cxx
@@ -18,10 +18,8 @@
 #include "itkMacro.h"
 
 #include "otbReflectanceToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 
 int otbReflectanceToLuminanceImageFilter(int argc, char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx
index a1c6b2ce8a82c3d70cb3c3953aa3f1eecb500ae5..284076eb020cd718bc4b0c09e276e1da0c99f4b4 100644
--- a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterAuto.cxx
@@ -15,13 +15,10 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbReflectanceToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 #include "otbMultiChannelExtractROI.h"
 
 int otbReflectanceToLuminanceImageFilterAuto(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx
index c5190f347d3b9eba8d1d90fbc778bb5b4330f166..187fb23ba4e20da5b16f0a88dfcc39056ee61d51 100644
--- a/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToLuminanceImageFilterNew.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbReflectanceToLuminanceImageFilter.h"
-#include "otbVectorImage.h"
 
 int otbReflectanceToLuminanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
index 52b304b55919bd2ef930e2aed9489a447a35da3b..dea7fb74d83ebe6228d77f2697d37c7bd96bf5cd 100644
--- a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include <fstream>
 #include <iostream>
@@ -24,12 +23,9 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
 
-#include "itkMetaDataDictionary.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
-#include "otbOpticalImageMetadataInterface.h"
 
 int otbReflectanceToSurfaceReflectanceImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index 37e22343b2ae0e27ac1a919d2b0d0afcf8c7732c..50237227a60b044079bd7459f52b0dacf94fa9cf 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -15,15 +15,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx b/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
index a2e9d9ef586fbb5c765aa18b90e0167a046bc650..63968c86323c61bd5481470d8612522b2d6212cd 100644
--- a/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
+++ b/Testing/Code/Radiometry/otbSIXSTraitsComputeAtmosphericParameters.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbAtmosphericCorrectionParameters.h"
 #include "otbSIXSTraits.h"
 #include <iostream>
 #include <fstream>
diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx b/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx
index ee57f5b23180081ec0c66ef31acf1a764adf993b..6005907d02201ff34f15a57232df3bfa9c8d4d5a 100644
--- a/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx
+++ b/Testing/Code/Radiometry/otbSarParametricMapFunctionTest.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbSarParametricMapFunction.h"
-#include "itkPointSet.h"
 
 int otbSarParametricMapFunctionTest(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx b/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
index f79b92d95baaa5263986def61e04c07cf29e9d4e..1d1f56aa7a3dd5bb4ff7deb08c721f88bd8cd204 100644
--- a/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSarParametricMapFunctionToImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbSarParametricMapFunction.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkPointSet.h"
 
 
 int otbSarParametricMapFunctionToImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
index 662a3e5a92a864ab74368ff3da5876e71184d4f4..479d73a0829a79d60992c6d8725e47eff7709181 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
index 9d11cafe8f2a0dce6cfc1247cc39afddd41328df..4e89140c4c6dc01d125fecb0e7c28f28b2460087 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
index 5b74c360610384d2ec9dd69793a5c4198a6ed94e..d851ca81e7ce377c3d89333d48a0e09d4bdab5bb 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
index b24a64086d762fda1d2eab3721cc3ce15dc488b1..419b02ab6f7aae4cb33592540f3be72a2823f022 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index 80dec5a791b942bec1240b24b774e303e8cabfbd..e4b946fce4ffca0d66df3ce27d6b27215c974933 100644
--- a/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSetASetBMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputImage, class TOutputImage, class TFunction>
 void generic_SetASetBMultiChannelRAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
index 7e024e4c8dd11f7f3e4c1a24cc1f3f2c4aa2b0e6..c6c2f408c5a32da9245591e2e51930ec912457b6 100644
--- a/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbSetASetBRAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 template<class TInputRImage, class TInputNIRImage, class TOutputImage, class TFunction>
 void generic_SetASetBRAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
index 549b33e92e6722bf39d36c85f7179e5aab499f9f..296a8e8d1f2d19209fd4a84a6d3696143749ae96 100644
--- a/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
+++ b/Testing/Code/Radiometry/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.cxx
@@ -15,14 +15,12 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 #include "otbVectorImage.h"
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
 #include "otbAtmosphericRadiativeTerms.h"
 #include <fstream>
diff --git a/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
index aa3a7bfdde1ed29d523fa0a8bbf11cfcecbc17ab..cf52190aa29a6d8861310e95cd7e84060b461109 100644
--- a/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbTSARVIMultiChannelRAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
index b6fa46d4c1ab85c9012af5ea075820c793cffbaf..b22748d71463d72c7f518c7c307a249fc3a70ed4 100644
--- a/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbTSARVIRAndBAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbTSARVIRAndBAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
index 7b1b2671d3b503fa968be1b339c7b920db6982ea..238deae8f195616e0f94e6f6ffad5bb5cd8369e2 100644
--- a/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbWDVIMultiChannelRAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx b/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
index 10ad690fc42357c02b116b1ce6b1351f9023e170..4eabb0de615bb02383a44a26817d51cb9946b344 100644
--- a/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbWDVIRAndNIRVegetationIndexImageFilter.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int otbWDVIRAndNIRVegetationIndexImageFilter(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
index e3ace6ffffa86c6e0d7e2c6c58d26b9db2299f94..ce5b27f12f84ea4e12ced4306b9553465327c9f9 100644
--- a/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbMuellerToReciprocalCovarianceImageFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
index d6810a9c0e3a6085943ad510c55e20eb786e2d0d..5ebd0542bfef432725464fd29de45331967f6025 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairImageFilter.cxx
@@ -17,16 +17,13 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include <typeinfo>
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbSinclairImageFilter.h"
-#include "otbSinclairToCovarianceMatrixFunctor.h"
 #include "otbSinclairToCircularCovarianceMatrixFunctor.h"
 #include "otbSinclairToCoherencyMatrixFunctor.h"
 #include "otbSinclairToMuellerMatrixFunctor.h"
diff --git a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
index 66954b95ba585f645a5cc1fe22f2502ec850866e..c3c8a431f0663605a60a1ce1b38b399d9ff5a31b 100644
--- a/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
+++ b/Testing/Code/SARPolarimetry/otbSinclairReciprocalImageFilter.cxx
@@ -21,11 +21,9 @@
 #include <typeinfo>
 
 #include "otbImage.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbSinclairReciprocalImageFilter.h"
-#include "otbSinclairToReciprocalCovarianceMatrixFunctor.h"
 #include "otbSinclairToReciprocalCircularCovarianceMatrixFunctor.h"
 #include "otbSinclairToReciprocalCoherencyMatrixFunctor.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
index 27d712e15cb14355e2130dccf8a7e503eb404285..fe56c60dd08d0b248711ed0516e829c560e773aa 100644
--- a/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
+++ b/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
@@ -24,7 +24,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkLabelMap.h"
 #include "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
diff --git a/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
index 56dd01466f5b777311049a65f33faa9c67af6b21..2d0dd6b802e41beaf9400312db5376572b415cf9 100644
--- a/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
+++ b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
@@ -20,7 +20,6 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "itkLabelMap.h"
 #include "itkLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
diff --git a/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx b/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx
index a2c48ef58720b00392bc1261660bd116f834a51a..b4cdc56abdcfa74e0bf99eab4c81eed7466792ce 100644
--- a/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx
+++ b/Testing/Code/Segmentation/otbMeanShiftSegmentationFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbMeanShiftSegmentationFilter.h"
-#include "itkMacro.h"
 #include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx b/Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx
index ef9706cd29e26bff6985bd0d2464fe1130fe9424..710b27c650d527e2468afbe90eb0196160802028 100644
--- a/Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx
+++ b/Testing/Code/Segmentation/otbMorphologicalProfilesSegmentationFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "otbMorphologicalProfilesSegmentationFilter.h"
 #include "itkMacro.h"
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx b/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
index a5f576b71482747fbfd6930ff7b57cb2d309b2e7..ce622a15a80a5067b210008e930315d33f33c863 100644
--- a/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
+++ b/Testing/Code/Segmentation/otbOGRLayerStreamStitchingFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "itksys/SystemTools.hxx"
-#include "otbOGRDataSourceWrapper.h"
 
 int otbOGRLayerStreamStitchingFilter(int argc, char * argv[])
 {
diff --git a/Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx b/Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx
index 2cbf316c11a0ef33e88b41c4652530ad9e8d62bd..3bec845b0ec54774d0695ada1df4531b12fc3325 100644
--- a/Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx
+++ b/Testing/Code/Segmentation/otbStreamingImageToOGRLayerSegmentationFilter.cxx
@@ -20,12 +20,10 @@
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
 #include "otbImageFileReader.h"
 
-#include "otbMeanShiftVectorImageFilter.h"
 #include "otbMeanShiftImageFilter.h"
 
 
 #include "otbPersistentImageToOGRDataFilter.h"
-#include "otbPersistentFilterStreamingDecorator.h"
 
 #include "otbOGRDataSourceWrapper.h"
 
diff --git a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
index e1699c2ffd340d6779129407c576b59cc106da51..81bcab5a38ba056de3d4b7cc7400ee9defd3636a 100644
--- a/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericCorrectionsRSRSVMClassifier.cxx
@@ -16,16 +16,13 @@
 
 =========================================================================*/
 
-#include "otbMacro.h"
 
 #include "otbAtmosphericEffects.h"
 #include "otbSatelliteRSR.h"
-#include "otbSpectralResponse.h"
 #include "otbReduceSpectralResponse.h"
 
 #include "otbSVMSampleListModelEstimator.h"
 #include "otbSVMClassifier.h"
-#include "itkListSample.h"
 #include "otbConfusionMatrixCalculator.h"
 
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Testing/Code/Simulation/otbAtmosphericEffects.cxx b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
index 1f45adb92edf45fdb58c8c01cab9b1a26e31a023..ff000b48da47aac5105d728424e14a0da6d8a30b 100644
--- a/Testing/Code/Simulation/otbAtmosphericEffects.cxx
+++ b/Testing/Code/Simulation/otbAtmosphericEffects.cxx
@@ -18,14 +18,12 @@
 
 #include "otbMacro.h"
 
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
 #include "otbAtmosphericEffects.h"
 #include "otbReduceSpectralResponse.h"
 
 #include "otbAtmosphericCorrectionParameters.h"
 #include "otbImageMetadataCorrectionParameters.h"
-#include "otbAtmosphericRadiativeTerms.h"
 
 int otbAtmosphericEffects(int argc, char * argv[])
 {
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
index 6d4efb31cdd137634598e144eb43257d7f9d864c..46e975e88bfb57f5d18dbf98978952c220eff9c6 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
@@ -17,23 +17,19 @@
 =========================================================================*/
 
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorDataFileReader.h"
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "otbSpatialisationFilter.h"
-#include "otbProspectModel.h"
 #include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
 
 #include "otbImageFileReader.h"
-#include "itkListSample.h"
 #include "itkWeightedCentroidKdTreeGenerator.h"
 #include "itkKdTreeBasedKmeansEstimator.h"
 #include "otbKMeansImageClassificationFilter.h"
-#include "itkImageRegionIterator.h"
 
 int otbImageSimulationMethodKMeansClassif(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx b/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
index 18a66ee45dee2066c4d118f12363fc38a573fc45..d92f420b8d62a39fc501a154f63a7a66371a2d36 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
@@ -19,13 +19,11 @@
 //Warning !! the SVM model estimator do not converge in this test !!
 
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorDataFileReader.h"
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "otbSpatialisationFilter.h"
-#include "otbProspectModel.h"
 #include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx b/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
index fece1313b6ad040ddc101b8bc3d13e03bbba92cf..815f22b800731ee99b5587af4f451412a99e2543 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
@@ -17,12 +17,10 @@
 =========================================================================*/
 
 #include "otbVectorImage.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorDataFileReader.h"
 
 #include "otbSpatialisationFilter.h"
-#include "otbProspectModel.h"
 #include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx b/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
index cfe36f960df58b12d6fa0b6ffd958ff3bd39f2c5..11a5c4b8817402bff1f6e3ba98d07af1ae98e0f6 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorDataFileReader.h"
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
-#include "otbProspectModel.h"
 #include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
diff --git a/Testing/Code/Simulation/otbProspectReflTest.cxx b/Testing/Code/Simulation/otbProspectReflTest.cxx
index 309a15cc73a640ec007f9294ec5c946bdcb89852..8857a5b5612f59575d6656b433ca87dafde53bc3 100644
--- a/Testing/Code/Simulation/otbProspectReflTest.cxx
+++ b/Testing/Code/Simulation/otbProspectReflTest.cxx
@@ -19,7 +19,6 @@
 #include "otbMacro.h"
 
 #include "otbProspectModel.h"
-#include "otbLeafParameters.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/Testing/Code/Simulation/otbProspectTransTest.cxx b/Testing/Code/Simulation/otbProspectTransTest.cxx
index 50f1fb5a8102fd6e190429d892770f5fff3def52..ec0e061a7f6a345f20827397813279c91fbf3420 100644
--- a/Testing/Code/Simulation/otbProspectTransTest.cxx
+++ b/Testing/Code/Simulation/otbProspectTransTest.cxx
@@ -19,7 +19,6 @@
 #include "otbMacro.h"
 
 #include "otbProspectModel.h"
-#include "otbLeafParameters.h"
 
 #include <iostream>
 #include <fstream>
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponse.cxx b/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
index 0516dfb25c800d3acfa372d2b74ea79d00c70ed9..1ee3e7fb5a0bab7c4d2d9ae499cacc39bfe4e26b 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponse.cxx
@@ -18,7 +18,6 @@
 
 #include "otbMacro.h"
 
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
 #include "otbReduceSpectralResponse.h"
 
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
index 4e29be444d7ec4fddf736c78a2e7a62ae8589c34..a5677b197b11abb32e666bf175ec288de5f3637c 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.cxx
@@ -18,12 +18,9 @@
 
 #include "otbMacro.h"
 
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
-#include "otbReduceSpectralResponse.h"
 #include "otbReduceSpectralResponseClassifierRAndNIR.h"
 
-#include "otbVegetationIndicesFunctor.h"
 
 int otbReduceSpectralResponseClassifierRAndNIR(int argc, char * argv[])
 {
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
index 8388c4e0c2f4404746bc6b873b181dc8053af656..bc230f43ddd407b653eb1a794b3c146755650300 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseNew.cxx
@@ -18,7 +18,6 @@
 
 #include "otbMacro.h"
 
-#include "otbSpectralResponse.h"
 #include "otbSatelliteRSR.h"
 #include "otbReduceSpectralResponse.h"
 
diff --git a/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx b/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
index a6e88848c135f88e2c99e4e72a1b258e911ddba6..5b7fd0e092520fec7d4f6b3774e2b615c52e94bf 100644
--- a/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
+++ b/Testing/Code/Simulation/otbReduceSpectralResponseSVMClassifier.cxx
@@ -16,15 +16,12 @@
 
 =========================================================================*/
 
-#include "otbMacro.h"
 
 #include "otbSatelliteRSR.h"
-#include "otbSpectralResponse.h"
 #include "otbReduceSpectralResponse.h"
 
 #include "otbSVMSampleListModelEstimator.h"
 #include "otbSVMClassifier.h"
-#include "itkListSample.h"
 #include "otbConfusionMatrixCalculator.h"
 
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Testing/Code/Simulation/otbSailReflHTest.cxx b/Testing/Code/Simulation/otbSailReflHTest.cxx
index 36d0399eda75aca1eb7b315b7a1634ec9879e92f..26987666f7c69de448888ede0e3095db03380dfc 100644
--- a/Testing/Code/Simulation/otbSailReflHTest.cxx
+++ b/Testing/Code/Simulation/otbSailReflHTest.cxx
@@ -18,7 +18,6 @@
 
 #include "otbMacro.h"
 
-#include "otbLeafParameters.h"
 #include "otbSailModel.h"
 #include "otbProspectModel.h"
 
diff --git a/Testing/Code/Simulation/otbSailReflVTest.cxx b/Testing/Code/Simulation/otbSailReflVTest.cxx
index 60b7b8e57a98658d9865dc8db4dbf144dd4c3a24..a3ea77eaf577a63f5f0bed95083c6483197f4dd2 100644
--- a/Testing/Code/Simulation/otbSailReflVTest.cxx
+++ b/Testing/Code/Simulation/otbSailReflVTest.cxx
@@ -18,7 +18,6 @@
 
 #include "otbMacro.h"
 
-#include "otbLeafParameters.h"
 #include "otbSailModel.h"
 #include "otbProspectModel.h"
 
diff --git a/Testing/Code/Simulation/otbSpatialisationTest.cxx b/Testing/Code/Simulation/otbSpatialisationTest.cxx
index e32906c0b73c1c5acfd6fedf49a7e92ebd58b33a..be50e3389335f52ef60b0c7e33b247f85401fa85 100644
--- a/Testing/Code/Simulation/otbSpatialisationTest.cxx
+++ b/Testing/Code/Simulation/otbSpatialisationTest.cxx
@@ -17,10 +17,8 @@
 =========================================================================*/
 
 #include "itkLabelMapToLabelImageFilter.h"
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbSpatialisationFilter.h"
-#include "otbImage.h"
 #include "otbAttributesMapLabelObject.h"
 
 int otbSpatialisationTest(int itkNotUsed(argc), char * argv[])
diff --git a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
index dd39d1a547d21b7bd608a5d39a2744869945c0f3..6539efe8650e444317a47426675bb86100657081 100644
--- a/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
+++ b/Testing/Code/Simulation/otbSpatialisationTestNew.cxx
@@ -20,7 +20,6 @@
 
 
 #include "otbSpatialisationFilter.h"
-#include "otbImage.h"
 #include "otbAttributesMapLabelObject.h"
 
 int otbSpatialisationTestNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
diff --git a/Testing/Code/Simulation/otbSpectralResponse.cxx b/Testing/Code/Simulation/otbSpectralResponse.cxx
index 9bdcd96681420afab83056a4a11b1f8370c2645f..0d442d0bbd8fea08569f4bc56d2fbf33653994f3 100644
--- a/Testing/Code/Simulation/otbSpectralResponse.cxx
+++ b/Testing/Code/Simulation/otbSpectralResponse.cxx
@@ -19,7 +19,6 @@
 #include "otbMacro.h"
 
 #include "otbSpectralResponse.h"
-#include "otbVectorImage.h"
 
 int otbSpectralResponse(int argc, char * argv[])
 {
diff --git a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
index da7f3c105b39b476c20a242d8a6195037e79889d..2df471634775e63abedf84350dfab344eacc5cd4 100644
--- a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
+++ b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
@@ -17,12 +17,10 @@
 =========================================================================*/
 
 #include "otbMacro.h"
-#include "otbVectorImage.h"
 #include "itkImageRegionIterator.h"
 #include "otbSpectralResponse.h"
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
-#include "otbAtmosphericRadiativeTerms.h"
 
 int otbSurfaceReflectanceToReflectanceFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv)[])
 {
diff --git a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
index c799a7e8f3307b41744b58ee55344042b0f674ff..96ae88bce4cd6bf719a717d6a036912c57637d25 100644
--- a/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageListToRCC8GraphFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbRCC8Graph.h"
-#include "otbImage.h"
 #include "otbRCC8VertexBase.h"
 #include "otbImageListToRCC8GraphFilter.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
index 990c902e6ec8d4c291a76ea8f00954d2e92ad859..593c8470eb73cb8ff909ed99cf52dc78fbf8034f 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
@@ -15,9 +15,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
-#include "otbImage.h"
 #include "otbImageList.h"
 #include "otbPolygon.h"
 #include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
index ed38a06ed4bbd69dc56f472ec47b2181edb68d8b..726fc1852b667ad41a750f3980f7fea0b4dcb2cd 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbRCC8Graph.h"
-#include "otbImage.h"
 #include "otbRCC8VertexBase.h"
 #include "otbPolygon.h"
 #include "otbImageMultiSegmentationToRCC8GraphFilter.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx b/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
index 6c3f52ec7835aec7afa95dca270bf1112c05617b..7b3d3df40ddbef2af4f98dfe996779800710cddb 100644
--- a/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageToImageRCC8Calculator.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbImageToImageRCC8Calculator.h"
-#include "otbImage.h"
 #include "otbImageList.h"
 #include "otbImageFileReader.h"
 
diff --git a/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx b/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
index 1f3ff98f613f4a5a7abbf2280d91980b5653b1f1..50edc115121379c8320af40bbd9150dba0b339e3 100644
--- a/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageToImageRCC8CalculatorNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbImageToImageRCC8Calculator.h"
-#include "otbImage.h"
 
 int otbImageToImageRCC8CalculatorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
index 154d624c44f4bd9d3b2a7e7b1e96e9553736620c..b8a401c2b789524e0e3968e40d30d4b2854cbf71 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
index ca7410712a5b9f359aa701862c971a65b85baa41..a3c08260fb3941f21f55fd2305866c3bb84adec5 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbPolygonToPolygonRCC8Calculator.h"
-#include "otbImage.h"
 #include "otbObjectList.h"
 #include "otbImageFileReader.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
index a2571014c62661d5cab726d12a8064a2ad514cb8..a68565e7f93eaa8eb73549661f9474ca26e9a348 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
index d4669547dc018a230cafa0f5cc93c934b3e85cc6..d5cd0bcc0a9a4304f1b3e87cabd0e9e35a4cf49f 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexIterator.h"
 #include "otbRCC8EdgeIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
index ae788dcac1d583e6d742b160f770feca92e34d02..c6b9bef825ae045fe17becd65bc513215e8b87fb 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReaderNew.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileReader.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
index c22cf122ad7c0b3e335519a1fea2b1e47baa5c21..48802208b9f99fb51c59fa1eac4b87cd84fc1424 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileWriter.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
index 3be450762487758389b2c723cb4a26b431c61d9d..d81f32100cf08306adec9674ab2914e4ffda2ddc 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileWriter.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
index 197c541dc92de79f8ee6cba35d822f5f1344ba28..33511b005858367121bbf5782cd8437094727412 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileReader.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
index 7bf0423d3f75a05a362a53cb8c910457a76366a7..3bb2f7a0368f2449083795702c4e3b5c77494325 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexBase.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8VertexBase.h"
 #include "otbPolygon.h"
 #include "otbMacro.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
index 8466fc99468b38ecafbf7aa243f7b39f94fbfd14..abdcc5ae7a423f3ee025b3f99a41a3ff91400835 100644
--- a/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
+++ b/Testing/Code/SpatialReasoning/otbRCC8VertexWithCompacity.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "itkMacro.h"
 #include "otbRCC8VertexWithCompacity.h"
 #include "otbMacro.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
index 5f4af28fbf0cb4429772728468484518d574eb67..98e619e8da30a497d6d2f624fa9906d44d9a1ff6 100644
--- a/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
+++ b/Testing/Code/UtilitiesAdapters/otbRPCSolverAdapterTest.cxx
@@ -21,7 +21,6 @@
 #include "otbGenericRSTransform.h"
 #include "otbGeographicalDistance.h"
 #include "itkEuclideanDistanceMetric.h"
-#include "otbDEMHandler.h"
 #include "otbSensorModelAdapter.h"
 #include "otbRPCSolverAdapter.h"
 
diff --git a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
index ae9d889ed1e90fe0f8978d6d4b6096fb337277d4..5840064ab93453f4e6b51eeefc42f05113e95a39 100644
--- a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
+++ b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
@@ -20,11 +20,8 @@
 #endif
 
 #include "otbWrapperQtWidgetParameterFactory.h"
-#include "otbWrapperEmptyParameter.h"
 #include "otbWrapperNumericalParameter.h"
-#include "otbWrapperChoiceParameter.h"
 #include "otbWrapperStringParameter.h"
-#include "otbWrapperParameterGroup.h"
 
 #include "otbWrapperQtWidgetModel.h"
 
diff --git a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx
index b77cbf3ab40913e233ef189f062bc3a052bd0d3a..cdc15954423b086057a34ae50cd074d5e8e343ed 100644
--- a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx
+++ b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetShowWidget.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include <QtGui>
-#include "otbWrapperApplication.h"
 #include "otbWrapperApplicationRegistry.h"
 #include "otbWrapperQtWidgetView.h"
 #include "otbWrapperQtWidgetProgressReport.h"
diff --git a/Testing/Fa/0000094-PolygonsVectorization.cxx b/Testing/Fa/0000094-PolygonsVectorization.cxx
index b837433c1e8f69c546edf727de290b3edef8befc..2683ba679cb68d945de602faa20a34cc36fd4cf9 100644
--- a/Testing/Fa/0000094-PolygonsVectorization.cxx
+++ b/Testing/Fa/0000094-PolygonsVectorization.cxx
@@ -21,10 +21,8 @@
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
-#include "itkImageRegion.h"
 
 #include "otbPolygon.h"
-#include "otbObjectList.h"
 #include "otbPersistentVectorizationImageFilter.h"
 #include "itkRelabelComponentImageFilter.h"
 #include "itkConnectedComponentImageFilter.h"
diff --git a/Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx b/Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
index a7f25fd3213969f0f9f801ecb1d745bb5c3d5900..53e885835974591435f96e2308326b28d1cca6d0 100644
--- a/Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
+++ b/Testing/Fa/0000209-SVMValidationLinearlySeparableProbEstimation.cxx
@@ -19,7 +19,6 @@
 
 
 #include "itkMacro.h"
-#include "itkListSample.h"
 #include <iostream>
 
 #include "otbSVMSampleListModelEstimator.h"
@@ -30,7 +29,6 @@
 #include "otbSVMClassifier.h"
 #include "otbConfusionMatrixCalculator.h"
 
-#include "otbMath.h"
 
 #include <fstream>
 
diff --git a/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx b/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
index 7a253cb2633d0388ffc1bd4d2d00aecc6253e179..f7db7ee2e799be78c04ce273a7fa85e24e6d447b 100644
--- a/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
+++ b/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 
 #include "itkExtractImageFilter.h"
diff --git a/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx b/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx
index 3088a28940c97994ff4c0d1adb57627d9082dd3c..7061223e9d93da40f600e837153256f687f44fe2 100644
--- a/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx
+++ b/Testing/Fa/0000433-LineSegmentDetector_8b_16b_compare.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbImage.h"
 #include "otbLineSegmentDetector.h"
 
 #include "otbImageFileReader.h"
diff --git a/Testing/Fa/0000436-WrapperInputImage_GetImage.cxx b/Testing/Fa/0000436-WrapperInputImage_GetImage.cxx
index 373d39b4f4fa10fa2ffbdc35a746187af418afbc..d5fb5453c2c577c002763430ba612e10f056ff20 100644
--- a/Testing/Fa/0000436-WrapperInputImage_GetImage.cxx
+++ b/Testing/Fa/0000436-WrapperInputImage_GetImage.cxx
@@ -19,10 +19,8 @@
 #include "otbWrapperInputImageParameter.h"
 
 
-#include "otbImage.h"
 #include "otbLineSegmentDetector.h"
 
-#include "otbImageFileReader.h"
 #include "otbVectorDataFileWriter.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Testing/Fa/00134-feature_extraction.cxx b/Testing/Fa/00134-feature_extraction.cxx
index 23fe1a0ca162a122efb1456e35cadf39d1a6772d..4c51a74531f48dbb0ea8df3fd4273185ef792613 100644
--- a/Testing/Fa/00134-feature_extraction.cxx
+++ b/Testing/Fa/00134-feature_extraction.cxx
@@ -19,17 +19,14 @@
 #pragma warning ( disable : 4786 )
 #endif
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbVectorImage.h"
 #include "otbImageList.h"
 #include "otbImageListToVectorImageFilter.h"
 #include "itkMeanImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
 #include "otbMultiChannelExtractROI.h"
 #include "otbMultiChannelRAndNIRIndexImageFilter.h"
-#include "otbVegetationIndicesFunctor.h"
 
 int main(int itkNotUsed(argc), char* argv[])
 {
diff --git a/Testing/Fa/AlignementsQB.cxx b/Testing/Fa/AlignementsQB.cxx
index cf0f607a9def2e50242f193c57ccc52693f66027..47f20a49f6b7c0c42927a62ce7ed926cc37185de 100644
--- a/Testing/Fa/AlignementsQB.cxx
+++ b/Testing/Fa/AlignementsQB.cxx
@@ -19,7 +19,6 @@
 #include <iostream>
 #include "itkPolyLineParametricPath.h"
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Fa/MapActivation.cxx b/Testing/Fa/MapActivation.cxx
index 151455358a3c1c9da02f2da6118ff1797c1b2802..121fac4f8798900eb03a8885f23ecea10b8c044e 100644
--- a/Testing/Fa/MapActivation.cxx
+++ b/Testing/Fa/MapActivation.cxx
@@ -21,7 +21,6 @@
 #endif
 #include <iostream>
 #include <fstream>
-#include "otbVectorImage.h"
 #include "otbSOMMap.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
@@ -40,7 +39,6 @@
 #include "itkListSample.h"
 
 #include "otbSOMClassifier.h"
-#include "itkVariableLengthVector.h"
 #include "itkMembershipSample.h"
 
 int main(int argc, char* argv[])
diff --git a/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx b/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx
index 3293dcd4689547e8d0852067ff831b1cfa8225c2..4b00e88ba2ab3f103d9d629c5a064bd2c9da3e9c 100644
--- a/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx
+++ b/Testing/Fa/otbVectorDataToLabelImageFilterWithoutReader.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
-#include "otbVectorData.h"
 
 #include "otbVectorDataToLabelImageFilter.h"
 #include "otbStandardOneLineFilterWatcher.h"
diff --git a/Testing/Utilities/ijObjectLabelAttributeValuesTest.cxx b/Testing/Utilities/ijObjectLabelAttributeValuesTest.cxx
index 7af81dbe72f284e0e64dbbd4c32945c000fcddfe..5ee3db0df5e4fd2272d5a3d08542557f607dc935 100644
--- a/Testing/Utilities/ijObjectLabelAttributeValuesTest.cxx
+++ b/Testing/Utilities/ijObjectLabelAttributeValuesTest.cxx
@@ -1,7 +1,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "itkShapeLabelObject.h"
-#include "itkLabelMap.h"
 #include "itkLabelImageToStatisticsLabelMapFilter.h"
 #include "itkSimpleFilterWatcher.h"