From adf47cd860ee01239932b69dc8f23e1636063f0c Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 4 May 2015 10:24:42 +0200
Subject: [PATCH] BUG: fixing #1039, added include of patched class
 UnaryFunctorImageFilter

---
 Examples/BasicFilters/BandMathFilterExample.cxx                 | 1 +
 Examples/BasicFilters/IndexedToRGBExample.cxx                   | 1 +
 Examples/BasicFilters/ScalingFilterExample.cxx                  | 1 +
 Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx    | 1 +
 Examples/ChangeDetection/DiffChDet.cxx                          | 1 +
 Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx       | 1 +
 Examples/Classification/ScalarImageMarkovRandomField1.cxx       | 1 +
 Examples/DataRepresentation/Image/ImageAdaptor2.cxx             | 1 +
 Examples/DataRepresentation/Image/ImageAdaptor3.cxx             | 1 +
 Examples/DataRepresentation/Image/ImageAdaptor4.cxx             | 1 +
 Examples/DisparityMap/FineRegistrationImageFilterExample.cxx    | 1 +
 Examples/DisparityMap/NCCRegistrationFilterExample.cxx          | 1 +
 Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx   | 1 +
 Examples/DisparityMap/StereoReconstructionExample.cxx           | 1 +
 .../AssymmetricFusionOfLineDetectorExample.cxx                  | 1 +
 Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx   | 1 +
 Examples/FeatureExtraction/EdgeDensityExample.cxx               | 1 +
 Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx        | 1 +
 Examples/FeatureExtraction/PanTexExample.cxx                    | 1 +
 Examples/FeatureExtraction/RatioLineDetectorExample.cxx         | 1 +
 Examples/FeatureExtraction/SFSExample.cxx                       | 1 +
 Examples/FeatureExtraction/SeamCarvingExample.cxx               | 1 +
 Examples/FeatureExtraction/SeamCarvingOtherExample.cxx          | 1 +
 Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx         | 1 +
 Examples/Filtering/BinaryThresholdImageFilter.cxx               | 1 +
 Examples/Filtering/CannyEdgeDetectionImageFilter.cxx            | 1 +
 Examples/Filtering/CompositeFilterExample.cxx                   | 1 +
 Examples/Filtering/DanielssonDistanceMapImageFilter.cxx         | 1 +
 Examples/Filtering/DerivativeImageFilter.cxx                    | 1 +
 Examples/Filtering/DiscreteGaussianImageFilter.cxx              | 1 +
 Examples/Filtering/GradientAnisotropicDiffusionImageFilter.cxx  | 1 +
 Examples/Filtering/GradientMagnitudeImageFilter.cxx             | 1 +
 .../Filtering/GradientMagnitudeRecursiveGaussianImageFilter.cxx | 1 +
 Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx   | 1 +
 Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx   | 1 +
 Examples/Filtering/MathematicalMorphologyBinaryFilters.cxx      | 1 +
 Examples/Filtering/MathematicalMorphologyGrayscaleFilters.cxx   | 1 +
 Examples/Filtering/MeanImageFilter.cxx                          | 1 +
 Examples/Filtering/MedianImageFilter.cxx                        | 1 +
 Examples/IO/DEMToImageGenerator.cxx                             | 1 +
 Examples/IO/ImageReadCastWrite.cxx                              | 1 +
 Examples/IO/StreamingImageReadWrite.cxx                         | 1 +
 Examples/Iterators/NeighborhoodIterators1.cxx                   | 1 +
 Examples/Iterators/NeighborhoodIterators2.cxx                   | 1 +
 Examples/Iterators/NeighborhoodIterators3.cxx                   | 1 +
 Examples/Iterators/NeighborhoodIterators4.cxx                   | 1 +
 Examples/Iterators/NeighborhoodIterators5.cxx                   | 1 +
 Examples/Iterators/NeighborhoodIterators6.cxx                   | 1 +
 Examples/Learning/SEMModelEstimatorExample.cxx                  | 1 +
 Examples/Learning/SVMImageClassificationExample.cxx             | 1 +
 Examples/Markov/MarkovClassification1Example.cxx                | 1 +
 Examples/Markov/MarkovClassification2Example.cxx                | 1 +
 Examples/Markov/MarkovClassification3Example.cxx                | 1 +
 Examples/Markov/MarkovRegularizationExample.cxx                 | 1 +
 Examples/Markov/MarkovRestaurationExample.cxx                   | 1 +
 Examples/OBIA/ImageToLabelToImage.cxx                           | 1 +
 Examples/Patented/SIFTDisparityMapEstimation.cxx                | 1 +
 Examples/Projections/SensorModelExample.cxx                     | 2 +-
 Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx   | 1 +
 Examples/Registration/ImageRegistration1.cxx                    | 1 +
 Examples/Registration/ImageRegistration2.cxx                    | 2 +-
 Examples/Registration/ImageRegistration5.cxx                    | 1 +
 Examples/Registration/ImageRegistration9.cxx                    | 1 +
 Examples/Segmentation/ConfidenceConnected.cxx                   | 1 +
 Examples/Segmentation/ConnectedThresholdImageFilter.cxx         | 1 +
 Examples/Segmentation/FastMarchingImageFilter.cxx               | 1 +
 Examples/Segmentation/IsolatedConnectedImageFilter.cxx          | 1 +
 Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx      | 1 +
 Examples/Segmentation/OtsuMultipleThresholdImageFilter.cxx      | 1 +
 Examples/Segmentation/OtsuThresholdImageFilter.cxx              | 1 +
 Examples/Segmentation/WatershedSegmentation.cxx                 | 2 +-
 Examples/Tutorials/ScalingPipeline.cxx                          | 1 +
 Examples/Tutorials/SmarterFilteringPipeline.cxx                 | 1 +
 Modules/Applications/AppFusion/app/otbPansharpening.cxx         | 1 +
 .../Applications/AppSegmentation/app/otbLSMSSegmentation.cxx    | 1 +
 .../AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx          | 1 +
 Modules/Applications/AppStereo/app/otbStereoFramework.cxx       | 1 +
 .../Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx    | 2 +-
 Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx       | 2 +-
 .../include/otbBandsStatisticsAttributesLabelMapFilter.txx      | 1 +
 .../Core/ObjectList/test/otbImageListToImageListApplyFilter.cxx | 1 +
 .../ObjectList/test/otbImageListToImageListApplyFilterNew.cxx   | 1 +
 Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx    | 2 +-
 Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx      | 2 +-
 .../RoadExtraction/include/otbGenericRoadExtractionFilter.h     | 1 +
 .../Feature/Descriptors/test/otbFourierMellinImageFilter.cxx    | 1 +
 .../test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx         | 1 +
 Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h       | 1 +
 .../Edge/include/otbHoughTransform2DLinesImageFilter.txx        | 1 +
 Modules/Feature/Edge/include/otbLocalHoughFilter.h              | 2 +-
 .../ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx        | 1 +
 .../ChangeDetection/test/otbCorrelChangeDetectionTest.cxx       | 1 +
 .../ChangeDetection/test/otbJHMIChangeDetectionTest.cxx         | 1 +
 .../test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx    | 1 +
 .../ChangeDetection/test/otbLHMIChangeDetectionTest.cxx         | 1 +
 .../ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx     | 1 +
 .../ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx    | 1 +
 Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h   | 1 +
 .../ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx   | 1 +
 .../test/otbPerBandVectorImageFilterWithMeanFilter.cxx          | 1 +
 .../test/otbPerBandVectorImageFilterWithSobelFilter.cxx         | 1 +
 .../ImageManipulation/test/otbRegionProjectionResampler.cxx     | 2 +-
 .../ImageManipulation/test/otbShiftScaleImageAdaptor.cxx        | 1 +
 .../include/otbMorphologicalPyramidSegmenter.txx                | 1 +
 .../Projection/include/otbGCPsToRPCSensorModelImageFilter.h     | 1 +
 .../Projection/include/otbImportGeoInformationImageFilter.h     | 1 +
 .../Filtering/Projection/test/otbOrthoRectificationFilter.cxx   | 1 +
 .../Projection/test/otbOrthoRectificationFilterWithDEM.cxx      | 2 +-
 .../test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx   | 1 +
 Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx          | 1 +
 .../include/otbNeighborhoodMajorityVotingImageFilter.h          | 1 +
 .../include/otbLmvmPanSharpeningFusionImageFilter.h             | 1 +
 .../AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx         | 1 +
 .../AnomalyDetection/test/otbLocalRxDetectorTest.cxx            | 1 +
 .../EndmembersExtraction/include/otbVcaImageFilter.h            | 1 +
 Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx             | 2 +-
 Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx      | 1 +
 .../IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx | 1 +
 .../test/otbPipelineMetadataHandlingWithUFFilterTest.cxx        | 1 +
 .../ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx  | 1 +
 Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx     | 1 +
 Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx     | 1 +
 .../otbSarRadiometricCalibrationToImageFilterCompareTest.cxx    | 1 +
 .../otbBSplinesInterpolateTransformDisplacementFieldGenerator.h | 1 +
 .../Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx    | 1 +
 .../Conversion/include/otbRasterizeVectorDataFilter.h           | 1 +
 .../test/otbLabelizeConfidenceConnectedImageFilter.cxx          | 1 +
 .../include/otbClosingOpeningMorphologicalFilter.txx            | 2 +-
 .../include/otbGeodesicMorphologyDecompositionImageFilter.h     | 1 +
 .../include/otbMorphologicalClosingProfileFilter.h              | 1 +
 .../include/otbMorphologicalOpeningProfileFilter.h              | 1 +
 .../include/otbOpeningClosingMorphologicalFilter.txx            | 2 +-
 .../include/otbProfileToProfileDerivativeFilter.h               | 1 +
 .../otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx     | 1 +
 .../Watersheds/include/otbWatershedSegmentationFilter.h         | 1 +
 .../include/otbWrapperComplexInputImageParameter.txx            | 1 +
 .../ApplicationEngine/include/otbWrapperInputImageParameter.txx | 1 +
 .../src/otbWrapperComplexOutputImageParameter.cxx               | 1 +
 138 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/Examples/BasicFilters/BandMathFilterExample.cxx b/Examples/BasicFilters/BandMathFilterExample.cxx
