diff --git a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
index 25eab600f3dcd631fca35f8aa212bb483d9c35b0..60c6f01e0c6b8ce56702326357a9b19cc4e1a8f1 100644
--- a/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
+++ b/Applications/CartographicDBValidation/otbVectorDataDSValidation.cxx
@@ -21,7 +21,6 @@
 #include "otbWrapperApplicationFactory.h"
 #include "otbWrapperStringListParameter.h"
 
-#include "otbFuzzyDescriptorsModelManager.h"
 
 
 namespace otb
diff --git a/Applications/Classification/otbComputeConfusionMatrix.cxx b/Applications/Classification/otbComputeConfusionMatrix.cxx
index ffaafbaabf36e88466df55cdce42908091081f94..65252ff5c68cfc5e7a3d85fc0f8ff5a835ab55de 100644
--- a/Applications/Classification/otbComputeConfusionMatrix.cxx
+++ b/Applications/Classification/otbComputeConfusionMatrix.cxx
@@ -22,7 +22,6 @@
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "itkImageRegionConstIterator.h"
 
-#include "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 
 
diff --git a/Applications/Classification/otbFusionOfClassifications.cxx b/Applications/Classification/otbFusionOfClassifications.cxx
index 7b9b62c7c601dabf4fc3b94ce5ef9731bab00fc3..848d41b4717055c22ca02edaaf290d9376378c95 100644
--- a/Applications/Classification/otbFusionOfClassifications.cxx
+++ b/Applications/Classification/otbFusionOfClassifications.cxx
@@ -27,7 +27,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "otbImage.h"
 #include "otbImageList.h"
 
 
diff --git a/Applications/Classification/otbKMeansClassification.cxx b/Applications/Classification/otbKMeansClassification.cxx
index 633eec8e8c4a283f456c8938bb258a2a0b97a508..4844205f396898578117369175fc524e8ffc5720 100644
--- a/Applications/Classification/otbKMeansClassification.cxx
+++ b/Applications/Classification/otbKMeansClassification.cxx
@@ -20,7 +20,6 @@
 #include "otbWrapperApplicationFactory.h"
 
 #include "otbVectorImage.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "otbStreamingTraits.h"
 #include "itkImageRegionConstIterator.h"
 #include "itkListSample.h"
diff --git a/Applications/Classification/otbSOMClassification.cxx b/Applications/Classification/otbSOMClassification.cxx
index 2357708832d24393b075adc3d7889d9f6cc49356..aed041c0a697a5f04616074132ff720ffbb945d7 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 "itkImageRegionSplitter.h"
 #include "otbStreamingTraits.h"
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRandomNonRepeatingConstIteratorWithIndex.h"
diff --git a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
index c4617c143f17a101d5e3f829a30cf8f5f89e0efe..58be866b78ba3e0c99a3f9b155e4031b042f9f5e 100644
--- a/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
+++ b/Applications/FeatureExtraction/otbHomologousPointsExtraction.cxx
@@ -30,7 +30,6 @@
 #include "otbMultiToMonoChannelExtractROI.h"
 #include "otbKeyPointSetsMatchingFilter.h"
 
-#include "itkEuclideanDistanceMetric.h"
 #include "otbGenericRSTransform.h"
 #include "otbOGRDataSourceWrapper.h"
 #include "ogrsf_frmts.h"
diff --git a/Applications/Radiometry/otbOpticalCalibration.cxx b/Applications/Radiometry/otbOpticalCalibration.cxx
index 05c4640a744d707199f6138190827e6d0e2d8903..a0406950f76e1117e8f92aa12e5e97ce3ea8a43c 100644
--- a/Applications/Radiometry/otbOpticalCalibration.cxx
+++ b/Applications/Radiometry/otbOpticalCalibration.cxx
@@ -29,7 +29,6 @@
 #include "otbGroundSpacingImageFunction.h"
 #include "vnl/vnl_random.h"
 
-#include "otbOpticalImageMetadataInterfaceFactory.h"
 
 #include <fstream>
 #include <sstream>
diff --git a/Applications/Segmentation/otbHooverCompareSegmentation.cxx b/Applications/Segmentation/otbHooverCompareSegmentation.cxx
index edce4e5afcbd61ed1eaf1ae1de2992b4610f93fe..9b52f3b608a7e280bfa195f29a0272d4bc8de690 100644
--- a/Applications/Segmentation/otbHooverCompareSegmentation.cxx
+++ b/Applications/Segmentation/otbHooverCompareSegmentation.cxx
@@ -22,7 +22,6 @@
 #include "otbHooverInstanceFilter.h"
 #include "otbLabelMapToAttributeImageFilter.h"
 
-#include "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "otbUnaryFunctorImageFilter.h"
 
diff --git a/Applications/Utils/otbColorMapping.cxx b/Applications/Utils/otbColorMapping.cxx
index bb2e7e5f824b933bb87bf86793ac140b6e303462..04d29ca2d74689dd26fdf9595199f9a6b8312308 100644
--- a/Applications/Utils/otbColorMapping.cxx
+++ b/Applications/Utils/otbColorMapping.cxx
@@ -36,7 +36,6 @@
 #include "otbListSampleToHistogramListGenerator.h"
 
 #include "itkVariableLengthVector.h"
-#include "otbObjectList.h"
 
 #include "itkImageRegionConstIterator.h"
 #include "otbUnaryFunctorImageFilter.h"
diff --git a/Applications/Utils/otbConcatenateImages.cxx b/Applications/Utils/otbConcatenateImages.cxx
index 7712d608f45720c0ac8202a498a4f40c2f6a1a73..9d39a839b2adc63419da5d37edf0badf83a26ee2 100644
--- a/Applications/Utils/otbConcatenateImages.cxx
+++ b/Applications/Utils/otbConcatenateImages.cxx
@@ -20,7 +20,6 @@
 
 #include "otbImageListToVectorImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
-#include "otbWrapperTypes.h"
 #include "otbImageList.h"
 
 namespace otb
diff --git a/Applications/Utils/otbMultiResolutionPyramid.cxx b/Applications/Utils/otbMultiResolutionPyramid.cxx
index dc4cef7e9a50ab010f3532c5a24b29b97ef9247f..17b17c5da4560c7e04b456613162caa179ab2b29 100644
--- a/Applications/Utils/otbMultiResolutionPyramid.cxx
+++ b/Applications/Utils/otbMultiResolutionPyramid.cxx
@@ -22,7 +22,6 @@
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkShrinkImageFilter.h"
 
