diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h
index 184f7c59e6b1d03fc1089292a176afef46a7044d..f4adcdf7061fefe8d5e8a9d44e4271c6c2748993 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.h
@@ -24,9 +24,8 @@
 #include "otbVariadicInputsImageFilter.h"
 #include "otbImage.h"
 #include "otbVectorImage.h"
-
+#include "itkDefaultConvertPixelTraits.h"
 #include <type_traits>
-#include <utility>
 
 namespace otb
 {
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx
index f09f006430306cf7e6699ac209c5f58dfb57e8f5..76acef9af4b6dd6f2e6f2b8a53e30c9345c9646c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctorImageFilter.hxx
@@ -26,7 +26,6 @@
 #include "itkConstNeighborhoodIterator.h"
 #include "itkImageScanlineIterator.h"
 #include "itkImageRegionConstIterator.h"
-#include "itkDefaultConvertPixelTraits.h"
 
 namespace otb
 {
@@ -179,12 +178,6 @@ template <class F, class T, size_t N> struct NumberOfOutputComponents<F,otb::Vec
 
 } // end namespace functor_filter_details
 
-
-
-template <class TFunction>
-FunctorImageFilter<TFunction>::FunctorImageFilter()
-{}
-
 template <class TFunction>
 void
 FunctorImageFilter<TFunction>
diff --git a/Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h
index 5c02f97177c27b09e8c758c36b85d6f8758dacaa..049072dc5ccdf720fdc84c7fb9b974aa88da9806 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVariadicInputsImageFilter.h
@@ -17,10 +17,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #ifndef otb_VariadicInputsImageFilter_h
 #define otb_VariadicInputsImageFilter_h
 
+#include "itkImageSource.h"
+
 namespace otb {
 
 template<class TOuptut, class ... TInputs> class VariadicInputsImageFilter : public itk::ImageSource<TOuptut>