index 5c46a12746..07d7a8d41f 100644
--- a/Examples/BasicFilters/BandMathFilterExample.cxx
+++ b/Examples/BasicFilters/BandMathFilterExample.cxx
@@ -48,6 +48,7 @@
 #include "otbVectorImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "otbVectorImageToImageListFilter.h"
 
diff --git a/Examples/BasicFilters/IndexedToRGBExample.cxx b/Examples/BasicFilters/IndexedToRGBExample.cxx
index f1be9aa53e..e27d3cef85 100644
--- a/Examples/BasicFilters/IndexedToRGBExample.cxx
+++ b/Examples/BasicFilters/IndexedToRGBExample.cxx
@@ -42,6 +42,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
 
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/BasicFilters/ScalingFilterExample.cxx b/Examples/BasicFilters/ScalingFilterExample.cxx
index 19966a873c..6928bb3b91 100644
--- a/Examples/BasicFilters/ScalingFilterExample.cxx
+++ b/Examples/BasicFilters/ScalingFilterExample.cxx
@@ -35,6 +35,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkCastImageFilter.h"
 
diff --git a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
index 7da4856721..1f595b5ddb 100644
--- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
@@ -38,6 +38,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbCommandProgressUpdate.h"
diff --git a/Examples/ChangeDetection/DiffChDet.cxx b/Examples/ChangeDetection/DiffChDet.cxx
index 70108cf357..d64088717d 100644
--- a/Examples/ChangeDetection/DiffChDet.cxx
+++ b/Examples/ChangeDetection/DiffChDet.cxx
@@ -52,6 +52,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkAbsImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
index 25ff0cb8d4..a68e7b1449 100644
--- a/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
+++ b/Examples/ChangeDetection/KullbackLeiblerDistanceChDet.cxx
@@ -78,6 +78,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginCodeSnippet
diff --git a/Examples/Classification/ScalarImageMarkovRandomField1.cxx b/Examples/Classification/ScalarImageMarkovRandomField1.cxx
index 0cc1364902..b12b4b4cc5 100644
--- a/Examples/Classification/ScalarImageMarkovRandomField1.cxx
+++ b/Examples/Classification/ScalarImageMarkovRandomField1.cxx
@@ -54,6 +54,7 @@
 #include "itkComposeImageFilter.h"
 // Software Guide : EndCodeSnippet
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginLatex
diff --git a/Examples/DataRepresentation/Image/ImageAdaptor2.cxx b/Examples/DataRepresentation/Image/ImageAdaptor2.cxx
index f6509e5e57..9b35188053 100644
--- a/Examples/DataRepresentation/Image/ImageAdaptor2.cxx
+++ b/Examples/DataRepresentation/Image/ImageAdaptor2.cxx
@@ -35,6 +35,7 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/DataRepresentation/Image/ImageAdaptor3.cxx b/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
index e3d0214b61..7a3fadc54a 100644
--- a/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
+++ b/Examples/DataRepresentation/Image/ImageAdaptor3.cxx
@@ -40,6 +40,7 @@
 #include "itkImageRegionIteratorWithIndex.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
diff --git a/Examples/DataRepresentation/Image/ImageAdaptor4.cxx b/Examples/DataRepresentation/Image/ImageAdaptor4.cxx
index ad29e772df..b778c85437 100644
--- a/Examples/DataRepresentation/Image/ImageAdaptor4.cxx
+++ b/Examples/DataRepresentation/Image/ImageAdaptor4.cxx
@@ -46,6 +46,7 @@
 #include "itkImageAdaptor.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
index a26830fdbf..0808cf5b4c 100644
--- a/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
+++ b/Examples/DisparityMap/FineRegistrationImageFilterExample.cxx
@@ -40,6 +40,7 @@
 
 #include "otbImageFileWriter.h"
 #include "otbImageFileReader.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRecursiveGaussianImageFilter.h"
 #include "otbWarpImageFilter.h"
 #include "itkMeanReciprocalSquareDifferenceImageToImageMetric.h"
diff --git a/Examples/DisparityMap/NCCRegistrationFilterExample.cxx b/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
index 16e3473da2..249de0157d 100644
--- a/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
+++ b/Examples/DisparityMap/NCCRegistrationFilterExample.cxx
@@ -43,6 +43,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkCastImageFilter.h"
 