-#include "otbWrapperOutputImageParameter.h"
 
 namespace otb
 {
diff --git a/Applications/Utils/otbSplitImage.cxx b/Applications/Utils/otbSplitImage.cxx
index eac25eaf3c42c0347b885e8f8b9bc1efcdb3a3a6..8a732d68ce109e70038fe42e339d6280068ff8bd 100644
--- a/Applications/Utils/otbSplitImage.cxx
+++ b/Applications/Utils/otbSplitImage.cxx
@@ -17,7 +17,6 @@
  =========================================================================*/
 #include "otbWrapperApplication.h"
 #include "otbWrapperApplicationFactory.h"
-#include "otbWrapperOutputImageParameter.h"
 
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Code/ApplicationEngine/otbWrapperApplication.h b/Code/ApplicationEngine/otbWrapperApplication.h
index 24d2e1f3f6da76312db2e775f1bd35e54969f86f..1f3da1b96612f81c7f2f28e759aad79b7767ba55 100644
--- a/Code/ApplicationEngine/otbWrapperApplication.h
+++ b/Code/ApplicationEngine/otbWrapperApplication.h
@@ -20,7 +20,6 @@
 
 #include <string>
 #include "otbMacro.h"
-#include "itkObjectFactory.h"
 #include "otbWrapperTypes.h"
 #include "otbWrapperTags.h"
 #include "otbWrapperParameterGroup.h"
diff --git a/Code/BasicFilters/otbFastICAImageFilter.h b/Code/BasicFilters/otbFastICAImageFilter.h
index 69cec68b74766b1ba6c148075353f0b1732016d3..284be55bb19773b1d27021741869506ef0388aff 100644
--- a/Code/BasicFilters/otbFastICAImageFilter.h
+++ b/Code/BasicFilters/otbFastICAImageFilter.h
@@ -20,7 +20,6 @@
 
 #include "itkImageToImageFilter.h"
 #include "otbPCAImageFilter.h"
-#include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
index 61f47cf0f082467d9a609e9e6357cb4fed1e7abf..50b76a53c6568f6c2e7ec694c1c232ce48e73b27 100644
--- a/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
+++ b/Code/BasicFilters/otbLabelObjectOpeningMuParserFilter.h
@@ -29,7 +29,6 @@
 
 #include "itkArray.h"
 
-#include "otbMacro.h"
 
 
 #include "itkInPlaceLabelMapFilter.h"
diff --git a/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h b/Code/BasicFilters/otbListSampleToVariableDimensionHistogramGenerator.h
index edf9987d9aa19439cedc5b38d01446ffa47c09c4..c2db6c0fb83df9fd80176a9096e8159fdc04e888 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 "itkNumericTraits.h"
 
 namespace otb {
 
diff --git a/Code/BasicFilters/otbMNFImageFilter.h b/Code/BasicFilters/otbMNFImageFilter.h
index 5007c0a0ae62b7af47b9cfd0d0e4af96468ebccb..40bc975872908ef8ac5d360d47dc4405fc63dfe5 100644
--- a/Code/BasicFilters/otbMNFImageFilter.h
+++ b/Code/BasicFilters/otbMNFImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbMNFImageFilter_h
 #define __otbMNFImageFilter_h
 
-#include "itkImageToImageFilter.h"
 #include "otbMatrixImageFilter.h"
 #include "otbPCAImageFilter.h"
 
diff --git a/Code/BasicFilters/otbMaskMuParserFilter.h b/Code/BasicFilters/otbMaskMuParserFilter.h
index 9f2b108329bd3d97d85c4620f963aebd046841c7..5135b4726ff0b1dc9a2e9ddc0d98343d9d3c3737 100644
--- a/Code/BasicFilters/otbMaskMuParserFilter.h
+++ b/Code/BasicFilters/otbMaskMuParserFilter.h
@@ -30,7 +30,6 @@
 
 #include "itkArray.h"
 
-#include "otbMacro.h"
 
 #include "otbMaskMuParserFunctor.h"
 
diff --git a/Code/BasicFilters/otbMaskMuParserFunctor.h b/Code/BasicFilters/otbMaskMuParserFunctor.h
index fa815cedfeea02f3e6ce4479c6349b278510596a..f3a669dae90a7b6205f003fb7252985f12311a4e 100644
--- a/Code/BasicFilters/otbMaskMuParserFunctor.h
+++ b/Code/BasicFilters/otbMaskMuParserFunctor.h
@@ -26,7 +26,6 @@
 #include "otbMacro.h"
 
 
-#include "itkObjectFactory.h"
 
 #include "otbBinarySpectralAngleFunctor.h"
 
diff --git a/Code/BasicFilters/otbOBIAMuParserFunctor.h b/Code/BasicFilters/otbOBIAMuParserFunctor.h
index 022f03c1c56d8c10a7f8611c27ca6ef1790a3e0e..c3c731fc0b67e08830c5f790da7e64d5a40f714a 100644
--- a/Code/BasicFilters/otbOBIAMuParserFunctor.h
+++ b/Code/BasicFilters/otbOBIAMuParserFunctor.h
@@ -26,7 +26,6 @@
 #include "otbMacro.h"
 
 
-#include "itkObjectFactory.h"
 
 
 namespace otb
diff --git a/Code/BasicFilters/otbPCAImageFilter.h b/Code/BasicFilters/otbPCAImageFilter.h
index e0e10bb8140baa08c102ef4c5e0cb8428418f118..0577ef7c532b457dc3b6dbcaf667ba624b41ddb1 100644
--- a/Code/BasicFilters/otbPCAImageFilter.h
+++ b/Code/BasicFilters/otbPCAImageFilter.h
@@ -19,7 +19,6 @@
 #define __otbPCAImageFilter_h
 
 #include "otbMacro.h"
-#include "otbStreamingStatisticsVectorImageFilter.h"
 #include "otbMatrixImageFilter.h"
 #include "otbNormalizeVectorImageFilter.h"
 
diff --git a/Code/BasicFilters/otbStreamingCompareImageFilter.txx b/Code/BasicFilters/otbStreamingCompareImageFilter.txx
index f6a37f73cc57f16c10443112c6a165dc0db719a3..9b6fedc24354f101e14a17c6eda4fa46272261ef 100644
--- a/Code/BasicFilters/otbStreamingCompareImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingCompareImageFilter.txx
@@ -20,7 +20,6 @@
 #include "otbStreamingCompareImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
index d154e276391d8f65c2a28737efeac62552a61a5f..a4e8de15647b85f32d642ebcbbd01ccb626fa069 100644
--- a/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
index 012a902fe6cb4e5d124cbda82cbcd41036f43273..d0acce8c329ab76568c32872671fd701162efef6 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -22,7 +22,6 @@
 #define __otbStreamingMatrixTransposeMatrixImageFilter_h
 
 #include "otbPersistentImageFilter.h"
-#include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "otbStreamingTraits.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx b/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
index 1a2ac0000f71fea4077d4efad4dcf97aef8765bc..5dabf41b699e197088a4c4c9689b29b3264dd547 100644
--- a/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingMinMaxImageFilter.txx
@@ -24,7 +24,6 @@ for details.
 
 #include <algorithm>
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
index 4e115d4e976b159ee8f7e8fc44c219bab2d9ee82..86ef331bca760c87ef33b158715e0c1351e3265e 100644
--- a/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.h b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
index bccbf639075d5447feb9763e4c27a9946fb17f45..5cd4ee3d00d8c5106b630da261d285b6fe3d55ee 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.h
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbStreamingShrinkImageFilter_h
 #define __otbStreamingShrinkImageFilter_h
 
-#include "itkImageToImageFilter.h"
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
index d00cb208ba6f3dba70443eb82e8aa5bc57bca332..defddfcdc37c0fcfa9d98e53be027c2ba26d08b6 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
@@ -23,7 +23,6 @@ for details.
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
index 8d3d50d4160745983dfd692ad73b094140752c26..756440aac7d83c2671707cdd4b803abeb443c5d8 100644
--- a/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsMapFromLabelImageFilter.txx
@@ -24,7 +24,6 @@ for details.
 
 #include "itkInputDataObjectIterator.h"
 #include "itkImageRegionIterator.h"
-#include "itkNumericTraits.h"
 #include "itkProgressReporter.h"
 #include "otbMacro.h"
 
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
index 372974a65112b76359ed2152f08d0e60fe0023b2..de4082d2d190fabbd41915676808f9c21d31904f 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
index 4bae2b9c6d9a8a2de69b81754a1a746dc693f9ea..ebfb30c2fd04131965a611d9c603bdf08310a3ee 100644
--- a/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToMatrixImageFilter.h
@@ -23,7 +23,6 @@
 
 #include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
-#include "itkArray.h"
 #include "itkSimpleDataObjectDecorator.h"
 #include "itkImageRegionSplitter.h"
 #include "itkVariableSizeMatrix.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
index 876a3a1645d75d84ccf369bf3c24234ce0ab52c7..b64f4b4ef9bdae0cce3337ebb87395e1f97f81a8 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageBlackmanFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
index 1b92fb5e48badcb31d0b6489a7a9cf5ab2d25b08..397f1f1a02e54ca66e10e9afc8efa927cfafd264 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageCosineFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
index ec2595b08956b31b0c082d4325cd75e43a7c9e16..1e2c4e31b06fc3b6bbbc3f576a6726465138f20a 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageGaussianFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
index c980915f2a5261903928dd7fb2c168682ed5cac7..0365397b18447d67480f9ae2351979cc72c6e53e 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageHammingFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
index 754b51b6bd8fc2f7aa4194733ba0f24d26707193..7a3ffe2efe6cef1801b0fbbdaa9db41d731c7413 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageLanczosFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
index fe65c7f936ca3cfe69971b1f20309d0330e6eeb1..bd891004cb04065b415b9a0824a77e50a6c7ce5b 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
@@ -19,7 +19,6 @@
 #define __otbWindowedSincInterpolateImageWelchFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
-#include "otbMath.h"
 #include "vnl/vnl_math.h"
 
 namespace otb
diff --git a/Code/Common/otbDataNodeVectorDataFunction.h b/Code/Common/otbDataNodeVectorDataFunction.h
index 122b0f006b1d8654514c3a312a21aff69836945b..a25fff2e54cb423ec8544fc9a99d03f6393bdbcf 100644
--- a/Code/Common/otbDataNodeVectorDataFunction.h
+++ b/Code/Common/otbDataNodeVectorDataFunction.h
@@ -19,7 +19,6 @@
 #define __otbDataNodeVectorDataFunction_h
 
 #include "otbDataNodeFunctionBase.h"
-#include "otbVectorData.h"
 #include "otbVectorDataProperties.h"
 
 
diff --git a/Code/Common/otbDrawLineSpatialObjectFilter.h b/Code/Common/otbDrawLineSpatialObjectFilter.h
index af303497fcf1d1c6e3fbc9f1d459ab5199ae2c0e..9a71e394bf0578b762e1d0ffcfa0f16e460fb670 100644
--- a/Code/Common/otbDrawLineSpatialObjectFilter.h
+++ b/Code/Common/otbDrawLineSpatialObjectFilter.h
@@ -19,7 +19,6 @@
 #define __otbDrawLineSpatialObjectFilter_h
 
 #include "itkSpatialObjectToImageFilter.h"
-#include "otbLineSpatialObjectList.h"
 #include "otbDrawLineSpatialObjectListFilter.h"
 
 //#include <list>
diff --git a/Code/Common/otbGISTable.h b/Code/Common/otbGISTable.h
index 7663e34e54aec651a6ddb447fd75d8b3b5fe56f5..9a0be97318d82ee902e51868d1374bbc9fe8d60b 100644
--- a/Code/Common/otbGISTable.h
+++ b/Code/Common/otbGISTable.h
@@ -18,7 +18,6 @@
 #ifndef __otbGISTable_h
 #define __otbGISTable_h
 
-#include "itkObjectFactory.h"
 #include "itkPoint.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
diff --git a/Code/Common/otbGISTableToLabelMapFilter.h b/Code/Common/otbGISTableToLabelMapFilter.h
index d4cbb41adb3b37f5e96e3130791c61f9878b6047..2f63641f1fa3a024b49175a560404588fe492009 100644
--- a/Code/Common/otbGISTableToLabelMapFilter.h
+++ b/Code/Common/otbGISTableToLabelMapFilter.h
@@ -19,7 +19,6 @@
 #define __otbGISTableToLabelMapFilter_h
 
 //#include "itkImageToImageFilter.h"
-#include "otbLabelMapSource.h"
 //include "otbLabelMap.h"
 #include "otbVectorData.h"
 #include "otbGISTableToVectorDataFilter.h"
diff --git a/Code/Common/otbGISTableToVectorDataFilter.h b/Code/Common/otbGISTableToVectorDataFilter.h
index a918c06214703d4cda7ccd1191a325e33694761c..5b1ae21987fbdae79fb27df4a4baa0c5a75d88ce 100644
--- a/Code/Common/otbGISTableToVectorDataFilter.h
+++ b/Code/Common/otbGISTableToVectorDataFilter.h
@@ -19,7 +19,6 @@
 #define __otbGISTableToVectorDataFilter_h
 
 //#include "itkImageToImageFilter.h"
-#include "otbVectorDataSource.h"
 #include "otbGISTable.h"
 #include "otbVectorDataFileReader.h"
 #include "otbOGRVectorDataIO.h"
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Code/Common/otbPointSetAndValuesFunction.h
index 2bd80fa39ff567783518c0514fe720f535fb2dce..d5cdad7d69941df53f453dc220fefa9e8f0fa101 100644
--- a/Code/Common/otbPointSetAndValuesFunction.h
+++ b/Code/Common/otbPointSetAndValuesFunction.h
@@ -19,7 +19,6 @@
 #define __otbPointSetAndValuesFunction_h
 
 #include "itkFunctionBase.h"
-#include "itkIndex.h"
 #include "itkContinuousIndex.h"
 #include "itkVectorContainer.h"
 #include "itkPointSet.h"
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Code/Common/otbPolyLineImageIterator.h
index df68be6a9bc4d2abeb5095945e3696e2a7c79be3..004f20e71fb910b3da20c51402144563c09c6832 100644
--- a/Code/Common/otbPolyLineImageIterator.h
+++ b/Code/Common/otbPolyLineImageIterator.h
@@ -18,7 +18,6 @@
 #ifndef __otbPolyLineImageIterator_h
 #define __otbPolyLineImageIterator_h
 
-#include "itkImage.h"
 #include "otbPolyLineImageConstIterator.h"
 
 namespace otb
diff --git a/Code/Common/otbRemoteSensingRegion.h b/Code/Common/otbRemoteSensingRegion.h
index baaa5931e4b0d466c254579ce0bf827e64381472..55d509f0f8d534d884a56df2f4f8e7bde8441b27 100644
--- a/Code/Common/otbRemoteSensingRegion.h
+++ b/Code/Common/otbRemoteSensingRegion.h
@@ -22,7 +22,6 @@
 #include <iomanip>
 
 
-#include "itkContinuousIndex.h"
 #include "otbImageKeywordlist.h"
 #include "itkImageRegion.h"
 
diff --git a/Code/Common/otbStreamingManager.h b/Code/Common/otbStreamingManager.h
index e6976acb7a3868cc15863e2bbc2947124092692c..10345733a859be2198c688e842c113fed1c9c0e0 100644
--- a/Code/Common/otbStreamingManager.h
+++ b/Code/Common/otbStreamingManager.h
@@ -20,7 +20,6 @@
 
 #include "otbMacro.h"
 
-#include "itkObject.h"
 #include "itkDataObject.h"
 #include "itkImageRegionSplitterBase.h"
 #include "otbPipelineMemoryPrintCalculator.h"
diff --git a/Code/Common/otbStreamingManager.txx b/Code/Common/otbStreamingManager.txx
index 709ddddb056d4cb5b649264e6ce0ff815b0c3b86..cf60ff6bcb0c338a22d48af1c4bdef850371391c 100644
--- a/Code/Common/otbStreamingManager.txx
+++ b/Code/Common/otbStreamingManager.txx
@@ -19,7 +19,6 @@
 #define __otbStreamingManager_txx
 
 #include "otbStreamingManager.h"
-#include "otbConfigure.h"
 #include "otbConfigurationFile.h"
 #include "itkExtractImageFilter.h"
 
diff --git a/Code/Common/otbStreamingTraits.h b/Code/Common/otbStreamingTraits.h
index 9972cf40a36a77f69bcc3600f956ba57b771e7df..dba7f016eef69ae6bb90aa1a7b1f14324810a862 100644
--- a/Code/Common/otbStreamingTraits.h
+++ b/Code/Common/otbStreamingTraits.h
@@ -20,7 +20,6 @@
 
 #include "otbMacro.h"
 
-#include "itkInterpolateImageFunction.h"
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkImageRegionSplitter.h"
diff --git a/Code/Common/otbStreamingTraits.txx b/Code/Common/otbStreamingTraits.txx
index a57ae171434b721fea7d63004755fe693440be48..57c8555fe7afc95388013567d0cab37f83c09511 100644
--- a/Code/Common/otbStreamingTraits.txx
+++ b/Code/Common/otbStreamingTraits.txx
@@ -21,10 +21,8 @@
 #include <boost/cstdint.hpp>
 
 #include "otbStreamingTraits.h"
-#include "otbConfigure.h"
 #include "otbConfigurationFile.h"
 
-#include "itkBSplineInterpolateImageFunction.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 
 namespace otb
diff --git a/Code/Common/otbVariableLengthVectorConverter.h b/Code/Common/otbVariableLengthVectorConverter.h
index 0cc709e3673d1b0b7bb1ba1f247ed4e7d16805b0..7497bdb57fd126e107f4987480a6230b6d6c79d7 100644
--- a/Code/Common/otbVariableLengthVectorConverter.h
+++ b/Code/Common/otbVariableLengthVectorConverter.h
@@ -20,7 +20,6 @@
 
 #include "itkProcessObject.h"
 #include "itkVariableLengthVector.h"
-#include "itkMacro.h"
 #include "itkFixedArray.h"
 #include "itkHistogram.h"
 #include "itkSmartPointer.h"
diff --git a/Code/Common/otbVectorData.h b/Code/Common/otbVectorData.h
index 2189e0c2e888bec97d044b9564b77510ca45646d..51bc331f70e628c6165c93ba5b858fbc855b096b 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 "itkPoint.h"
 
 namespace otb
 {
diff --git a/Code/DisparityMap/otbNCCRegistrationFunction.h b/Code/DisparityMap/otbNCCRegistrationFunction.h
index 319a6c203ef4432bc5a5cb9dfca9bdbda2db585b..d2a7d0f0a77daccbcd55e12679e82e53cfbbe378 100644
--- a/Code/DisparityMap/otbNCCRegistrationFunction.h
+++ b/Code/DisparityMap/otbNCCRegistrationFunction.h
@@ -23,7 +23,6 @@
 
 #include "itkPDEDeformableRegistrationFunction.h"
 #include "itkPoint.h"
-#include "itkInterpolateImageFunction.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkCentralDifferenceImageFunction.h"
 
diff --git a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
index aef57cabe6123156a0f8b01631c91e436dff7b7e..4a1888427faf1d0fc616d0e49d8f6a02f84b12c7 100644
--- a/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
+++ b/Code/DisparityMap/otbPixelWiseBlockMatchingImageFilter.txx
@@ -19,7 +19,6 @@
 #define __otbPixelWiseBlockMatchingImageFilter_txx
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
-#include "itkImageRegionIterator.h"
 #include "itkProgressReporter.h"
 #include "itkConstantBoundaryCondition.h"
 
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
index 07aa705ce3b92d9664af583877fecfee46eb7b06..105a826280cd26b1a0245754f3940cd8506787e3 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
@@ -20,7 +20,6 @@
 #define __otbForwardFourierMellinTransformImageFilter_h
 
 #include "otbImage.h"
-#include "itkImageToImageFilter.h"
 #include "itkVnlForwardFFTImageFilter.h"
 #include "otbLogPolarTransform.h"
 #include "itkResampleImageFilter.h"
diff --git a/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx b/Code/FeatureExtraction/otbFourierMellinDescriptorsImageFunction.txx
index 1b8b68572624d3ced680ef2cba701edf252f41f1..fe457666e1124f6706bb2e3f1f8a2cb503afe26f 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 "otbMath.h"
 
 namespace otb
 {
diff --git a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
index 47952bdbf94fb6257305bc17d6fa0f219f8857b3..77b9659d8a7847a67f491597cee2b8147a2115de 100644
--- a/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineCorrelationDetectorImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbLineCorrelationDetectorImageFilter_h
 #define __otbLineCorrelationDetectorImageFilter_h
 
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbLineDetectorImageFilterBase.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
index 903219e7d06144c883d39d83881e4341e4c5285b..acf17df14e1c5130c17a04197fa8f99fdfe08a99 100644
--- a/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
+++ b/Code/FeatureExtraction/otbLineRatioDetectorImageFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbLineRatioDetectorImageFilter_h
 #define __otbLineRatioDetectorImageFilter_h
 
-#include "itkLinearInterpolateImageFunction.h"
 #include "otbLineDetectorImageFilterBase.h"
 
 namespace otb
diff --git a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
index c91872e76c988c3ba3a81a66ef5394232d80d187..4d729c653b3f16d3c97417c6cfc462ca7d5a778a 100644
--- a/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
+++ b/Code/FeatureExtraction/otbLocalHistogramImageFunction.txx
@@ -20,7 +20,6 @@
 
 #include "otbLocalHistogramImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
-#include "itkMacro.h"
 #include "itkExtractImageFilter.h"
 #include "otbMath.h"
 
diff --git a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
index 39361f1d64e2fcdc2bf8ff67c6299166288785e0..251efe9828e4870f857c5f93a3cf113ea25e1ee9 100644
--- a/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRegionImageToRectangularPathListFilter.txx
@@ -28,7 +28,6 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkPathIterator.h"
-#include "itkNumericTraits.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "otbMath.h"
 #include "itkNeighborhoodBinaryThresholdImageFunction.h"
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Code/FeatureExtraction/otbRoadExtractionFilter.h
index 8ba41d4f04fe3a688db838108d62c8dd613db3a0..5a73f1e064ef8cd8a53f52f07fd4f98b8002af6c 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.h
@@ -18,7 +18,6 @@
 #ifndef __otbRoadExtractionFilter_h
 #define __otbRoadExtractionFilter_h
 
-#include "itkGradientRecursiveGaussianImageFilter.h"
 
 #include "otbVectorImage.h"
 #include "otbSpectralAngleDistanceImageFilter.h"
diff --git a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h b/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
index b8c4bf515beeb2ae10094f9e7671c2aa5ab20049..15ac07bcdd9990721eb96b31aad7604594141f7a 100644
--- a/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
+++ b/Code/FeatureExtraction/otbStreamingLineSegmentDetector.h
@@ -31,7 +31,6 @@
 
 #include "otbLineSegmentDetector.h"
 
-#include "otbPersistentImageFilter.h"
 #include "otbPersistentFilterStreamingDecorator.h"
 #include "otbPersistentImageToVectorDataFilter.h"
 
diff --git a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
index 3293eab78fa45f5fb5de3e61223fde90f0a18ff3..dfa8e789c37692063948301d69d2aed151cda8c2 100644
--- a/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
+++ b/Code/FeatureExtraction/otbUrbanAreaDetectionImageFilter.h
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbWaterIndicesFunctor.h"
 #include "otbMultiChannelRAndGAndNIRIndexImageFilter.h"
-#include "itkImageToImageFilter.h"
 #include "itkBinaryErodeImageFilter.h"
 #include "itkBinaryDilateImageFilter.h"
 #include "itkBinaryBallStructuringElement.h"
diff --git a/Code/Fuzzy/otbJointMassOfBeliefFilter.h b/Code/Fuzzy/otbJointMassOfBeliefFilter.h
index 8c5a7df7485debc5b9d6686d6b3a2321457f1a68..d6b4b9b36a6e4e09f2458ba3cbcfaa98071b6df7 100644
--- a/Code/Fuzzy/otbJointMassOfBeliefFilter.h
+++ b/Code/Fuzzy/otbJointMassOfBeliefFilter.h
@@ -19,7 +19,6 @@
 #define __otbJointMassOfBeliefFilter_h
 
 #include "itkProcessObject.h"
-#include "itkNumericTraits.h"
 
 namespace otb
 {
diff --git a/Code/Fuzzy/otbStandardDSCostFunction.h b/Code/Fuzzy/otbStandardDSCostFunction.h
index 7f6981204bdebdc34c6dce6252e04797411933f9..8403a731198112db27cac465659274e1baeb79e3 100644
--- a/Code/Fuzzy/otbStandardDSCostFunction.h
+++ b/Code/Fuzzy/otbStandardDSCostFunction.h
@@ -21,7 +21,6 @@
 #include "itkSingleValuedCostFunction.h"
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
-#include "otbFuzzyDescriptorsModelManager.h"
 
 namespace otb
 {
diff --git a/Code/IO/otbCoordinateToName.h b/Code/IO/otbCoordinateToName.h
index 1be8876ea30daff226979d144b6c25c4f2157225..ffbd07877c22dced04f0161bacf87a63544405b2 100644
--- a/Code/IO/otbCoordinateToName.h
+++ b/Code/IO/otbCoordinateToName.h
@@ -18,7 +18,6 @@
 #ifndef __otbCoordinateToName_h
 #define __otbCoordinateToName_h
 
-#include "itkObjectFactory.h"
 #include "itkPoint.h"
 #include "itkMultiThreader.h"
 #include "otbCurlHelperInterface.h"
diff --git a/Code/IO/otbImageSeriesFileReader.h b/Code/IO/otbImageSeriesFileReader.h
index 2a245bd99f66923c04f5251feee1eac70e4528d6..7e809d5baec1319047f656a57cbab7f081d66197 100644
--- a/Code/IO/otbImageSeriesFileReader.h
+++ b/Code/IO/otbImageSeriesFileReader.h
@@ -23,7 +23,6 @@
 
 #include "otbImageSeriesFileReaderBase.h"
 
-#include "otbVectorImage.h"
 #include "otbObjectList.h"
 
 #include "otbExtractROI.h"
diff --git a/Code/IO/otbImageSeriesFileReaderBase.h b/Code/IO/otbImageSeriesFileReaderBase.h
index a19c44c2e96b5ffb809c86dd78cdfb315560a244..69b1006bdf44e656a2c9e4ebde5c5b5517ec9d3f 100644
--- a/Code/IO/otbImageSeriesFileReaderBase.h
+++ b/Code/IO/otbImageSeriesFileReaderBase.h
@@ -30,7 +30,6 @@
 #include "otbImage.h"
 #include "otbVectorImage.h"
 
-#include "otbImageList.h"
 #include "otbImageListSource.h"
 #include "otbImageFileReader.h"
 
diff --git a/Code/IO/otbOpticalImageMetadataInterface.h b/Code/IO/otbOpticalImageMetadataInterface.h
index 0429bce83ea862bbe5557786991eddaa01515ea6..df6972ae511d0182590d4439e50141b958ab80ab 100644
--- a/Code/IO/otbOpticalImageMetadataInterface.h
+++ b/Code/IO/otbOpticalImageMetadataInterface.h
@@ -20,7 +20,6 @@
 
 #include <string>
 
-#include "otbMetaDataKey.h"
 #include "otbImageMetadataInterfaceBase.h"
 #include "otbFilterFunctionValues.h"
 #include "otbObjectList.h"
diff --git a/Code/IO/otbPlaceNameToLonLat.h b/Code/IO/otbPlaceNameToLonLat.h
index f6c0a80996b2099acb41f0ef1a83169c612ad90f..6debb114649f4e59e66aacb095a6616cf838d340 100644
--- a/Code/IO/otbPlaceNameToLonLat.h
+++ b/Code/IO/otbPlaceNameToLonLat.h
@@ -18,7 +18,6 @@
 #ifndef __otbPlaceNameToLonLat_h
 #define __otbPlaceNameToLonLat_h
 
-#include "itkObjectFactory.h"
 #include "otbCurlHelperInterface.h"
 
 namespace otb
diff --git a/Code/IO/otbSarImageMetadataInterface.h b/Code/IO/otbSarImageMetadataInterface.h
index 5693e5ce48a6b279b48ae8fd6d945dbb6bccd07c..21f6ef718a50817a34f5c4ae6284d47e7e793922 100644
--- a/Code/IO/otbSarImageMetadataInterface.h
+++ b/Code/IO/otbSarImageMetadataInterface.h
@@ -20,7 +20,6 @@
 
 #include <string>
 
-#include "otbMetaDataKey.h"
 #include "otbImageMetadataInterfaceBase.h"
 #include "itkPointSet.h"
 
diff --git a/Code/IO/otbTerraSarImageMetadataInterface.h b/Code/IO/otbTerraSarImageMetadataInterface.h
index 633cd2a5b5dbba9a7da4788d83d8a921df7405ca..b26addf14b73361b0f03342e33fd67276bc3bd56 100644
--- a/Code/IO/otbTerraSarImageMetadataInterface.h
+++ b/Code/IO/otbTerraSarImageMetadataInterface.h
@@ -22,7 +22,6 @@
 #include <string>
 
 #include "otbSarImageMetadataInterface.h"
-#include "otbMetaDataKey.h"
 #include "itkImageBase.h"
 
 namespace otb
diff --git a/Code/IO/otbWavelengthSpectralBands.h b/Code/IO/otbWavelengthSpectralBands.h
index 0931d623609d8d63f2e72bc6c2b9c41b3c8a39eb..e4fccea2a4cec54b966a8652966f123285ac6b04 100644
--- a/Code/IO/otbWavelengthSpectralBands.h
+++ b/Code/IO/otbWavelengthSpectralBands.h
@@ -18,7 +18,6 @@
 #ifndef __otbWavelengthSpectralBands_h
 #define __otbWavelengthSpectralBands_h
 
-#include "itkObjectFactory.h"
 #include "otbMacro.h"
 #include "otbObjectList.h"
 #include "otbFilterFunctionValues.h"
diff --git a/Code/Learning/otbConfusionMatrixCalculator.h b/Code/Learning/otbConfusionMatrixCalculator.h
index 6cc43a2c9d792ba6f281942ee0659787673dc5e3..178a1609fdf4277172c139e13095757b020051c3 100644
--- a/Code/Learning/otbConfusionMatrixCalculator.h
+++ b/Code/Learning/otbConfusionMatrixCalculator.h
@@ -20,7 +20,6 @@
 #define __otbConfusionMatrixCalculator_h
 
 #include "otbMacro.h"
-#include "itkObjectFactory.h"
 #include "otbConfusionMatrixMeasurements.h"
 
 namespace otb
diff --git a/Code/Learning/otbSEMClassifier.h b/Code/Learning/otbSEMClassifier.h
index 35a7318f4a3fa46b78e642d1ba6757ed0b12a42a..a186a364f1704b129c9946868a5676cad48b8491 100644
--- a/Code/Learning/otbSEMClassifier.h
+++ b/Code/Learning/otbSEMClassifier.h
@@ -4,7 +4,6 @@
 #include "itkListSample.h"
 #include "itkSampleClassifierFilter.h"
 
-#include "otbModelComponentBase.h"
 
 #include "otbGaussianModelComponent.h"
 
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.h b/Code/Markov/otbMarkovRandomFieldFilter.h
index f592c4598a47857fb031f40c5233081ca6dbe588..e1be74de96fd3804231bd21542acc2668144953b 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.h
+++ b/Code/Markov/otbMarkovRandomFieldFilter.h
@@ -27,7 +27,6 @@
 #include "itkImageToImageFilter.h"
 #include "itkImageRegionIterator.h"
 
-#include "itkNeighborhoodIterator.h"
 #include "itkNeighborhoodAlgorithm.h"
 #include "itkNeighborhood.h"
 #include "itkSize.h"
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.txx b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
index 0f377e64723ce1d25cd14460083c4c393a9db38b..038f63495f5f52faf3df562111df382a93d1cd60 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.txx
@@ -22,7 +22,6 @@
 #include "itkScalableAffineTransform.h"
 #include "itkNearestNeighborInterpolateImageFunction.h"
 #include "itkProgressAccumulator.h"
-#include "itkImageRegionIterator.h"
 
 namespace otb
 {
diff --git a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
index 2039b8b90cf1ba23f58bc11a019bda12963b88a4..0c6c80d5115374835aaee710a9dfa93921bbad48 100644
--- a/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
+++ b/Code/OBIA/otbImageToLabelMapWithAttributesFilter.h
@@ -18,7 +18,6 @@ PURPOSE.  See the above copyright notices for more information.
 #ifndef __otbImageToLabelMapWithAttributesFilter_h
 #define __otbImageToLabelMapWithAttributesFilter_h
 
-#include "itkLabelObject.h"
 #include "itkShapeLabelMapFilter.h"
 #include "otbAttributesMapLabelObjectWithClassLabel.h"
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
diff --git a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h b/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
index da3ddb08b53ddea8e8ddd4696ace22c90fbd5861..77326211b89da3f843f503ad952d5be96e914bb9 100644
--- a/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
+++ b/Code/ObjectDetection/otbFourierMellinDescriptorsIFFactory.h
@@ -22,7 +22,6 @@
 
 #include "otbMetaImageFunction.h"
 #include "itkDataObject.h"
-#include "otbImage.h"
 #include "otbImageFunctionAdaptor.h"
 #include "otbFourierMellinDescriptorsImageFunction.h"
 
diff --git a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h b/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
index ba57a25d1981d0bd68423a7876207076741809f6..4a61e8912289c7a37119a6ee81ceed11342836c7 100644
--- a/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
+++ b/Code/ObjectDetection/otbStandardMetaImageFunctionBuilder.h
@@ -19,7 +19,6 @@
 #define __otbStandardMetaImageFunctionBuilder_h
 
 
-#include "otbMetaImageFunction.h"
 #include "itkVariableLengthVector.h"
 
 #include "otbMultiChannelIFFactory.h"
diff --git a/Code/Projections/otbGenericRSTransform.h b/Code/Projections/otbGenericRSTransform.h
index 396ad8d0eca9e071e33249cbd54694b93c800eea..7cc13ff6f496259280af2eb9730929f0ad5ce0b1 100644
--- a/Code/Projections/otbGenericRSTransform.h
+++ b/Code/Projections/otbGenericRSTransform.h
@@ -18,7 +18,6 @@
 #ifndef __otbGenericRSTransform_h
 #define __otbGenericRSTransform_h
 
-#include "itkMacro.h"
 #include "otbCompositeTransform.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index 0d637907ddf458b9d870f63e3613c4d20882ef29..810ccd5aebd271e861d9bc59652cb98c6276d41a 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -19,7 +19,6 @@
 #define __otbAtmosphericCorrectionParameters_h
 
 #include "itkObject.h"
-#include "itkMacro.h"
 #include "itkVariableSizeMatrix.h"
 #include "itkVariableLengthVector.h"
 #include "otbObjectList.h"
diff --git a/Code/Radiometry/otbBuiltUpIndicesFunctor.h b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
index 2f7e9dfe72313bd0c2ef6ad4c5826e2c2b4e02b5..c2446cded80251edea4d98eb83ddc3afc6eab549 100644
--- a/Code/Radiometry/otbBuiltUpIndicesFunctor.h
+++ b/Code/Radiometry/otbBuiltUpIndicesFunctor.h
@@ -18,7 +18,6 @@
 #ifndef __otbBuiltUpIndicesFunctor_h
 #define __otbBuiltUpIndicesFunctor_h
 
-#include "itkVariableLengthVector.h"
 #include "otbVegetationIndicesFunctor.h"
 
 namespace otb
diff --git a/Code/Radiometry/otbDEMCaracteristicsExtractor.h b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
index bbb9749dd411debb41f547f20153cbfca8287f7e..6b3cf804abe7546511ce8431cf195e84af364b64 100644
--- a/Code/Radiometry/otbDEMCaracteristicsExtractor.h
+++ b/Code/Radiometry/otbDEMCaracteristicsExtractor.h
@@ -25,7 +25,6 @@
 #include "otbVectorImage.h"
 #include "itkGradientMagnitudeImageFilter.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
-#include "itkCovariantVector.h"
 #include "itkAtan2ImageFilter.h"
 #include "itkAtanImageFilter.h"
 #include "otbMultiplyByScalarImageFilter.h"
diff --git a/Code/Radiometry/otbImageToReflectanceImageFilter.h b/Code/Radiometry/otbImageToReflectanceImageFilter.h
index 1f21221435ac99a5e3b515bb48498ab08646a544..aa6dcfe2a594c3f95c5e5cc921657fbd602be40f 100644
--- a/Code/Radiometry/otbImageToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbImageToReflectanceImageFilter.h
@@ -22,10 +22,8 @@
 #ifndef __otbImageToReflectanceImageFilter_h
 #define __otbImageToReflectanceImageFilter_h
 
-#include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
-#include "itkNumericTraits.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
index 869a14b42a9792b397cf61cd4ad68bde61424697..cad380ccd8d54d4e9c19b31e2bedb5966ebb3559 100644
--- a/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
+++ b/Code/Radiometry/otbLuminanceToReflectanceImageFilter.h
@@ -24,7 +24,6 @@
 
 #include "otbVarSol.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
-#include "otbMath.h"
 #include "itkVariableLengthVector.h"
 #include "otbMacro.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Code/Radiometry/otbReflectanceToImageImageFilter.h b/Code/Radiometry/otbReflectanceToImageImageFilter.h
index dbd7b2b7646b876d3a98d9b57ef8cac6cb82754a..63b3a57116924fdc4603202653ca955c99a3e199 100644
--- a/Code/Radiometry/otbReflectanceToImageImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToImageImageFilter.h
@@ -24,7 +24,6 @@
 
 #include "otbLuminanceToImageImageFilter.h"
 #include "otbReflectanceToLuminanceImageFilter.h"
-#include "itkNumericTraits.h"
 
 namespace otb
 {
diff --git a/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h b/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
index 61f9fc8dac369ddda28a96f6f53fed4093f9c31c..91a876da37ac01cd0ab7bc2c9bbb27c52293c6a6 100644
--- a/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToLuminanceImageFilter.h
@@ -25,7 +25,6 @@
 #include "otb_6S.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "otbMath.h"
-#include "itkVariableLengthVector.h"
 #include "otbMacro.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 #include <iomanip>
diff --git a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
index cd3c287309f9602b056300841d256e08e4d67e57..3a4559aef12a62423deb129696f033f7c8f6c762 100644
--- a/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -26,7 +26,6 @@
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbAtmosphericRadiativeTerms.h"
 
 #include "itkMetaDataDictionary.h"
 
diff --git a/Code/Radiometry/otbSarBrightnessFunction.h b/Code/Radiometry/otbSarBrightnessFunction.h
index 6e6d9694f845dd6ca282cabdef778148a1d2dfda..c175890a586b67dd23906730cef360533555fd3f 100644
--- a/Code/Radiometry/otbSarBrightnessFunction.h
+++ b/Code/Radiometry/otbSarBrightnessFunction.h
@@ -18,7 +18,6 @@
 #ifndef __otbSarBrightnessFunction_h
 #define __otbSarBrightnessFunction_h
 
-#include "itkImageFunction.h"
 #include "otbSarBrightnessFunctor.h"
 #include "otbSarParametricMapFunction.h"
 
diff --git a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
index b2740e2befefc1518ae73e1b24df2468024699a1..abf06c92974ea92a67dd6ff85af2fc1c9262881a 100644
--- a/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
+++ b/Code/Radiometry/otbSarRadiometricCalibrationFunction.h
@@ -18,7 +18,6 @@
 #ifndef __otbSarRadiometricCalibrationFunction_h
 #define __otbSarRadiometricCalibrationFunction_h
 
-#include "itkImageFunction.h"
 #include "otbSarRadiometricCalibrationFunctor.h"
 #include "otbSarParametricMapFunction.h"
 
diff --git a/Code/Simulation/otbImageSimulationMethod.h b/Code/Simulation/otbImageSimulationMethod.h
index 4cd42c4f4f31d980d4a3942463f1ce2f68f831cb..63bc17a3fef5f9fc91b792b3b02717eee3cfa353 100644
--- a/Code/Simulation/otbImageSimulationMethod.h
+++ b/Code/Simulation/otbImageSimulationMethod.h
@@ -23,7 +23,6 @@
 #include "itkImageSource.h"
 #include "otbProspectModel.h"
 #include "otbSailModel.h"
-#include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "otbSatelliteRSR.h"
 #include "otbLabelMapToSimulatedImageFilter.h"
 
diff --git a/Code/Simulation/otbProspectModel.h b/Code/Simulation/otbProspectModel.h
index d4b62aa785eab7dd23806e7a80ee0e52d4bc1cbf..3a6693fbf6e723cdecd25a859a7957d34b32b8b3 100644
--- a/Code/Simulation/otbProspectModel.h
+++ b/Code/Simulation/otbProspectModel.h
@@ -19,7 +19,6 @@
 #define __otbProspectModel_h
 
 
-#include "itkObjectFactory.h"
 #include "otbLeafParameters.h"
 
 #include "otbDataSpecP5B.h"
diff --git a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h b/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
index ab8523e126cec586e8b5b1e74f7f4d589be66d38..1fa87ce13d76b3527a4ada1a65786e444e4f523d 100644
--- a/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Code/Simulation/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -19,7 +19,6 @@
 #define __otbReduceSpectralResponseClassifierRAndNIR_h
 
 
-#include <itkObjectFactory.h>
 
 #include "otbReduceSpectralResponse.h"
 #include "otbVegetationIndicesFunctor.h"
diff --git a/Code/Simulation/otbSailModel.h b/Code/Simulation/otbSailModel.h
index f390db3ca39db2e1927ae2a932716fc41be4a8fb..abf8c9c154fd327a98be9fd2b57018a9eb26ae1d 100644
--- a/Code/Simulation/otbSailModel.h
+++ b/Code/Simulation/otbSailModel.h
@@ -19,7 +19,6 @@
 #define __otbSailModel_h
 
 
-#include "itkObjectFactory.h"
 #include "otbSpectralResponse.h"
 #include "otbDataSpecP5B.h"
 #include "otbSimulationStep2Base.h"
diff --git a/Code/Simulation/otbSatelliteRSR.h b/Code/Simulation/otbSatelliteRSR.h
index 8afb463099a15343db8eac84d55680ca51442df9..11be17e33435e2fcd940cc3e2007f02a67fef5e4 100644
--- a/Code/Simulation/otbSatelliteRSR.h
+++ b/Code/Simulation/otbSatelliteRSR.h
@@ -18,7 +18,6 @@
 #ifndef __otbSatelliteRSR_h
 #define __otbSatelliteRSR_h
 
-#include <itkObjectFactory.h>
 #include <vector>
 #include <utility>
 #include <fstream>
diff --git a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
index b908a06fb4466e1ca05d58e2a9c56f94b25b4c9d..f61b7b6b892cdbf9c7a315728f4b22a620811e76 100644
--- a/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
+++ b/Code/UtilitiesAdapters/OssimAdapters/otbSensorModelAdapter.h
@@ -18,7 +18,6 @@
 #ifndef __otbSensorModelAdapter_h
 #define __otbSensorModelAdapter_h
 
-#include "itkObjectFactory.h"
 #include "otbDEMHandler.h"
 
 class ossimProjection;
diff --git a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
index d73866aaa1e76c651a08a5fb6e29ad157510421e..f6db9d80c8e1fc557616baf26af7911b08912265 100644
--- a/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
+++ b/Code/Wrappers/CommandLine/otbWrapperCommandLineLauncher.h
@@ -18,7 +18,6 @@
 #ifndef __otbWrapperCommandLineLauncher_h
 #define __otbWrapperCommandLineLauncher_h
 
-#include "itkObject.h"
 
 #include "otbWrapperApplication.h"
 #include "otbWrapperParameter.h"
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
index 6c25c6c8f3964ead3df953fbb2667d3ea39ca312..0030de8ceae9b5c93cda780241277719d77d110f 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputFilenameListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetInputFilenameListParameter_h
 
 #include <QtGui>
-#include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtFileSelectionWidget.h"
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
index 2dc07643fb2343a3d0c496b2cd86259b4ca1f655..d27e8d80f54e0bd7969815e7dbc63eff47e81ceb 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetInputImageListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetInputImageListParameter_h
 
 #include <QtGui>
-#include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtFileSelectionWidget.h"
 
 namespace otb
diff --git a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h b/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
index 128610bafb36753bf477ce9bc062279a822fab7f..660f9b3b1eff2bc028608ca033d9a55a25f158d1 100644
--- a/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
+++ b/Code/Wrappers/QtWidget/otbWrapperQtWidgetStringListParameter.h
@@ -19,7 +19,6 @@
 #define __otbWrapperQtWidgetStringListParameter_h
 
 #include <QtGui>
-#include "otbWrapperQtWidgetParameterBase.h"
 #include "otbQtStringSelectionWidget.h"
 
 namespace otb
diff --git a/Code/Wrappers/SWIG/itkBase.includes b/Code/Wrappers/SWIG/itkBase.includes
index 14a8a040f708ffab7d1de917937f7fca8f64e307..ddb8ccbef5a031b8a87a76924e969f2a452f5b9b 100644
--- a/Code/Wrappers/SWIG/itkBase.includes
+++ b/Code/Wrappers/SWIG/itkBase.includes
@@ -21,7 +21,6 @@
 /* kindly stolen from the build files of OTB-Wrapping
  * (Typedefs/itkBase.includes, Typedefs/wrap_ITKCommonBase.i) */
 
-#include "itkObject.h"
 #include "itkProcessObject.h"
 #include "itkObjectFactoryBase.h"
 
diff --git a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
index 5144ad2e85b1c9d38160493086a1e31ccbf261dc..0f0bfc3760b562d0f4f3d5b9d785f8642ffca67f 100644
--- a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
+++ b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
@@ -47,7 +47,6 @@
 #include "otbWarpImageFilter.h"
 // Software Guide : EndCodeSnippet
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/DisparityMap/StereoReconstructionExample.cxx b/Examples/DisparityMap/StereoReconstructionExample.cxx
index 0534291b7fde57403ce0004ea4a52b9950c4edd3..c2a51acce3696b59067b89ff4e473e34cb85942a 100644
--- a/Examples/DisparityMap/StereoReconstructionExample.cxx
+++ b/Examples/DisparityMap/StereoReconstructionExample.cxx
@@ -49,7 +49,6 @@
 #include "otbDisparityMapMedianFilter.h"
 #include "otbDisparityMapToDEMFilter.h"
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbBCOInterpolateImageFunction.h"
diff --git a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
index 593c6b531f07447b4363aa613da2436b829f8ab9..4fee40497c8ff15da9b57428824b5af746f45bfd 100644
--- a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
@@ -45,7 +45,6 @@
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkSqrtImageFilter.h"
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
index eaed300046249f05a4625a4cb6ed940d6c838ca8..91ce491df4ac6929c84aeeb9b09fce981fded352 100644
--- a/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
+++ b/Examples/FeatureExtraction/LineSegmentDetectorExample.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorData.h"
 
 #include "otbImageFileReader.h"
 #include "otbVectorDataToMapFilter.h"
diff --git a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
index 9223a44c28818bd809882a8ab43266cabfd04700..24054c5ce6f61aa2fc86204c8a691b03a0d0c1de 100644
--- a/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
+++ b/Examples/FeatureExtraction/RightAngleDetectionExample.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorData.h"
 
 #include "otbImageFileReader.h"
 #include "otbLineSegmentDetector.h"
diff --git a/Examples/Learning/SOMExample.cxx b/Examples/Learning/SOMExample.cxx
index 1fa479d201207007283fc4bc98f755537b506a3d..056820dd406bd89e45b4dcfb03e98a413e999487 100644
--- a/Examples/Learning/SOMExample.cxx
+++ b/Examples/Learning/SOMExample.cxx
@@ -51,7 +51,6 @@
 // Software Guide : EndCodeSnippet
 
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 
 #include "itkVectorExpandImageFilter.h"
 #include "itkVectorNearestNeighborInterpolateImageFunction.h"
diff --git a/Examples/OBIA/HooverMetricsEstimation.cxx b/Examples/OBIA/HooverMetricsEstimation.cxx
index 2cc490037b938f9a5f651adcbf954663fc3abf48..019d7f89bd4fd8143c5fa052b4fac8382a5e3ba0 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 "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
 int main(int argc, char* argv[])
diff --git a/Examples/OBIA/ImageToLabelToImage.cxx b/Examples/OBIA/ImageToLabelToImage.cxx
index 25d98c5657ec85b2ab604a254d77f3f45d7dd3d9..0ad5eb97736f328f434e90a713ac6056026157a5 100644
--- a/Examples/OBIA/ImageToLabelToImage.cxx
+++ b/Examples/OBIA/ImageToLabelToImage.cxx
@@ -32,7 +32,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "itkLabelMap.h"
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "itkLabelMapToLabelImageFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
index dc156eb37fc77aab81608f32fca37044aace6cc4..845645c3b93a3e5aa300e8c1b52b06dc0f242653 100644
--- a/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
+++ b/Examples/OBIA/RadiometricAttributesLabelMapFilterExample.cxx
@@ -38,13 +38,11 @@
 //
 //  Software Guide : EndLatex
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
 #include "otbMeanShiftVectorImageFilter.h"
 #include "itkLabelImageToLabelMapFilter.h"
-#include "itkLabelMap.h"
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "itkLabelMapToBinaryImageFilter.h"
diff --git a/Examples/Patented/SIFTDisparityMapEstimation.cxx b/Examples/Patented/SIFTDisparityMapEstimation.cxx
index e4d2d3d0b7ad0b0bde2cca033efc62e320ba870f..14af0178768460f44deb33d8ee006518fddfe1d3 100644
--- a/Examples/Patented/SIFTDisparityMapEstimation.cxx
+++ b/Examples/Patented/SIFTDisparityMapEstimation.cxx
@@ -47,7 +47,6 @@
 // Software Guide : EndCodeSnippet
 
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/Projections/OrthoRectificationExample.cxx b/Examples/Projections/OrthoRectificationExample.cxx
index fd36cab37d99b140b0a3da6bd82bd7c361f48951..2acfc9caf0d1b7cb4c46a72afe556e3d3e84fcae 100644
--- a/Examples/Projections/OrthoRectificationExample.cxx
+++ b/Examples/Projections/OrthoRectificationExample.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
index a1051f25bda8bdcbdb88af277ccf3ab7f6b4cbdd..0fcb2e126291febcb25057e388c58953aab74cac 100644
--- a/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
+++ b/Examples/Segmentation/StreamingMeanShiftSegmentation.cxx
@@ -38,7 +38,6 @@
 
 // Software Guide : BeginCodeSnippet
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
-#include "otbOGRDataSourceWrapper.h"
 #include "otbOGRLayerStreamStitchingFilter.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx b/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
index 6a829ed057a0c606b86294d477598b7136e9174c..f49bb64095440abcc2fe87c69129be25abb736eb 100644
--- a/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
+++ b/Examples/Simulation/LAIAndPROSAILToSensorResponse.cxx
@@ -36,7 +36,6 @@
 //
 // Software Guide : EndLatex
 
-#include "otbImage.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
@@ -46,7 +45,6 @@
 #include "itkOrImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
-#include "otbSailModel.h"
 #include "otbLeafParameters.h"
 #include "otbReduceSpectralResponse.h"
 #include "otbImageSimulationMethod.h"
diff --git a/Examples/Tutorials/Multispectral.cxx b/Examples/Tutorials/Multispectral.cxx
index 886e700f1d56ce7403c49ad3f4bbd534750d7607..cbe7884a72980ef550171d5b2d3f564c5ff41b56 100644
--- a/Examples/Tutorials/Multispectral.cxx
+++ b/Examples/Tutorials/Multispectral.cxx
@@ -40,7 +40,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Examples/Tutorials/OrthoFusion.cxx b/Examples/Tutorials/OrthoFusion.cxx
index 6b5e80947e540b4f7385a0b56b2d2ebb8a11fd06..46209ceaed8ccbfae0238396830c910d16aaf01e 100644
--- a/Examples/Tutorials/OrthoFusion.cxx
+++ b/Examples/Tutorials/OrthoFusion.cxx
@@ -28,7 +28,6 @@
 //  Software Guide : EndLatex
 
 // Software Guide : BeginCodeSnippet
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
index 194bcae410a70d4a3e5b9397b34738dac29615c4..1b4780b7f019d05c91e358382d37dcee80c50324 100644
--- a/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
+++ b/Testing/Code/BasicFilters/otbBCOInterpolateImageFunction.cxx
@@ -18,7 +18,6 @@
 #include "itkMacro.h"
 
 #include "otbBCOInterpolateImageFunction.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include <fstream>
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx b/Testing/Code/BasicFilters/otbInnerProductPCAImageFilter.cxx
index ba133038939f6e89ab0b89db88a26d7533befb61..64eca78535e693974e4fe43d1a0941cc8f94c6f6 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 "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbInnerProductPCAImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
index 586e791560001b089fa2a975732a5473f5023fde..70476954768f61a4dca9a6729e18c606e6dcd4af 100644
--- a/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelImageRegionMergingFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
index a0ce3f0d50b4bd1fc9a6faab3de26b83698926dd..2b3d745b2b4aa8ba34ca9175e176d0b0d40af0fd 100644
--- a/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
+++ b/Testing/Code/BasicFilters/otbLabelImageRegionPruningFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
index f0e877ea43199b1d9cb03f369d8dc0f488989e4f..b4f984229141b2d1f839c6ec177c79ca0128da18 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
index 09ae2c112d0d0d2189f8887a4b9b88e716218dd7..66474f49658f74c79c0655b2f91b2874900639b5 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterSpatialStability.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
 
diff --git a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
index 9d03c2e5107675283c2cf2e8f00eb77ea6150907..6596c37e3d7b2895e4ea9bae5501402af427b631 100644
--- a/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
+++ b/Testing/Code/BasicFilters/otbMeanShiftSmoothingImageFilterThreading.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "itkMacro.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMeanShiftSmoothingImageFilter.h"
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
index 22302bea8b44b633bd8940e6abcb3a088a4a4120..b07fe43575df804c98812927320594323df64bf0 100644
--- a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
+++ b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbObjectList.h"
 #include "otbImage.h"
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
diff --git a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
index e43e9450d35e4aeba958af3b11c7e9f25a1c1bf2..a490381dd53c551eb55d723f1614cd340596c5a9 100644
--- a/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
+++ b/Testing/Code/BasicFilters/otbSparseWvltToAngleMapperListFilterNew.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbObjectList.h"
 #include "otbImage.h"
 #include "otbWaveletOperator.h"
 #include "otbWaveletFilterBank.h"
diff --git a/Testing/Code/Common/otbExtractROITestMetaData.cxx b/Testing/Code/Common/otbExtractROITestMetaData.cxx
index e2ed5f7faa8618d3bec7dc70e59be55d0d3004d0..75aba80b678a662b6ea689dd518d24845158d0c8 100644
--- a/Testing/Code/Common/otbExtractROITestMetaData.cxx
+++ b/Testing/Code/Common/otbExtractROITestMetaData.cxx
@@ -18,7 +18,6 @@
 #include <iostream>
 #include <fstream>
 
-#include "otbVectorImage.h"
 
 #include "itkExtractImageFilter.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx b/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
index 17f3392356974cdc8388b32f1408f04c07802e3e..d28895ef3571108d608b7860bbefa6ca89854f0e 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapTo3DFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbDisparityMapTo3DFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImageToImageListFilter.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx b/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
index c898447864fb230cc2647672178935262ca656af..84e97bef182496e366305650f7bdcc0db6c53093 100644
--- a/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityMapToDEMFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityMapToDEMFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbStandardWriterWatcher.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx b/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
index a8c45a99e49a2375f122e878e6ef4bac34c5ebbe..e70319c3f3829af81a52c6a6fa582eaf447be7fc 100644
--- a/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
+++ b/Testing/Code/DisparityMap/otbDisparityTranslateFilter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 #include "otbDisparityTranslateFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImageToImageListFilter.h"
diff --git a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
index c4121e5e0d6822ba2c2a6a7da96d630163ca0442..a06c79db289808499d923459f3413ec45bbd1a4a 100644
--- a/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
+++ b/Testing/Code/DisparityMap/otbMulti3DMapToDEMFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbMulti3DMapToDEMFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImageToImageListFilter.h"
diff --git a/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx b/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
index f8ff048194a3c6f80bc1c3caa5beb52a405a8f0a..0dc06d50decbf6966c26e9acad4b9707cacba588 100644
--- a/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
+++ b/Testing/Code/DisparityMap/otbMultiDisparityMapTo3DFilter.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbMultiDisparityMapTo3DFilter.h"
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImageToImageListFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
index c248caf2f78d3d46b573a73912a31dadaa114483..2f0998969c3c47991e4605d769d1a2cd79f7f7aa 100644
--- a/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
+++ b/Testing/Code/FeatureExtraction/otbAlignImageToPath.cxx
@@ -20,16 +20,13 @@
 
 
 #include <iostream>
-#include "itkParametricPath.h"
 #include "itkPolyLineParametricPath.h"
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageToPathListAlignFilter.h"
 
 #include "itkPathSource.h"
-#include "otbImageToPathListFilter.h"
 
 #include <stdio.h>
 
diff --git a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
index b72f37b94d8565eec208cc5d35ed4f50909d5827..1a41476c25821f36ee07f44f5360030ff2ab4ea8 100644
--- a/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
+++ b/Testing/Code/FeatureExtraction/otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "itkHistogram.h"
 #include "vnl/vnl_math.h"
 
 #include "otbGreyLevelCooccurrenceMatrixAdvancedTextureCoefficientsCalculator.h"
diff --git a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
index 6aee01c0660f2161f43785c1e1930b115cfd0c3f..0b66323d79a5359eeb685912cfcb6785f2805500 100644
--- a/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
+++ b/Testing/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
@@ -22,7 +22,6 @@
 #include "itkVariableLengthVector.h"
 #include "itkResampleImageFilter.h"
 #include "itkDanielssonDistanceMapImageFilter.h"
-#include "itkMinimumMaximumImageCalculator.h"
 #include "itkExpandImageFilter.h"
 #include "itkPointSetToImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx b/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
index f20e65b35e5faa63b00f21a78a98ab1110e0e686..e1d507c36bf1805ee3c5dda4ebe923b3417d702e 100644
--- a/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
+++ b/Testing/Code/FeatureExtraction/otbStreamingLineSegmentDetector.cxx
@@ -21,7 +21,6 @@
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileWriter.h"
 
-#include "otbPersistentFilterStreamingDecorator.h"
 
 int otbStreamingLineSegmentDetectorNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
index 5f50f0fec009d6f2041f0da39d75c8092fe15b9c..c73d42b07f715693f4c743fd87e4d86fffd5c8e3 100644
--- a/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
+++ b/Testing/Code/FeatureExtraction/otbTextureImageFunction.cxx
@@ -21,7 +21,6 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "itkVariableLengthVector.h"
 
 #include "otbTextureFunctors.h"
 
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
index 4f36618cbdac788377159ab77fb48f9ca1a16fc9..05aa3d36f6f42509889c859171643212535becce 100644
--- a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
+++ b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 
 #include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
 
diff --git a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
index d4857aa98e30fc33636ed39be36b03adc715a0ff..50e80d727f14245ab528c631bc1c59b1fab06d76 100644
--- a/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
+++ b/Testing/Code/Fusion/otbSimpleRcsPanSharpeningFusionImageFilterNew.cxx
@@ -20,7 +20,6 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbVectorImage.h"
-#include "otbImage.h"
 
 #include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
 
diff --git a/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx b/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
index 799f81a65a1afaedbbb8bd7e4e3ab5cdb1a0d1b8..13c2c78edd346f40c38b62f65ecfae9e79032db7 100644
--- a/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
+++ b/Testing/Code/Fuzzy/otbDSFusionOfClassifiersImageFilterTest.cxx
@@ -20,7 +20,6 @@
 #include "otbImageListToVectorImageFilter.h"
 #include "otbConfusionMatrixToMassOfBelief.h"
 
-#include "otbImage.h"
 #include "otbImageList.h"
 
 #include <otbImageFileReader.h>
diff --git a/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx b/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
index 678b49ccde4c56bec40ebaffcdf24c3ac1368221..419babc1fd690a838c1bc5009c927b42a6454f9d 100644
--- a/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
+++ b/Testing/Code/Fuzzy/otbStandardDSCostFunction.cxx
@@ -19,7 +19,6 @@
 
 #include "otbStandardDSCostFunction.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 b031c777d188fca57d89f8e905aa7a062b154e5b..926da3e323159841a9a7ee5816480cba95ed0df1 100644
--- a/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
+++ b/Testing/Code/Fuzzy/otbVectorDataToDSValidatedVectorDataFilter.cxx
@@ -19,7 +19,6 @@
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
 
-#include "otbVectorData.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
 
diff --git a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
index 47f39f5db40eecc920fb7687d545533e356fc87e..fc61f5f8036b6c129815583355552fb0955a5a79 100644
--- a/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
+++ b/Testing/Code/Fuzzy/otbVectorDataToRoadDescriptionFilter.cxx
@@ -19,12 +19,10 @@
 
 #include "otbVectorDataToRoadDescriptionFilter.h"
 
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
 #include "otbVectorDataFileWriter.h"
-#include "otbVectorDataProjectionFilter.h"
 #include "otbVectorDataProperties.h"
 #include "otbRemoteSensingRegion.h"
 #include "otbVectorDataIntoImageProjectionFilter.h"
diff --git a/Testing/Code/IO/otbCompareWritingComplexImage.cxx b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
index 64ea7459e17bef5b04854d757be341cc827b14d3..82046090816caf01e571e1e1cf4edbb4a80ecd13 100644
--- a/Testing/Code/IO/otbCompareWritingComplexImage.cxx
+++ b/Testing/Code/IO/otbCompareWritingComplexImage.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
index f8fe3054c649ee79852bcd163b4b3bd54c00fbf0..16c4bbbdf294e81686149471da3d75e8c27ba3e7 100644
--- a/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
+++ b/Testing/Code/IO/otbDEMToImageGeneratorFromImageTest.cxx
@@ -18,7 +18,6 @@
 
 
 #include "otbImageFileWriter.h"
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 
 #include "otbDEMToImageGenerator.h"
diff --git a/Testing/Code/IO/otbImageFileReaderONERA.cxx b/Testing/Code/IO/otbImageFileReaderONERA.cxx
index 9770188af00d7a263c57b12cebf3f69ed5c5ba8d..9dcb0b292b1b72a9130e2e109e0ac87e03556516 100644
--- a/Testing/Code/IO/otbImageFileReaderONERA.cxx
+++ b/Testing/Code/IO/otbImageFileReaderONERA.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADChar.cxx b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
index 7a1db476a26c4898adf5505ff0daf198bb910200..20689777558506ec355e826e4c6f3d2fb979d72a 100644
--- a/Testing/Code/IO/otbImageFileReaderRADChar.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADChar.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
index 0648d4c00adbbacfcb2c3b63b0063074157d8fba..92688ddc55023c5a3c8baee71a1c37437271285a 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexDouble.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
index 649f39ebf84186b2ced7e66c8af8f201c5a820cd..9e7ffaf9fc8e25a0042f5bdeb13bab39a72e026d 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloat.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
index 2a051fedd72f5c03702afe9da3be4f2b8fec1a64..0b0e7d2a42d52a63f1d8bf459eaa7aec76ce28fd 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexFloatExtract.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
index 0435d7ae67998594a776fd37c582439915a61141..d85116dc68f21b1c35e32840723d53cec890745a 100644
--- a/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADComplexInt.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderRADInt.cxx b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
index 7db4cd82ae0c3b71a49eb7a185d3847ac7824067..552b5a594d5aed3d222e818ccf736f5cf4bda7e0 100644
--- a/Testing/Code/IO/otbImageFileReaderRADInt.cxx
+++ b/Testing/Code/IO/otbImageFileReaderRADInt.cxx
@@ -19,7 +19,6 @@
 
 
 #include <iostream>
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbExtractROI.h"
diff --git a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
index 79c6f54f14d06838b715c5f84f22752bd87bedbc..418061f3a2649eae2d32df4cebc36a2921388aa5 100644
--- a/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
+++ b/Testing/Code/IO/otbImageFileReaderWithComplexPixel.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.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 1624ec4f351159eb6fbd7acab00a9d31dbc7f193..a3c55f3fbff2acd920b0768b77fa5c7abb129dcb 100644
--- a/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
+++ b/Testing/Code/IO/otbImageFileWriterONERAComplex.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
index c8bd6bb82bc514c7c72afb184f10ee9a7bf61b7e..ea8b760f9bcaf73ac56f3d3ff62e9e0d3d58fe98 100644
--- a/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
+++ b/Testing/Code/IO/otbImageFileWriterWithExtendedOptionBox.cxx
@@ -18,7 +18,6 @@
 
 
 
-#include "itkMacro.h"
 #include <iostream>
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/IO/otbTileMapWriter.cxx b/Testing/Code/IO/otbTileMapWriter.cxx
index 49e54f5a24c5e414d48cce8de48d413427e25772..9910cac6a543669b0f74a1f23dfb7c66afb1232a 100644
--- a/Testing/Code/IO/otbTileMapWriter.cxx
+++ b/Testing/Code/IO/otbTileMapWriter.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "itkRGBPixel.h"
 #include "otbTileMapTransform.h"
 #include "otbOrthoRectificationFilter.h"
diff --git a/Testing/Code/IO/otbVectorDataFileReader.cxx b/Testing/Code/IO/otbVectorDataFileReader.cxx
index d54e27a5344bf8b68afaeb389ce713d92b447ed9..d6b68c8627105b63db8d6f4f79702ad48c898eb4 100644
--- a/Testing/Code/IO/otbVectorDataFileReader.cxx
+++ b/Testing/Code/IO/otbVectorDataFileReader.cxx
@@ -20,7 +20,6 @@
 #include "otbVectorData.h"
 #include <fstream>
 
-#include "itkDataObject.h"
 
 int otbVectorDataFileReader(int itkNotUsed(argc), char * argv[])
 {
diff --git a/Testing/Code/Learning/otbSOMActivationBuilder.cxx b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
index e6f5bd07fc886d67c393d4c6e3959da792473583..775281aca52652c76f34c5fbc2efd7dc1609071d 100644
--- a/Testing/Code/Learning/otbSOMActivationBuilder.cxx
+++ b/Testing/Code/Learning/otbSOMActivationBuilder.cxx
@@ -19,7 +19,6 @@
 #include "otbImage.h"
 #include "otbSOMMap.h"
 #include "otbSOMActivationBuilder.h"
-#include "itkEuclideanDistanceMetric.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkListSample.h"
diff --git a/Testing/Code/Learning/otbSOMMap.cxx b/Testing/Code/Learning/otbSOMMap.cxx
index 974ed9fe61186a807cb0b3dc7dee4487ee915a88..5a9d3c66e0c6e49974379ed52098163f048abe1b 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 "itkVariableLengthVector.h"
 
 int otbSOMMap(int itkNotUsed(argc), char* itkNotUsed(argv) [])
 {
diff --git a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
index 0d780e2cb37129fe966d02c7baa790ec5da15289..75b8fab15896c21ac45617c1d97880bc77fe0a20 100644
--- a/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
+++ b/Testing/Code/Learning/otbSOMWithMissingValueNew.cxx
@@ -19,7 +19,6 @@
 
 =========================================================================*/
 
-#include "itkVariableLengthVector.h"
 #include "itkListSample.h"
 
 #include "otbSOMMap.h"
diff --git a/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx b/Testing/Code/OBIA/otbImageToLabelMapWithAttributesFilterNew.cxx
index 808c2e2c46897a61451151ca6e489c63f6f8baf8..9b88abf57868424324c0e5188ca73e36bbfe19b4 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 "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 4dc4e84aae2c388880748e78cf10e91ab31da30a..48954156e065f061f633adacea9b57db4e49827a 100644
--- a/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
+++ b/Testing/Code/OBIA/otbKMeansAttributesLabelMapFilter.cxx
@@ -22,7 +22,6 @@
 #include <iostream>
 
 #include "otbVectorImage.h"
-#include "itkLabelMap.h"
 #include "itkLabelImageToLabelMapFilter.h"
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "otbKMeansAttributesLabelMapFilter.h"
diff --git a/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx b/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
index bc0209690579d0ef0e8212a5b8b47e940cf9e264..965ce855b4b9e98e56a6a27895cb4662311f3558 100644
--- a/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
+++ b/Testing/Code/OBIA/otbLabelMapToSampleListFilter.cxx
@@ -22,7 +22,6 @@
 #include "otbImageFileWriter.h"
 
 #include "itkBinaryImageToLabelMapFilter.h"
-#include "itkLabelMap.h"
 #include "otbShapeAttributesLabelMapFilter.h"
 
 #include "itkVariableLengthVector.h"
diff --git a/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx b/Testing/Code/OBIA/otbMeanShiftStreamingConnectedComponentOBIATest.cxx
index 822149ba53a320032eff25c093bb75fc7b9876c1..d8b7fb71a83dc6619e8bfe07e329c532d162f603 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 "otbVectorImage.h"
 #include "otbVectorData.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
index 086d33e8d79b993c41f5b408db5ead412abad624..4cb63fec7f975ffbd09592e1a368eb4b7bbbfc7b 100644
--- a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
@@ -21,7 +21,6 @@
 
 #include "otbImage.h"
 #include "otbRadiometricMomentsImageFunction.h"
-#include "itkFixedArray.h"
 #include "otbDescriptorsListSampleGenerator.h"
 #include "otbImageFileReader.h"
 #include "otbVectorDataFileReader.h"
diff --git a/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx b/Testing/Code/Projections/otbGCPsToRPCSensorModelImageFilterAndOrtho.cxx
index 76769005c22faa88529f96bfa28a44d07eae5599..b0c7f1b2dc5bd89e94e7d3f23b3cc0ce6fa65094 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 "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
index 6d7ce9328909518a486ab01d79dde6149b3c6723..7ddb0dde914729fc649a442344b4b0891488fb4b 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilter.cxx
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMapProjections.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
index abfcc206e6197b8159a4ee8ade33f4825f9aa160..7992ac46c5f0343c9679ec05c3f66d1d89017e49 100644
--- a/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationFilterWithDEM.cxx
@@ -22,7 +22,6 @@
 #include <iterator>
 #include <stdlib.h>
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
index 019a590baca5bcc6a0093d677e1b2bd40731af5d..e73649b2be59a8f5c2e440558dad5449b3e510ff 100644
--- a/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
+++ b/Testing/Code/Projections/otbOrthoRectificationMonoThreadFilter.cxx
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <stdlib.h>
 
-#include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbStreamingResampleImageFilter.h"
diff --git a/Testing/Code/Projections/otbRegionProjectionResampler.cxx b/Testing/Code/Projections/otbRegionProjectionResampler.cxx
index 2d30869c1ddcb3a5c86df54640bae93079a1de40..1f1363d7f0b730c3c5558f0838c015b5cf776955 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 "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Projections/otbSensorModelsNew.cxx b/Testing/Code/Projections/otbSensorModelsNew.cxx
index 0008193438c24abde3027de53f7431b6ce566fd7..74637aa7026ffaebd7d2d70dcea3bc8146c1f21d 100644
--- a/Testing/Code/Projections/otbSensorModelsNew.cxx
+++ b/Testing/Code/Projections/otbSensorModelsNew.cxx
@@ -19,7 +19,6 @@
 
 #include <iostream>
 
-#include "otbSensorModelBase.h"
 #include "otbForwardSensorModel.h"
 #include "otbInverseSensorModel.h"
 
diff --git a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
index 31a6e72a23aedf3d04af33a3efc2db8feed1d215..2f6f68d6a0e5e6fe89506eafe0c64b31ed8dfe0a 100644
--- a/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
+++ b/Testing/Code/Projections/otbVectorDataIntoImageProjectionFilterTest.cxx
@@ -28,7 +28,6 @@
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
 
-#include "otbVectorDataProjectionFilter.h"
 
 /*
 * Tests prTvVectorDataIntoImageProjectionFilterTest_2 and
diff --git a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
index 2e445c070678be188749e46540f94b7dfd7c2bc8..82fc190855a0849f444a3341a96fbda5c1e15496 100644
--- a/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
+++ b/Testing/Code/Radiometry/otbAtmosphericCorrectionSequencement.cxx
@@ -19,7 +19,6 @@
 
 #include "otbImageToLuminanceImageFilter.h"
 #include "otbLuminanceToReflectanceImageFilter.h"
-#include "otbAtmosphericCorrectionParameters.h"
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 
diff --git a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
index 8b6e4d6760b140adf3f26edea18fc9d3ae24dca6..9f0dd3c336c97eb6b0e890fe70cf928bf055319e 100644
--- a/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
+++ b/Testing/Code/Radiometry/otbFilterFunctionValues.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "itkMacro.h"
 #include "otbSIXSTraits.h"
 #include <fstream>
 #include <cstdlib>
diff --git a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
index 0cb7cca9c83c32bf8fb0fc99c8253b53d6330f27..1919c9ea0a4e3915d110fa1e39c060e3d34c9c24 100644
--- a/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
+++ b/Testing/Code/Radiometry/otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.cxx
@@ -18,7 +18,6 @@
 
 #include "otbRadiometryCorrectionParametersToAtmosphericRadiativeTerms.h"
 #include "otbAtmosphericCorrectionParameters.h"
-#include "otbAtmosphericRadiativeTerms.h"
 #include <vector>
 #include <fstream>
 #include <iostream>
diff --git a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
index dea7fb74d83ebe6228d77f2697d37c7bd96bf5cd..cb4f0f956802c7fbaa725e96102d9d608e390215 100644
--- a/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbReflectanceToSurfaceReflectanceImageFilterTest.cxx
@@ -23,7 +23,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbAtmosphericCorrectionParameters.h"
 
 #include "otbOpticalImageMetadataInterfaceFactory.h"
 
diff --git a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
index 50237227a60b044079bd7459f52b0dacf94fa9cf..6a0c7347b308ecf3f8ac05a20c13b62f10252754 100644
--- a/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
+++ b/Testing/Code/Radiometry/otbRomaniaReflectanceToRomaniaSurfaceReflectanceImageFilter.cxx
@@ -20,7 +20,6 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-#include "otbAtmosphericCorrectionParameters.h"
 #include <fstream>
 #include <iostream>
 
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
index 4e89140c4c6dc01d125fecb0e7c28f28b2460087..4fcb240708f06dab09ef98bfa0191b842ffc56c6 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
index d851ca81e7ce377c3d89333d48a0e09d4bdab5bb..b83689f76154e33e96603b62663666f05351b1d1 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithComplexPixelTestWithoutNoise.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
index 419b02ab6f7aae4cb33592540f3be72a2823f022..aec12a9397ded86a0d17fbc6d9394d18bc738c69 100644
--- a/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
+++ b/Testing/Code/Radiometry/otbSarRadiometricCalibrationToImageFilterWithExtractROIBeforeTest.cxx
@@ -16,7 +16,6 @@
 
 =========================================================================*/
 
-#include "otbVectorImage.h"
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
index fe56c60dd08d0b248711ed0516e829c560e773aa..79f356b117a70e57b24a148fe7140956a1857605 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 "otbAttributesMapLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
 int otbHooverInstanceFilterToAttributeImage(int argc, char* argv[])
diff --git a/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
index 2d0dd6b802e41beaf9400312db5376572b415cf9..a99fcf763db48824935fa9490af5093e7da934c6 100644
--- a/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
+++ b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
@@ -20,7 +20,6 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
-#include "itkLabelObject.h"
 #include "itkLabelImageToLabelMapFilter.h"
 
 int otbHooverMatrixFilter(int argc, char* argv[])
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
index 46e975e88bfb57f5d18dbf98978952c220eff9c6..a93d0210807f2d249cefd81d271068d4b2ab1fb0 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodKMeansClassif.cxx
@@ -22,7 +22,6 @@
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "otbSpatialisationFilter.h"
-#include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
 
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx b/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
index d92f420b8d62a39fc501a154f63a7a66371a2d36..5a3d692cfeff315f27112589ce3543ab5ba382d1 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodSVMClassif.cxx
@@ -24,7 +24,6 @@
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "otbSpatialisationFilter.h"
-#include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
 #include "otbSVMImageModelEstimator.h"
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx b/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
index 815f22b800731ee99b5587af4f451412a99e2543..7a5e7bb9a11acc9a923116aa98cf14b22735eeea 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodWithSpatialisationTest.cxx
@@ -21,7 +21,6 @@
 #include "otbVectorDataFileReader.h"
 
 #include "otbSpatialisationFilter.h"
-#include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx b/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
index 11a5c4b8817402bff1f6e3ba98d07af1ae98e0f6..f4a10f34ca6fd4a9205c07780b8085a4f383884c 100644
--- a/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
+++ b/Testing/Code/Simulation/otbImageSimulationMethodWithVectorDataTest.cxx
@@ -22,7 +22,6 @@
 #include "otbVectorDataFileReader.h"
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
-#include "otbSailModel.h"
 #include "otbImageSimulationMethod.h"
 #include "otbAttributesMapLabelObject.h"
 #include "otbImageFileReader.h"
diff --git a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
index 2df471634775e63abedf84350dfab344eacc5cd4..7698efcb4f1d59228b7d1df8d222ba7b9e9b00e9 100644
--- a/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
+++ b/Testing/Code/Simulation/otbSurfaceReflectanceToReflectanceFilterNew.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 #include "otbMacro.h"
-#include "itkImageRegionIterator.h"
 #include "otbSpectralResponse.h"
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
diff --git a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
index 593c8470eb73cb8ff909ed99cf52dc78fbf8034f..3799f9f9adb21dbe8b22bafcb12a71cbd33c6935 100644
--- a/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
+++ b/Testing/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.cxx
@@ -15,7 +15,6 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include "otbRCC8Graph.h"
 #include "otbImageList.h"
 #include "otbPolygon.h"
 #include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx b/Testing/Code/SpatialReasoning/otbPolygonListToRCC8GraphFilter.cxx
index b8a401c2b789524e0e3968e40d30d4b2854cbf71..2307820b231dd876df16e59f54367dbecf58fb28 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 "otbRCC8Graph.h"
 #include "otbPolygon.h"
 #include "otbObjectList.h"
 #include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
index a3c08260fb3941f21f55fd2305866c3bb84adec5..18228c9aaf6f1999b2b01a286369da0dadd381e3 100644
--- a/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
+++ b/Testing/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 #include "itkMacro.h"
 #include "otbPolygonToPolygonRCC8Calculator.h"
-#include "otbObjectList.h"
 #include "otbImageFileReader.h"
 #include "otbPolygon.h"
 #include "otbImageToEdgePathFilter.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx b/Testing/Code/SpatialReasoning/otbRCC8Graph.cxx
index a68565e7f93eaa8eb73549661f9474ca26e9a348..2985283c44cef867d93742c43edd52421aef24ac 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 "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8VertexIterator.h"
 #include "otbRCC8EdgeIterator.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileReader.cxx
index d5cd0bcc0a9a4304f1b3e87cabd0e9e35a4cf49f..b4d4619677c01ea642de6524b824a186808aeb89 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 "otbRCC8Graph.h"
 #include "otbRCC8VertexIterator.h"
 #include "otbRCC8EdgeIterator.h"
 #include "otbRCC8VertexBase.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriter.cxx
index 48802208b9f99fb51c59fa1eac4b87cd84fc1424..72ff8c04ae61b15fee3fac63ee61aa070d14f108 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 "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileWriter.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphFileWriterNew.cxx
index d81f32100cf08306adec9674ab2914e4ffda2ddc..d4487132fc7aeb5ce12b0a97510b1dbbb756d8b8 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 "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileWriter.h"
 #include "otbPolygon.h"
diff --git a/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx b/Testing/Code/SpatialReasoning/otbRCC8GraphIOEndToEnd.cxx
index 33511b005858367121bbf5782cd8437094727412..c9dd4f5fe5b2605a645ab8a9f7bebc9496fc7809 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 "otbRCC8Graph.h"
 #include "otbRCC8VertexBase.h"
 #include "otbRCC8GraphFileReader.h"
 #include "otbRCC8GraphFileWriter.h"
diff --git a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
index 55c7804e04e1f431fef7244124c6792e5b08193b..9c5f9c518521f2ff87f4e57bfbe33eacadfe75c7 100644
--- a/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
+++ b/Testing/Code/Wrappers/Qt/otbWrapperQtWidgetParameterFactory.cxx
@@ -20,9 +20,7 @@
 #endif
 
 #include "otbWrapperQtWidgetParameterFactory.h"
-#include "otbWrapperNumericalParameter.h"
 #include "otbWrapperStringParameter.h"
-#include "otbWrapperChoiceParameter.h"
 #include "otbWrapperEmptyParameter.h"
 
 #include "otbWrapperQtWidgetModel.h"
diff --git a/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx b/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
index f7db7ee2e799be78c04ce273a7fa85e24e6d447b..1add52d4406d2399218001c1af8bea90515324f3 100644
--- a/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
+++ b/Testing/Fa/0000307-ExtractROICompareRegionsImplementations.cxx
@@ -17,7 +17,6 @@
 =========================================================================*/
 
 
-#include "otbVectorImage.h"
 
 #include "itkExtractImageFilter.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
diff --git a/Testing/Fa/MapActivation.cxx b/Testing/Fa/MapActivation.cxx
index 121fac4f8798900eb03a8885f23ecea10b8c044e..25cdbdd0b3a8ccfb3f0e447a8cf8d9ccf0ed377d 100644
--- a/Testing/Fa/MapActivation.cxx
+++ b/Testing/Fa/MapActivation.cxx
@@ -39,7 +39,6 @@
 #include "itkListSample.h"
 
 #include "otbSOMClassifier.h"
-#include "itkMembershipSample.h"
 
 int main(int argc, char* argv[])
 {