diff --git a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
index 0f0bfc3760..09f78e7564 100644
--- a/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
+++ b/Examples/DisparityMap/SimpleDisparityMapEstimationExample.cxx
@@ -49,6 +49,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Examples/DisparityMap/StereoReconstructionExample.cxx b/Examples/DisparityMap/StereoReconstructionExample.cxx
index c2a51acce3..580ae92ce0 100644
--- a/Examples/DisparityMap/StereoReconstructionExample.cxx
+++ b/Examples/DisparityMap/StereoReconstructionExample.cxx
@@ -52,6 +52,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbBCOInterpolateImageFunction.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkVectorCastImageFilter.h"
 #include "otbImageList.h"
 #include "otbImageListToVectorImageFilter.h"
diff --git a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
index 63843fab64..d448324cfe 100644
--- a/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/AssymmetricFusionOfLineDetectorExample.cxx
@@ -37,6 +37,7 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
index 2a4a037c0e..c6bcfba20d 100644
--- a/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/CorrelationLineDetectorExample.cxx
@@ -41,6 +41,7 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/FeatureExtraction/EdgeDensityExample.cxx b/Examples/FeatureExtraction/EdgeDensityExample.cxx
index dc3db25a2b..ce39150ce0 100644
--- a/Examples/FeatureExtraction/EdgeDensityExample.cxx
+++ b/Examples/FeatureExtraction/EdgeDensityExample.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginCommandLineArgs
diff --git a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
index 4fee40497c..fd0bdfc3fc 100644
--- a/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
+++ b/Examples/FeatureExtraction/ExtractRoadByStepsExample.cxx
@@ -42,6 +42,7 @@
 #include "otbDrawPathListFilter.h"
 #include "otbLikelihoodPathListFilter.h"
 #include "otbMultiToMonoChannelExtractROI.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkSqrtImageFilter.h"
 
diff --git a/Examples/FeatureExtraction/PanTexExample.cxx b/Examples/FeatureExtraction/PanTexExample.cxx
index ebe0576b76..dae9bfc682 100644
--- a/Examples/FeatureExtraction/PanTexExample.cxx
+++ b/Examples/FeatureExtraction/PanTexExample.cxx
@@ -26,6 +26,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginLatex
diff --git a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
index 21a33d0828..6acf079110 100644
--- a/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
+++ b/Examples/FeatureExtraction/RatioLineDetectorExample.cxx
@@ -41,6 +41,7 @@
 
 #include "otbImage.h"
 #include "otbImageFileReader.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/FeatureExtraction/SFSExample.cxx b/Examples/FeatureExtraction/SFSExample.cxx
index 189519709a..eb9f364781 100644
--- a/Examples/FeatureExtraction/SFSExample.cxx
+++ b/Examples/FeatureExtraction/SFSExample.cxx
@@ -20,6 +20,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginCommandLineArgs
diff --git a/Examples/FeatureExtraction/SeamCarvingExample.cxx b/Examples/FeatureExtraction/SeamCarvingExample.cxx
index 74b53a9c0a..5880cd0473 100644
--- a/Examples/FeatureExtraction/SeamCarvingExample.cxx
+++ b/Examples/FeatureExtraction/SeamCarvingExample.cxx
@@ -39,6 +39,7 @@
 #include "itkPolyLineParametricPath.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx b/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx
index 1fdedcc7ee..354abe92b2 100644
--- a/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx
+++ b/Examples/FeatureExtraction/SeamCarvingOtherExample.cxx
@@ -39,6 +39,7 @@
 #include "itkPolyLineParametricPath.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
 
diff --git a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
index 967fafc4a6..d84ff817cc 100644
--- a/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
+++ b/Examples/FeatureExtraction/TouziEdgeDetectorExample.cxx
@@ -50,6 +50,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImageFileReader.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileWriter.h"
 
diff --git a/Examples/Filtering/BinaryThresholdImageFilter.cxx b/Examples/Filtering/BinaryThresholdImageFilter.cxx
index b7b0d65261..9dfb970535 100644
--- a/Examples/Filtering/BinaryThresholdImageFilter.cxx
+++ b/Examples/Filtering/BinaryThresholdImageFilter.cxx
@@ -53,6 +53,7 @@
 //
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkBinaryThresholdImageFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx b/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
index 079c967cb5..6a504f892c 100644
--- a/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
+++ b/Examples/Filtering/CannyEdgeDetectionImageFilter.cxx
@@ -40,6 +40,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Examples/Filtering/CompositeFilterExample.cxx b/Examples/Filtering/CompositeFilterExample.cxx
index 3e03a5324f..9b76116102 100644
--- a/Examples/Filtering/CompositeFilterExample.cxx
+++ b/Examples/Filtering/CompositeFilterExample.cxx
@@ -41,6 +41,7 @@
 //  Software Guide : EndLatex
 
 //  Software Guide : BeginCodeSnippet
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
 #include "itkThresholdImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Examples/Filtering/DanielssonDistanceMapImageFilter.cxx b/Examples/Filtering/DanielssonDistanceMapImageFilter.cxx
index b953c39e26..49c47a0c6b 100644
--- a/Examples/Filtering/DanielssonDistanceMapImageFilter.cxx
+++ b/Examples/Filtering/DanielssonDistanceMapImageFilter.cxx
@@ -50,6 +50,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 int main(int argc, char * argv[])
diff --git a/Examples/Filtering/DerivativeImageFilter.cxx b/Examples/Filtering/DerivativeImageFilter.cxx
index 84dcac7ff6..d42c6384ae 100644
--- a/Examples/Filtering/DerivativeImageFilter.cxx
+++ b/Examples/Filtering/DerivativeImageFilter.cxx
@@ -37,6 +37,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/DiscreteGaussianImageFilter.cxx b/Examples/Filtering/DiscreteGaussianImageFilter.cxx
index bfe8c23540..99d57066b3 100644
--- a/Examples/Filtering/DiscreteGaussianImageFilter.cxx
+++ b/Examples/Filtering/DiscreteGaussianImageFilter.cxx
@@ -55,6 +55,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/GradientAnisotropicDiffusionImageFilter.cxx b/Examples/Filtering/GradientAnisotropicDiffusionImageFilter.cxx
index c514ddafcf..6ed4b82ecd 100644
--- a/Examples/Filtering/GradientAnisotropicDiffusionImageFilter.cxx
+++ b/Examples/Filtering/GradientAnisotropicDiffusionImageFilter.cxx
@@ -46,6 +46,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/GradientMagnitudeImageFilter.cxx b/Examples/Filtering/GradientMagnitudeImageFilter.cxx
index 0c9f291b54..c62a79ad47 100644
--- a/Examples/Filtering/GradientMagnitudeImageFilter.cxx
+++ b/Examples/Filtering/GradientMagnitudeImageFilter.cxx
@@ -55,6 +55,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/GradientMagnitudeRecursiveGaussianImageFilter.cxx b/Examples/Filtering/GradientMagnitudeRecursiveGaussianImageFilter.cxx
index f4f003ff99..1f2ba87fb4 100644
--- a/Examples/Filtering/GradientMagnitudeRecursiveGaussianImageFilter.cxx
+++ b/Examples/Filtering/GradientMagnitudeRecursiveGaussianImageFilter.cxx
@@ -62,6 +62,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx b/Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx
index fd76687a6c..4c51ce9513 100644
--- a/Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx
+++ b/Examples/Filtering/LaplacianRecursiveGaussianImageFilter1.cxx
@@ -46,6 +46,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "itkAddImageFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 //  Software Guide : BeginLatex
 //
diff --git a/Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx b/Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx
index 46e77cb631..5ec77b22ec 100644
--- a/Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx
+++ b/Examples/Filtering/LaplacianRecursiveGaussianImageFilter2.cxx
@@ -48,6 +48,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 //  Software Guide : BeginLatex
 //
diff --git a/Examples/Filtering/MathematicalMorphologyBinaryFilters.cxx b/Examples/Filtering/MathematicalMorphologyBinaryFilters.cxx
index 8c8aa26903..b0ac233490 100644
--- a/Examples/Filtering/MathematicalMorphologyBinaryFilters.cxx
+++ b/Examples/Filtering/MathematicalMorphologyBinaryFilters.cxx
@@ -41,6 +41,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
 #include "itkBinaryErodeImageFilter.h"
diff --git a/Examples/Filtering/MathematicalMorphologyGrayscaleFilters.cxx b/Examples/Filtering/MathematicalMorphologyGrayscaleFilters.cxx
index acadcb1d3d..150465a4a8 100644
--- a/Examples/Filtering/MathematicalMorphologyGrayscaleFilters.cxx
+++ b/Examples/Filtering/MathematicalMorphologyGrayscaleFilters.cxx
@@ -42,6 +42,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
 #include "itkGrayscaleErodeImageFilter.h"
diff --git a/Examples/Filtering/MeanImageFilter.cxx b/Examples/Filtering/MeanImageFilter.cxx
index 433433df27..154dba2b10 100644
--- a/Examples/Filtering/MeanImageFilter.cxx
+++ b/Examples/Filtering/MeanImageFilter.cxx
@@ -63,6 +63,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 //  Software Guide : BeginLatex
 //
diff --git a/Examples/Filtering/MedianImageFilter.cxx b/Examples/Filtering/MedianImageFilter.cxx
index 13c3e5222a..f7850f56a3 100644
--- a/Examples/Filtering/MedianImageFilter.cxx
+++ b/Examples/Filtering/MedianImageFilter.cxx
@@ -64,6 +64,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 
 //  Software Guide : BeginLatex
 //
diff --git a/Examples/IO/DEMToImageGenerator.cxx b/Examples/IO/DEMToImageGenerator.cxx
index 55418b329d..862b044818 100644
--- a/Examples/IO/DEMToImageGenerator.cxx
+++ b/Examples/IO/DEMToImageGenerator.cxx
@@ -43,6 +43,7 @@
 #include "otbDEMToImageGenerator.h"
 // Software Guide : EndCodeSnippet
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkThresholdImageFilter.h"
 #include "itkMacro.h"
diff --git a/Examples/IO/ImageReadCastWrite.cxx b/Examples/IO/ImageReadCastWrite.cxx
index 90a0cc014c..caa784ebb1 100644
--- a/Examples/IO/ImageReadCastWrite.cxx
+++ b/Examples/IO/ImageReadCastWrite.cxx
@@ -43,6 +43,7 @@
 // Software Guide : BeginCodeSnippet
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 // Software Guide : EndCodeSnippet
 
diff --git a/Examples/IO/StreamingImageReadWrite.cxx b/Examples/IO/StreamingImageReadWrite.cxx
index 3802b15e05..53c2037c45 100644
--- a/Examples/IO/StreamingImageReadWrite.cxx
+++ b/Examples/IO/StreamingImageReadWrite.cxx
@@ -56,6 +56,7 @@
 #include "otbImageFileWriter.h"
 // Software Guide : EndCodeSnippet
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 
diff --git a/Examples/Iterators/NeighborhoodIterators1.cxx b/Examples/Iterators/NeighborhoodIterators1.cxx
index 4a46d55846..f2c5e9c579 100644
--- a/Examples/Iterators/NeighborhoodIterators1.cxx
+++ b/Examples/Iterators/NeighborhoodIterators1.cxx
@@ -42,6 +42,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginCodeSnippet
diff --git a/Examples/Iterators/NeighborhoodIterators2.cxx b/Examples/Iterators/NeighborhoodIterators2.cxx
index dbe2a1f9ee..7c5c4ee3a8 100644
--- a/Examples/Iterators/NeighborhoodIterators2.cxx
+++ b/Examples/Iterators/NeighborhoodIterators2.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/Iterators/NeighborhoodIterators3.cxx b/Examples/Iterators/NeighborhoodIterators3.cxx
index fbfab1aeaa..c370170406 100644
--- a/Examples/Iterators/NeighborhoodIterators3.cxx
+++ b/Examples/Iterators/NeighborhoodIterators3.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/Iterators/NeighborhoodIterators4.cxx b/Examples/Iterators/NeighborhoodIterators4.cxx
index fd614641c5..2b82910f74 100644
--- a/Examples/Iterators/NeighborhoodIterators4.cxx
+++ b/Examples/Iterators/NeighborhoodIterators4.cxx
@@ -40,6 +40,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/Iterators/NeighborhoodIterators5.cxx b/Examples/Iterators/NeighborhoodIterators5.cxx
index b0ad05332c..610ac1981a 100644
--- a/Examples/Iterators/NeighborhoodIterators5.cxx
+++ b/Examples/Iterators/NeighborhoodIterators5.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/Iterators/NeighborhoodIterators6.cxx b/Examples/Iterators/NeighborhoodIterators6.cxx
index f569e2207f..50ffe87017 100644
--- a/Examples/Iterators/NeighborhoodIterators6.cxx
+++ b/Examples/Iterators/NeighborhoodIterators6.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkNeighborhoodIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Examples/Learning/SEMModelEstimatorExample.cxx b/Examples/Learning/SEMModelEstimatorExample.cxx
index e5dfca9b67..bb396e9063 100644
--- a/Examples/Learning/SEMModelEstimatorExample.cxx
+++ b/Examples/Learning/SEMModelEstimatorExample.cxx
@@ -42,6 +42,7 @@
 
 #include "itkVector.h"
 #include "itkVariableLengthVector.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 //  Software Guide : BeginCodeSnippet
diff --git a/Examples/Learning/SVMImageClassificationExample.cxx b/Examples/Learning/SVMImageClassificationExample.cxx
index 7f7db00eac..86b6dc7a2f 100644
--- a/Examples/Learning/SVMImageClassificationExample.cxx
+++ b/Examples/Learning/SVMImageClassificationExample.cxx
@@ -21,6 +21,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 
diff --git a/Examples/Markov/MarkovClassification1Example.cxx b/Examples/Markov/MarkovClassification1Example.cxx
index 4b8996eada..4889dc880d 100644
--- a/Examples/Markov/MarkovClassification1Example.cxx
+++ b/Examples/Markov/MarkovClassification1Example.cxx
@@ -42,6 +42,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginLatex
diff --git a/Examples/Markov/MarkovClassification2Example.cxx b/Examples/Markov/MarkovClassification2Example.cxx
index 5872176dd1..a17b04918f 100644
--- a/Examples/Markov/MarkovClassification2Example.cxx
+++ b/Examples/Markov/MarkovClassification2Example.cxx
@@ -38,6 +38,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginLatex
diff --git a/Examples/Markov/MarkovClassification3Example.cxx b/Examples/Markov/MarkovClassification3Example.cxx
index a6188d8b7c..ded3268194 100644
--- a/Examples/Markov/MarkovClassification3Example.cxx
+++ b/Examples/Markov/MarkovClassification3Example.cxx
@@ -45,6 +45,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 
diff --git a/Examples/Markov/MarkovRegularizationExample.cxx b/Examples/Markov/MarkovRegularizationExample.cxx
index 3107b8faf7..4f9ddddd70 100644
--- a/Examples/Markov/MarkovRegularizationExample.cxx
+++ b/Examples/Markov/MarkovRegularizationExample.cxx
@@ -45,6 +45,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkLabelStatisticsImageFilter.h"
 
diff --git a/Examples/Markov/MarkovRestaurationExample.cxx b/Examples/Markov/MarkovRestaurationExample.cxx
index 8542571338..92bfad7d23 100644
--- a/Examples/Markov/MarkovRestaurationExample.cxx
+++ b/Examples/Markov/MarkovRestaurationExample.cxx
@@ -51,6 +51,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 // Software Guide : BeginLatex
diff --git a/Examples/OBIA/ImageToLabelToImage.cxx b/Examples/OBIA/ImageToLabelToImage.cxx
index 0ad5eb9773..5b0cecadd4 100644
--- a/Examples/OBIA/ImageToLabelToImage.cxx
+++ b/Examples/OBIA/ImageToLabelToImage.cxx
@@ -31,6 +31,7 @@
 //
 //  Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkBinaryImageToLabelMapFilter.h"
 #include "itkLabelMapToLabelImageFilter.h"
diff --git a/Examples/Patented/SIFTDisparityMapEstimation.cxx b/Examples/Patented/SIFTDisparityMapEstimation.cxx
index 14af017876..35a2f989ba 100644
--- a/Examples/Patented/SIFTDisparityMapEstimation.cxx
+++ b/Examples/Patented/SIFTDisparityMapEstimation.cxx
@@ -49,6 +49,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkPointSet.h"
 #include "otbMultiToMonoChannelExtractROI.h"
diff --git a/Examples/Projections/SensorModelExample.cxx b/Examples/Projections/SensorModelExample.cxx
index c662a51dc7..d8753bcb4b 100644
--- a/Examples/Projections/SensorModelExample.cxx
+++ b/Examples/Projections/SensorModelExample.cxx
@@ -20,7 +20,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkLinearInterpolateImageFunction.h"
diff --git a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
index aaddaafc2b..1cb99171a5 100644
--- a/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
+++ b/Examples/Radiometry/NDVIRAndNIRVegetationIndexImageFilter.cxx
@@ -68,6 +68,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 int main(int argc, char *argv[])
diff --git a/Examples/Registration/ImageRegistration1.cxx b/Examples/Registration/ImageRegistration1.cxx
index 839b4f87c0..ded1c98470 100644
--- a/Examples/Registration/ImageRegistration1.cxx
+++ b/Examples/Registration/ImageRegistration1.cxx
@@ -51,6 +51,7 @@
 #include "itkRegularStepGradientDescentOptimizer.h"
 #include "otbImage.h"
 // Software Guide : EndCodeSnippet
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 
 #include "otbImageFileReader.h"
diff --git a/Examples/Registration/ImageRegistration2.cxx b/Examples/Registration/ImageRegistration2.cxx
index 5b7cd0572d..250249c120 100644
--- a/Examples/Registration/ImageRegistration2.cxx
+++ b/Examples/Registration/ImageRegistration2.cxx
@@ -36,7 +36,7 @@
 // following headers declare the basic components of this registration method.
 //
 // Software Guide : EndLatex
-
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkImageRegistrationMethod.h"
 #include "itkTranslationTransform.h"
diff --git a/Examples/Registration/ImageRegistration5.cxx b/Examples/Registration/ImageRegistration5.cxx
index 5c4110ab2b..99ceedad46 100644
--- a/Examples/Registration/ImageRegistration5.cxx
+++ b/Examples/Registration/ImageRegistration5.cxx
@@ -48,6 +48,7 @@
 //
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegistrationMethod.h"
 #include "itkMeanSquaresImageToImageMetric.h"
 #include "itkRegularStepGradientDescentOptimizer.h"
diff --git a/Examples/Registration/ImageRegistration9.cxx b/Examples/Registration/ImageRegistration9.cxx
index 3cc37f2bda..5e1cd81eb7 100644
--- a/Examples/Registration/ImageRegistration9.cxx
+++ b/Examples/Registration/ImageRegistration9.cxx
@@ -40,6 +40,7 @@
 //
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegistrationMethod.h"
 #include "itkMeanSquaresImageToImageMetric.h"
 #include "itkRegularStepGradientDescentOptimizer.h"
diff --git a/Examples/Segmentation/ConfidenceConnected.cxx b/Examples/Segmentation/ConfidenceConnected.cxx
index 37f1e5a2eb..343e456987 100644
--- a/Examples/Segmentation/ConfidenceConnected.cxx
+++ b/Examples/Segmentation/ConfidenceConnected.cxx
@@ -80,6 +80,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Segmentation/ConnectedThresholdImageFilter.cxx b/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
index 1dcde98ff8..ced8be1350 100644
--- a/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
+++ b/Examples/Segmentation/ConnectedThresholdImageFilter.cxx
@@ -71,6 +71,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Segmentation/FastMarchingImageFilter.cxx b/Examples/Segmentation/FastMarchingImageFilter.cxx
index 0479794af6..f73c19cd7f 100644
--- a/Examples/Segmentation/FastMarchingImageFilter.cxx
+++ b/Examples/Segmentation/FastMarchingImageFilter.cxx
@@ -104,6 +104,7 @@
 //
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkCurvatureAnisotropicDiffusionImageFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Segmentation/IsolatedConnectedImageFilter.cxx b/Examples/Segmentation/IsolatedConnectedImageFilter.cxx
index a361bad692..89cdb70be3 100644
--- a/Examples/Segmentation/IsolatedConnectedImageFilter.cxx
+++ b/Examples/Segmentation/IsolatedConnectedImageFilter.cxx
@@ -55,6 +55,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "itkCurvatureFlowImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx b/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
index 63167a6ec1..076e1269e5 100644
--- a/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
+++ b/Examples/Segmentation/NeighborhoodConnectedImageFilter.cxx
@@ -62,6 +62,7 @@
 // Software Guide : EndCodeSnippet
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 
 //  Software Guide : BeginLatex
diff --git a/Examples/Segmentation/OtsuMultipleThresholdImageFilter.cxx b/Examples/Segmentation/OtsuMultipleThresholdImageFilter.cxx
index 0c1ef82573..11faabf21c 100644
--- a/Examples/Segmentation/OtsuMultipleThresholdImageFilter.cxx
+++ b/Examples/Segmentation/OtsuMultipleThresholdImageFilter.cxx
@@ -29,6 +29,7 @@
 // This example illustrates how to use the \doxygen{itk}{OtsuMultipleThresholdsCalculator}.
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkOtsuMultipleThresholdsCalculator.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Segmentation/OtsuThresholdImageFilter.cxx b/Examples/Segmentation/OtsuThresholdImageFilter.cxx
index 951ddb1aaf..7037997a72 100644
--- a/Examples/Segmentation/OtsuThresholdImageFilter.cxx
+++ b/Examples/Segmentation/OtsuThresholdImageFilter.cxx
@@ -32,6 +32,7 @@
 //
 // Software Guide : EndLatex
 
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkOtsuThresholdImageFilter.h"
 // Software Guide : EndCodeSnippet
diff --git a/Examples/Segmentation/WatershedSegmentation.cxx b/Examples/Segmentation/WatershedSegmentation.cxx
index 4d8f358111..9ae943f493 100644
--- a/Examples/Segmentation/WatershedSegmentation.cxx
+++ b/Examples/Segmentation/WatershedSegmentation.cxx
@@ -55,7 +55,7 @@
 //
 // Software Guide : EndLatex
 #include <iostream>
-
+#include "itkUnaryFunctorImageFilter.h"
 // Software Guide : BeginCodeSnippet
 #include "itkVectorGradientAnisotropicDiffusionImageFilter.h"
 #include "itkVectorGradientMagnitudeImageFilter.h"
diff --git a/Examples/Tutorials/ScalingPipeline.cxx b/Examples/Tutorials/ScalingPipeline.cxx
index 9d9de037cc..8ceacedf45 100644
--- a/Examples/Tutorials/ScalingPipeline.cxx
+++ b/Examples/Tutorials/ScalingPipeline.cxx
@@ -37,6 +37,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCannyEdgeDetectionImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Examples/Tutorials/SmarterFilteringPipeline.cxx b/Examples/Tutorials/SmarterFilteringPipeline.cxx
index 03974a85b5..b47b17a57c 100644
--- a/Examples/Tutorials/SmarterFilteringPipeline.cxx
+++ b/Examples/Tutorials/SmarterFilteringPipeline.cxx
@@ -74,6 +74,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbHarrisImageFilter.h"
 
diff --git a/Modules/Applications/AppFusion/app/otbPansharpening.cxx b/Modules/Applications/AppFusion/app/otbPansharpening.cxx
index 4d5b55f8f5..41d98e0fdc 100644
--- a/Modules/Applications/AppFusion/app/otbPansharpening.cxx
+++ b/Modules/Applications/AppFusion/app/otbPansharpening.cxx
@@ -17,6 +17,7 @@
  =========================================================================*/
 #include "otbWrapperApplicationFactory.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
 #include "otbGenericRSResampleImageFilter.h"
 #include "otbBCOInterpolateImageFunction.h"
diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
index ea4c099074..1af6e23b92 100644
--- a/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLSMSSegmentation.cxx
@@ -21,6 +21,7 @@
 #include "otbExtractROI.h"
 #include "otbConnectedComponentMuParserFunctor.h"
 #include "otbBandMathImageFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkStatisticsImageFilter.h"
 #include "itkChangeLabelImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
index b8748ba544..9ea8f9013a 100644
--- a/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
+++ b/Modules/Applications/AppSegmentation/app/otbLSMSSmallRegionsMerging.cxx
@@ -21,6 +21,7 @@
 
 #include "otbStreamingStatisticsImageFilter.h"
 #include "otbSystem.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkChangeLabelImageFilter.h"
 
 #include "otbTileImageFilter.h"
diff --git a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
index 087b005f10..16f86b131f 100644
--- a/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
+++ b/Modules/Applications/AppStereo/app/otbStereoFramework.cxx
@@ -33,6 +33,7 @@
 #include "otbVectorImageToImageListFilter.h"
 #include "otbBCOInterpolateImageFunction.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkVectorCastImageFilter.h"
 #include "itkInverseDisplacementFieldImageFilter.h"
 
diff --git a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
index 16f414581c..a892c59468 100644
--- a/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
+++ b/Modules/Core/ComplexImage/test/otbAmplitudePhaseToRGBFunctor.cxx
@@ -21,7 +21,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbAmplitudePhaseToRGBFunctor.h"
 #include "itkComplexToModulusImageFilter.h"
diff --git a/Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx b/Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx
index 75aba80b67..0969d34341 100644
--- a/Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx
+++ b/Modules/Core/ImageBase/test/otbExtractROITestMetaData.cxx
@@ -18,7 +18,7 @@
 #include <iostream>
 #include <fstream>
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
 #include "otbExtractROI.h"
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
index 4ae3e99d63..2ad41886e6 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.txx
@@ -19,6 +19,7 @@
 #define __otbBandsStatisticsAttributesLabelMapFilter_txx
 
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkVectorIndexSelectionCastImageFilter.h"
 
 namespace otb
diff --git a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilter.cxx b/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilter.cxx
index 6fa2385b20..89284ae919 100644
--- a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilter.cxx
+++ b/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilter.cxx
@@ -20,6 +20,7 @@
 #include "otbImageListToImageListApplyFilter.h"
 #include "otbImageList.h"
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx b/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx
index b384b03f55..26f71d6fcb 100644
--- a/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx
+++ b/Modules/Core/ObjectList/test/otbImageListToImageListApplyFilterNew.cxx
@@ -20,6 +20,7 @@
 #include "otbImageListToImageListApplyFilter.h"
 #include "otbImageList.h"
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 
 int otbImageListToImageListApplyFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx b/Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx
index edf5a90fe0..0e69743f65 100644
--- a/Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx
+++ b/Modules/Core/Transform/test/otbCreateProjectionWithOSSIM.cxx
@@ -36,7 +36,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx b/Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx
index 5569243756..a02b23b2b8 100644
--- a/Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx
+++ b/Modules/Core/Transform/test/otbCreateProjectionWithOTB.cxx
@@ -36,7 +36,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index 57c2fbd5d1..623ad4b2cf 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -18,6 +18,7 @@
 #ifndef __otbGenericRoadExtractionFilter_h
 #define __otbGenericRoadExtractionFilter_h
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
 
 #include "otbVectorImage.h"
diff --git a/Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx b/Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx
index 704b85d455..4366e1dd8b 100644
--- a/Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx
+++ b/Modules/Feature/Descriptors/test/otbFourierMellinImageFilter.cxx
@@ -21,6 +21,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbForwardFourierMellinTransformImageFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkLinearInterpolateImageFunction.h"
 #include "itkComplexToImaginaryImageFilter.h"
 #include "itkComplexToRealImageFilter.h"
diff --git a/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
index b816f3171b..03f2994802 100644
--- a/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
+++ b/Modules/Feature/Descriptors/test/otbImageToSIFTKeyPointSetFilterDistanceMap.cxx
@@ -18,6 +18,7 @@
 #include <iostream>
 #include <fstream>
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkPointSet.h"
 #include "itkVariableLengthVector.h"
 #include "itkResampleImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index 2915a7249a..a4955334bc 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -20,6 +20,7 @@
 #ifndef __otbEdgeDetectorImageFilter_h
 #define __otbEdgeDetectorImageFilter_h
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageToImageFilter.h"
 #include "itkBinaryThresholdImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
index a7b0f8397d..8f1baac483 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.txx
@@ -19,6 +19,7 @@
 #define __otbHoughTransform2DLinesImageFilter_txx
 
 #include "otbHoughTransform2DLinesImageFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index 1a1ce959ab..f2fd238609 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -18,7 +18,7 @@
 #ifndef __otbLocalHoughFilter_h
 #define __otbLocalHoughFilter_h
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkHoughTransform2DLinesImageFilter.h"
 
 #include "otbImageToLineSpatialObjectListFilter.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx
index a83a15188a..eff54e8bbd 100644
--- a/Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbCBAMIChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbCBAMIChangeDetector.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx
index 2efeb9d828..5bfdfa8798 100644
--- a/Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbCorrelChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbCorrelationChangeDetector.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx
index 8b17413e0b..47ce860318 100644
--- a/Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbJHMIChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbJoinHistogramMIImageFilter.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
index e01bdee6bb..d0621a6363 100644
--- a/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbKullbackLeiblerSupervizedDistanceImageFilter.cxx
@@ -19,6 +19,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
 #include "otbCommandProgressUpdate.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx
index 36089e4e77..361ff75fb6 100644
--- a/Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbLHMIChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbLHMIChangeDetector.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx
index 7b166b0ee6..1fb524a2de 100644
--- a/Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbMeanDiffChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbMeanDifferenceImageFilter.h"
diff --git a/Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx b/Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx
index 3342a03f30..37a57078be 100644
--- a/Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx
+++ b/Modules/Filtering/ChangeDetection/test/otbMeanRatioChangeDetectionTest.cxx
@@ -18,6 +18,7 @@
 
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImage.h"
 #include "otbMeanRatioImageFilter.h"
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
index fcf613e9df..42368ea14d 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
@@ -23,6 +23,7 @@
 
 #include "otbImage.h"
 #include "otbVectorImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGradientMagnitudeImageFilter.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
 #include "itkAtan2ImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
index 7c3be25d0f..f1f5874fd2 100644
--- a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterNew.cxx
@@ -19,6 +19,7 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 
 int otbPerBandVectorImageFilterNew(int itkNotUsed(argc), char * itkNotUsed(argv) [])
diff --git a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx
index 9dec737c8c..d36eb3d56c 100644
--- a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithMeanFilter.cxx
@@ -19,6 +19,7 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx
index f8050a0d03..ebb745a637 100644
--- a/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbPerBandVectorImageFilterWithSobelFilter.cxx
@@ -19,6 +19,7 @@
 
 #include "otbPerBandVectorImageFilter.h"
 #include "otbVectorImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkSobelEdgeDetectionImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx b/Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx
index 1f1363d7f0..4984bdad5f 100644
--- a/Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbRegionProjectionResampler.cxx
@@ -34,7 +34,7 @@
 #include "otbImageFileWriter.h"
 #include "otbStreamingResampleImageFilter.h"
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkResampleImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx b/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx
index ac598412c8..ddc7f4083e 100644
--- a/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx
+++ b/Modules/Filtering/ImageManipulation/test/otbShiftScaleImageAdaptor.cxx
@@ -20,6 +20,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbShiftScaleImageAdaptor.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
index ed5d99c92a..e67e86c695 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.txx
@@ -21,6 +21,7 @@
 #include "otbMorphologicalPyramidSegmenter.h"
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkConnectedThresholdImageFilter.h"
 #include "itkConnectedComponentImageFilter.h"
 #include "itkRelabelComponentImageFilter.h"
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index 26d21d2d15..15f8d95888 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -18,6 +18,7 @@
 #ifndef __otbGCPsToRPCSensorModelImageFilter_h
 #define __otbGCPsToRPCSensorModelImageFilter_h
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "otbDEMHandler.h"
 
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 85b27ade41..9b4e931260 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -18,6 +18,7 @@
 #ifndef __otbImportGeoInformationImageFilter_h
 #define __otbImportGeoInformationImageFilter_h
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 
 namespace otb
diff --git a/Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx
index 7ddb0dde91..a718c854db 100644
--- a/Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx
+++ b/Modules/Filtering/Projection/test/otbOrthoRectificationFilter.cxx
@@ -24,6 +24,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbMapProjections.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkComplexToModulusImageFilter.h"
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "otbOrthoRectificationFilter.h"
diff --git a/Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx b/Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx
index 7992ac46c5..8d5501232e 100644
--- a/Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx
+++ b/Modules/Filtering/Projection/test/otbOrthoRectificationFilterWithDEM.cxx
@@ -27,7 +27,7 @@
 #include "otbImageFileWriter.h"
 #include "otbStreamingResampleImageFilter.h"
 
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkExtractImageFilter.h"
 #include "itkResampleImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
diff --git a/Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx b/Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
index 1ea04fcefd..1fcc99b952 100644
--- a/Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
+++ b/Modules/Filtering/Statistics/test/otbRealAndImaginaryImageToComplexImageFilterTest.cxx
@@ -22,6 +22,7 @@
 #include "otbImageFileReader.h"
 #include "otbImage.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkComplexToRealImageFilter.h"
 #include "itkComplexToImaginaryImageFilter.h"
 #include "otbStreamingCompareImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx b/Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx
index 11d3ed63ac..053f5fe52f 100644
--- a/Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx
+++ b/Modules/Filtering/Wavelet/test/otbWaveletTransform.cxx
@@ -22,6 +22,7 @@
 #include "otbImage.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 #include "otbWaveletOperator.h"
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index 5084c6cce4..39d04f689a 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -23,6 +23,7 @@
 // gets integrated into the main directories.
 #include "itkConfigure.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMorphologyImageFilter.h"
 #include "itkBinaryBallStructuringElement.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index 633b1e12d7..5594b7364a 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -22,6 +22,7 @@
 #define __otbLmvmPanSharpeningFusionImageFilter_h
 
 #include "otbConvolutionImageFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkTernaryFunctorImageFilter.h"
 #include "otbPerBandVectorImageFilter.h"
 #include "itkNoiseImageFilter.h"
diff --git a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx
index 6cc603993f..ae8904d615 100644
--- a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx
+++ b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorRoiTest.cxx
@@ -2,6 +2,7 @@
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbLocalRxDetectorNonThreadFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbExtractROI.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
index 8093676301..b4b14fcd73 100644
--- a/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
+++ b/Modules/Hyperspectral/AnomalyDetection/test/otbLocalRxDetectorTest.cxx
@@ -3,6 +3,7 @@
 #include "otbVectorImage.h"
 #include "otbImageFileWriter.h"
 #include "otbLocalRxDetectorFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 int LocalRXDetectorNewTest(int itkNotUsed(argc), char * itkNotUsed(argv)[])
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index 1577ce8e1a..3d1524811a 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -22,6 +22,7 @@
 #define __otbVCAImageFilter_h
 
 #include "otbImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkAbsImageFilter.h"
 #include "otbDotProductImageFilter.h"
 #include "otbProjectiveProjectionImageFilter.h"
diff --git a/Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx
index 0e249f9bfe..e2c1aab2f8 100644
--- a/Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx
+++ b/Modules/IO/ImageIO/test/otbImageFileReaderMSTAR.cxx
@@ -21,8 +21,8 @@
 #include "otbVectorImage.h"
 #include "otbImage.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
-
 #include "itkRescaleIntensityImageFilter.h"
 
 int otbImageFileReaderMSTAR(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx b/Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx
index 21e05d4731..8cb55cecbb 100644
--- a/Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx
+++ b/Modules/IO/ImageIO/test/otbImageFileReaderONERAComplex.cxx
@@ -19,6 +19,7 @@
 
 
 #include <iostream>
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkComplexToRealImageFilter.h"
 #include "itkComplexToImaginaryImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx b/Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx
index 3dd211618e..373330b034 100644
--- a/Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx
+++ b/Modules/IO/ImageIO/test/otbImageFileWriterStreamingONERAComplex.cxx
@@ -21,6 +21,7 @@
 #include "otbImage.h"
 #include "itkMacro.h"
 #include <iostream>
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkComplexToModulusImageFilter.h"
 #include "itkStreamingImageFilter.h"
 #include "otbImageFileReader.h"
diff --git a/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx b/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx
index d194750e73..77ed8ebaf9 100644
--- a/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx
+++ b/Modules/IO/ImageIO/test/otbPipelineMetadataHandlingWithUFFilterTest.cxx
@@ -21,6 +21,7 @@
 #include "otbImage.h"
 #include "itkMacro.h"
 #include <iostream>
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
diff --git a/Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx
index 99c23c6e28..3c07f38744 100644
--- a/Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx
+++ b/Modules/IO/ImageIO/test/otbStreamingImageFileWriterWithFilterTest.cxx
@@ -26,6 +26,7 @@
 #include "otbImageFileReader.h"
 #include "otbImageFileWriter.h"
 #include "otbImageFileWriter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkMeanImageFilter.h"
 
 int otbImageFileWriterWithFilterTest(int itkNotUsed(argc), char* argv[])
diff --git a/Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx b/Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx
index 15467cafac..5e08405e9b 100644
--- a/Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx
+++ b/Modules/Learning/Markov/test/otbMarkovRandomFieldFilter.cxx
@@ -21,6 +21,7 @@
 #include "otbImageFileWriter.h"
 #include "otbImage.h"
 #include "otbMarkovRandomFieldFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkRescaleIntensityImageFilter.h"
 
 #include "otbMRFEnergyPotts.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
index f587f49196..4a4c4d2aab 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.txx
@@ -19,6 +19,7 @@
 #define __otbImageToImageRCC8Calculator_txx
 
 #include "otbImageToImageRCC8Calculator.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkBinaryDilateImageFilter.h"
 #include "itkBinaryBallStructuringElement.h"
 #include "itkInvertIntensityImageFilter.h"
diff --git a/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
index 479d73a082..a6191f348c 100644
--- a/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
+++ b/Modules/Radiometry/SARCalibration/test/otbSarRadiometricCalibrationToImageFilterCompareTest.cxx
@@ -19,6 +19,7 @@
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbImageFileReader.h"
 #include "otbExtractROI.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkComplexToModulusImageFilter.h"
 #include  "otbStreamingCompareImageFilter.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index 52a7a77a6a..a60acfc31b 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -19,6 +19,7 @@
 #define __otbBSplinesInterpolateTransformDisplacementFieldGenerator_h
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkBSplineScatteredDataPointSetToImageFilter.h"
 #include "itkBSplineControlPointImageFunction.h"
 #include "otbImage.h"
diff --git a/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx b/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
index 0be1215226..08f7409d38 100644
--- a/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
+++ b/Modules/Registration/Stereo/test/otbStereoSensorModelToElevationMapFilter.cxx
@@ -27,6 +27,7 @@
 #include "otbImageList.h"
 #include "otbImageListToVectorImageFilter.h"
 #include "otbVectorImage.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkDiscreteGaussianImageFilter.h"
 #include "itkMedianImageFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index a8e7ad8fc5..32e8d621e9 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -18,6 +18,7 @@
 #ifndef __otbRasterizeVectorDataFilter_h
 #define __otbRasterizeVectorDataFilter_h
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkImageToImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx b/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx
index bac39f5075..ac1c87465c 100644
--- a/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx
+++ b/Modules/Segmentation/Labelling/test/otbLabelizeConfidenceConnectedImageFilter.cxx
@@ -19,6 +19,7 @@
 
 #include <iostream>
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkScalarToRGBPixelFunctor.h"
 #include "itkRescaleIntensityImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
index 4ab042b16a..a463e52350 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.txx
@@ -19,7 +19,7 @@
 #define __otbClosingOpeningMorphologicalFilter_txx
 
 #include "otbClosingOpeningMorphologicalFilter.h"
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGrayscaleMorphologicalOpeningImageFilter.h"
 #include "itkGrayscaleMorphologicalClosingImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index 41b4e93458..e7bdcf20e8 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -19,6 +19,7 @@
 #define __otbGeodesicMorphologyDecompositionImageFilter_h
 
 #include "otbGeodesicMorphologyLevelingFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkSubtractImageFilter.h"
 #include "itkOpeningByReconstructionImageFilter.h"
 #include "itkClosingByReconstructionImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
index b82fd77bf5..22624a9d9c 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalClosingProfileFilter.h
@@ -19,6 +19,7 @@
 #define __otbMorphologicalClosingProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkClosingByReconstructionImageFilter.h"
 
 namespace otb
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
index 8764c95be0..08197bfa6a 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalOpeningProfileFilter.h
@@ -19,6 +19,7 @@
 #define __otbMorphologicalOpeningProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkOpeningByReconstructionImageFilter.h"
 
 namespace otb
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
index 373fc005a2..66955a3e74 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.txx
@@ -19,7 +19,7 @@
 #define __otbOpeningClosingMorphologicalFilter_txx
 
 #include "otbOpeningClosingMorphologicalFilter.h"
-
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkGrayscaleMorphologicalOpeningImageFilter.h"
 #include "itkGrayscaleMorphologicalClosingImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index 0c899f10f1..98048b8aa8 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -19,6 +19,7 @@
 #define __otbProfileToProfileDerivativeFilter_h
 
 #include "otbImageListToImageListFilter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkSubtractImageFilter.h"
 #include "itkAbsImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx b/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
index c3a381f601..b255da93ad 100644
--- a/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
+++ b/Modules/Segmentation/MorphologicalProfiles/test/otbMultiScaleConvexOrConcaveClassificationFilterNew.cxx
@@ -15,6 +15,7 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkBinaryBallStructuringElement.h"
 #include "otbMultiScaleConvexOrConcaveClassificationFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index 4a658542bf..0cc2c688c8 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -19,6 +19,7 @@
 #define __otbWatershedSegmentationFilter_h
 
 #include "otbMacro.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "itkWatershedImageFilter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
index 696367d925..a9c9ac2c8f 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.txx
@@ -20,6 +20,7 @@
 
 #include "otbWrapperComplexInputImageParameter.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
index 5bdbb9aca5..3c16f47a18 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.txx
@@ -20,6 +20,7 @@
 
 #include "otbWrapperInputImageParameter.h"
 
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "otbImageToVectorImageCastFilter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
index 8bc1a1d094..e87df1353b 100644
--- a/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
+++ b/Modules/Wrappers/ApplicationEngine/src/otbWrapperComplexOutputImageParameter.cxx
@@ -16,6 +16,7 @@
 
 =========================================================================*/
 #include "otbWrapperComplexOutputImageParameter.h"
+#include "itkUnaryFunctorImageFilter.h"
 #include "itkCastImageFilter.h"
 #include "itkVectorCastImageFilter.h"
 
-- 
GitLab