From 7fe54ded82de6f01a70509ea82ec4bb8c124786e Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@cnes.fr>
Date: Mon, 25 Jun 2018 14:15:50 +0200
Subject: [PATCH] ENH: Change txx/TXX to hxx/HXX in sources

---
 CMake/OTBModuleHeaderTest.cmake               |  2 +-
 .../SoftwareGuide/Examples/RunExamples.pl     |  6 ++---
 .../SoftwareGuide/Latex/Introduction.tex      |  2 +-
 .../SoftwareGuide/Latex/Iterators.tex         | 16 ++++++-------
 .../SoftwareGuide/Latex/SystemOverview.tex    |  2 +-
 .../SoftwareGuide/Latex/WriteAFilter.tex      |  4 ++--
 .../SoftwareGuide/Latex/WriteModules.tex      |  2 +-
 .../ChangeDetectionFrameworkExample.cxx       |  2 +-
 .../BoostAdapters/include/otbJoinContainer.h  |  2 +-
 .../GdalAdapters/include/otbGeometriesSet.h   |  2 +-
 .../include/otbGeometriesToGeometriesFilter.h |  2 +-
 .../otbGeometriesToGeometriesFilter.hxx       |  4 ++--
 .../GdalAdapters/include/otbImageReference.h  |  2 +-
 .../include/otbOGRDataSourceWrapper.h         |  2 +-
 .../include/otbOGRDataSourceWrapper.hxx       |  8 +++----
 .../include/otbOGRFeatureWrapper.h            |  2 +-
 .../include/otbOGRFeatureWrapper.hxx          |  6 ++---
 .../GdalAdapters/include/otbOGRFieldWrapper.h |  2 +-
 .../include/otbOGRFieldWrapper.hxx            |  6 ++---
 .../include/otbOGRGeometriesVisitor.h         |  2 +-
 .../include/otbOGRGeometryWrapper.h           |  2 +-
 .../GdalAdapters/include/otbOGRLayerWrapper.h |  2 +-
 .../include/otbLearningApplicationBase.h      | 24 +++++++++----------
 .../include/otbLearningApplicationBase.hxx    |  4 ++--
 .../include/otbTrainBoost.hxx                 |  4 ++--
 .../include/otbTrainDecisionTree.hxx          |  4 ++--
 .../include/otbTrainGradientBoostedTree.hxx   |  4 ++--
 .../include/otbTrainImagesBase.h              |  2 +-
 .../include/otbTrainImagesBase.hxx            |  4 ++--
 .../AppClassification/include/otbTrainKNN.hxx |  4 ++--
 .../include/otbTrainLibSVM.hxx                |  4 ++--
 .../include/otbTrainNeuralNetwork.hxx         |  4 ++--
 .../include/otbTrainNormalBayes.hxx           |  4 ++--
 .../include/otbTrainRandomForests.hxx         |  4 ++--
 .../AppClassification/include/otbTrainSVM.hxx |  4 ++--
 .../include/otbTrainSharkKMeans.hxx           |  4 ++--
 .../include/otbTrainSharkRandomForests.hxx    |  4 ++--
 .../include/otbTrainVectorBase.h              |  2 +-
 .../include/otbTrainVectorBase.hxx            |  4 ++--
 ...imensionalityReductionTrainAutoencoder.hxx |  4 ++--
 .../otbDimensionalityReductionTrainPCA.hxx    |  4 ++--
 .../otbDimensionalityReductionTrainSOM.hxx    |  4 ++--
 ...inDimensionalityReductionApplicationBase.h |  8 +++----
 ...DimensionalityReductionApplicationBase.hxx |  4 ++--
 .../Common/include/otbCommandProgressUpdate.h |  2 +-
 .../include/otbCommandProgressUpdate.hxx      |  4 ++--
 .../Common/include/otbDecimateImageFilter.h   |  2 +-
 .../Common/include/otbDecimateImageFilter.hxx |  4 ++--
 .../Common/include/otbDotProductImageFilter.h |  2 +-
 .../include/otbDotProductImageFilter.hxx      |  4 ++--
 .../Common/include/otbFunctionToImageFilter.h |  2 +-
 .../include/otbFunctionToImageFilter.hxx      |  4 ++--
 .../otbImageAndVectorImageOperationFilter.h   |  2 +-
 .../otbImageAndVectorImageOperationFilter.hxx |  4 ++--
 .../otbImageRegionAdaptativeSplitter.h        |  2 +-
 .../otbImageRegionAdaptativeSplitter.hxx      |  4 ++--
 ...RegionNonUniformMultidimensionalSplitter.h |  2 +-
 ...gionNonUniformMultidimensionalSplitter.hxx |  4 ++--
 .../otbImageRegionSquareTileSplitter.h        |  2 +-
 .../otbImageRegionSquareTileSplitter.hxx      |  4 ++--
 .../include/otbImageRegionTileMapSplitter.h   |  2 +-
 .../include/otbImageRegionTileMapSplitter.hxx |  4 ++--
 ...otbImageToModulusAndDirectionImageFilter.h |  2 +-
 ...bImageToModulusAndDirectionImageFilter.hxx |  4 ++--
 .../Common/include/otbImportImageFilter.h     |  2 +-
 .../Common/include/otbImportImageFilter.hxx   |  4 ++--
 .../include/otbImportVectorImageFilter.h      |  2 +-
 .../include/otbImportVectorImageFilter.hxx    |  4 ++--
 .../Common/include/otbModelComponentBase.h    |  2 +-
 .../Common/include/otbModelComponentBase.hxx  |  4 ++--
 .../include/otbQuaternaryFunctorImageFilter.h |  2 +-
 .../otbQuaternaryFunctorImageFilter.hxx       |  4 ++--
 .../Common/include/otbRGBAPixelConverter.h    |  2 +-
 .../Common/include/otbRGBAPixelConverter.hxx  |  4 ++--
 Modules/Core/Common/include/otbRectangle.h    |  2 +-
 Modules/Core/Common/include/otbRectangle.hxx  |  4 ++--
 .../otbSubsampledImageRegionConstIterator.h   |  2 +-
 .../otbSubsampledImageRegionConstIterator.hxx |  4 ++--
 ...naryFunctorNeighborhoodVectorImageFilter.h |  2 +-
 ...ryFunctorNeighborhoodVectorImageFilter.hxx |  4 ++--
 .../otbUnaryFunctorVectorImageFilter.h        |  2 +-
 .../otbUnaryFunctorVectorImageFilter.hxx      |  4 ++--
 ...unctorWithIndexWithOutputSizeImageFilter.h |  2 +-
 ...ctorWithIndexWithOutputSizeImageFilter.hxx |  4 ++--
 .../otbVariableLengthVectorConverter.h        |  2 +-
 .../otbVariableLengthVectorConverter.hxx      |  4 ++--
 .../ImageBase/include/otbConvertPixelBuffer.h |  2 +-
 .../include/otbConvertPixelBuffer.hxx         |  4 ++--
 .../Core/ImageBase/include/otbExtractROI.h    |  2 +-
 .../Core/ImageBase/include/otbExtractROI.hxx  |  4 ++--
 .../ImageBase/include/otbExtractROIBase.h     |  2 +-
 .../ImageBase/include/otbExtractROIBase.hxx   |  4 ++--
 Modules/Core/ImageBase/include/otbImage.h     |  2 +-
 Modules/Core/ImageBase/include/otbImage.hxx   |  4 ++--
 .../include/otbImageFunctionAdaptor.h         |  2 +-
 .../include/otbImageFunctionAdaptor.hxx       |  4 ++--
 ...otbImageOfVectorsToMonoChannelExtractROI.h |  2 +-
 ...bImageOfVectorsToMonoChannelExtractROI.hxx |  4 ++--
 .../ImageBase/include/otbMetaImageFunction.h  |  2 +-
 .../include/otbMetaImageFunction.hxx          |  4 ++--
 .../include/otbMultiChannelExtractROI.h       |  2 +-
 .../include/otbMultiChannelExtractROI.hxx     |  4 ++--
 .../include/otbMultiToMonoChannelExtractROI.h |  2 +-
 .../otbMultiToMonoChannelExtractROI.hxx       |  4 ++--
 .../Core/ImageBase/include/otbVectorImage.h   |  2 +-
 .../Core/ImageBase/include/otbVectorImage.hxx |  4 ++--
 .../include/otbBCOInterpolateImageFunction.h  |  2 +-
 .../otbBCOInterpolateImageFunction.hxx        |  4 ++--
 .../otbBSplineDecompositionImageFilter.h      |  2 +-
 .../otbBSplineDecompositionImageFilter.hxx    |  4 ++--
 .../otbBSplineInterpolateImageFunction.h      |  2 +-
 .../otbBSplineInterpolateImageFunction.hxx    |  4 ++--
 .../otbGenericInterpolateImageFunction.h      |  2 +-
 .../otbGenericInterpolateImageFunction.hxx    |  4 ++--
 .../otbProlateInterpolateImageFunction.h      |  2 +-
 .../otbProlateInterpolateImageFunction.hxx    |  4 ++--
 .../include/otbStreamingTraits.h              |  2 +-
 .../include/otbStreamingTraits.hxx            |  4 ++--
 ...WindowedSincInterpolateImageFunctionBase.h |  2 +-
 ...ndowedSincInterpolateImageFunctionBase.hxx |  4 ++--
 .../otbAttributesMapOpeningLabelMapFilter.h   |  2 +-
 .../otbAttributesMapOpeningLabelMapFilter.hxx |  4 ++--
 ...bBandsStatisticsAttributesLabelMapFilter.h |  2 +-
 ...andsStatisticsAttributesLabelMapFilter.hxx |  4 ++--
 .../otbImageToLabelMapWithAttributesFilter.h  |  2 +-
 ...otbImageToLabelMapWithAttributesFilter.hxx |  4 ++--
 .../otbKMeansAttributesLabelMapFilter.h       |  2 +-
 .../otbKMeansAttributesLabelMapFilter.hxx     |  4 ++--
 ...bLabelImageToLabelMapWithAdjacencyFilter.h |  2 +-
 ...abelImageToLabelMapWithAdjacencyFilter.hxx |  4 ++--
 .../Core/LabelMap/include/otbLabelMapSource.h |  2 +-
 .../LabelMap/include/otbLabelMapSource.hxx    |  4 ++--
 .../otbLabelMapToAttributeImageFilter.h       |  2 +-
 .../otbLabelMapToAttributeImageFilter.hxx     |  4 ++--
 .../include/otbLabelMapToLabelImageFilter.h   |  2 +-
 .../include/otbLabelMapToLabelImageFilter.hxx |  4 ++--
 .../include/otbLabelMapToSampleListFilter.h   |  2 +-
 .../include/otbLabelMapToSampleListFilter.hxx |  4 ++--
 ...MapWithClassLabelToClassLabelImageFilter.h |  2 +-
 ...pWithClassLabelToClassLabelImageFilter.hxx |  4 ++--
 ...pWithClassLabelToLabeledSampleListFilter.h |  2 +-
 ...ithClassLabelToLabeledSampleListFilter.hxx |  4 ++--
 .../include/otbLabelObjectToPolygonFunctor.h  |  2 +-
 .../otbLabelObjectToPolygonFunctor.hxx        |  4 ++--
 .../otbMinMaxAttributesLabelMapFilter.h       |  2 +-
 .../otbMinMaxAttributesLabelMapFilter.hxx     |  4 ++--
 .../otbNormalizeAttributesLabelMapFilter.h    |  2 +-
 .../otbNormalizeAttributesLabelMapFilter.hxx  |  4 ++--
 .../otbShapeAttributesLabelMapFilter.h        |  2 +-
 .../otbShapeAttributesLabelMapFilter.hxx      |  4 ++--
 .../otbStatisticsAttributesLabelMapFilter.h   |  2 +-
 .../otbStatisticsAttributesLabelMapFilter.hxx |  4 ++--
 .../Core/ObjectList/include/otbImageList.h    |  2 +-
 .../Core/ObjectList/include/otbImageList.hxx  |  4 ++--
 .../ObjectList/include/otbImageListSource.h   |  2 +-
 .../ObjectList/include/otbImageListSource.hxx |  4 ++--
 .../include/otbImageListToImageFilter.h       |  2 +-
 .../include/otbImageListToImageFilter.hxx     |  4 ++--
 .../otbImageListToImageListApplyFilter.h      |  2 +-
 .../otbImageListToImageListApplyFilter.hxx    |  4 ++--
 .../include/otbImageListToImageListFilter.h   |  2 +-
 .../include/otbImageListToImageListFilter.hxx |  4 ++--
 .../include/otbImageListToSingleImageFilter.h |  2 +-
 .../otbImageListToSingleImageFilter.hxx       |  4 ++--
 .../include/otbImageListToVectorImageFilter.h |  2 +-
 .../otbImageListToVectorImageFilter.hxx       |  4 ++--
 .../include/otbImageToImageListFilter.h       |  2 +-
 .../include/otbImageToImageListFilter.hxx     |  4 ++--
 .../Core/ObjectList/include/otbObjectList.h   |  2 +-
 .../Core/ObjectList/include/otbObjectList.hxx |  4 ++--
 .../ObjectList/include/otbObjectListSource.h  |  2 +-
 .../include/otbObjectListSource.hxx           |  4 ++--
 .../include/otbObjectListToObjectListFilter.h |  2 +-
 .../otbObjectListToObjectListFilter.hxx       |  6 ++---
 .../otbUnaryFunctorObjectListBooleanFilter.h  |  2 +-
 ...otbUnaryFunctorObjectListBooleanFilter.hxx |  4 ++--
 .../include/otbUnaryFunctorObjectListFilter.h |  2 +-
 .../otbUnaryFunctorObjectListFilter.hxx       |  4 ++--
 .../include/otbVectorImageToImageListFilter.h |  2 +-
 .../otbVectorImageToImageListFilter.hxx       |  4 ++--
 .../include/otbImageToPointSetFilter.h        |  2 +-
 .../include/otbImageToPointSetFilter.hxx      |  4 ++--
 .../PointSet/include/otbPointSetExtractROI.h  |  2 +-
 .../include/otbPointSetExtractROI.hxx         |  4 ++--
 .../PointSet/include/otbPointSetFunction.h    |  2 +-
 .../PointSet/include/otbPointSetFunction.hxx  |  4 ++--
 .../Core/PointSet/include/otbPointSetSource.h |  2 +-
 .../PointSet/include/otbPointSetSource.hxx    |  4 ++--
 .../include/otbPointSetToPointSetFilter.h     |  2 +-
 .../include/otbPointSetToPointSetFilter.hxx   |  4 ++--
 .../include/otbRandomPointSetSource.h         |  2 +-
 .../include/otbRandomPointSetSource.hxx       |  4 ++--
 .../otbThresholdImageToPointSetFilter.h       |  2 +-
 .../otbThresholdImageToPointSetFilter.hxx     |  4 ++--
 .../include/otbTransformPointSetFilter.h      |  2 +-
 .../include/otbTransformPointSetFilter.hxx    |  4 ++--
 .../include/otbDrawLineSpatialObjectFilter.h  |  2 +-
 .../otbDrawLineSpatialObjectFilter.hxx        |  4 ++--
 .../otbDrawLineSpatialObjectListFilter.h      |  2 +-
 .../otbDrawLineSpatialObjectListFilter.hxx    |  4 ++--
 .../otbImageToLineSpatialObjectListFilter.h   |  2 +-
 .../otbImageToLineSpatialObjectListFilter.hxx |  4 ++--
 .../include/otbLineSpatialObject.h            |  2 +-
 .../include/otbLineSpatialObject.hxx          |  4 ++--
 ...otbLineSpatialObjectListToPointSetFilter.h |  2 +-
 ...bLineSpatialObjectListToPointSetFilter.hxx |  4 ++--
 .../include/otbSpatialObjectSource.h          |  2 +-
 .../include/otbSpatialObjectSource.hxx        |  4 ++--
 .../otbSpatialObjectToImageDrawingFilter.h    |  2 +-
 .../otbSpatialObjectToImageDrawingFilter.hxx  |  4 ++--
 ...umberOfDivisionsStrippedStreamingManager.h |  2 +-
 ...berOfDivisionsStrippedStreamingManager.hxx |  4 ++--
 ...tbNumberOfDivisionsTiledStreamingManager.h |  2 +-
 ...NumberOfDivisionsTiledStreamingManager.hxx |  4 ++--
 ...otbNumberOfLinesStrippedStreamingManager.h |  2 +-
 ...bNumberOfLinesStrippedStreamingManager.hxx |  4 ++--
 .../otbPersistentFilterStreamingDecorator.h   |  2 +-
 .../otbPersistentFilterStreamingDecorator.hxx |  4 ++--
 .../otbRAMDrivenAdaptativeStreamingManager.h  |  2 +-
 ...otbRAMDrivenAdaptativeStreamingManager.hxx |  4 ++--
 .../otbRAMDrivenStrippedStreamingManager.h    |  2 +-
 .../otbRAMDrivenStrippedStreamingManager.hxx  |  4 ++--
 .../otbRAMDrivenTiledStreamingManager.h       |  2 +-
 .../otbRAMDrivenTiledStreamingManager.hxx     |  4 ++--
 .../include/otbStreamingImageVirtualWriter.h  |  2 +-
 .../otbStreamingImageVirtualWriter.hxx        |  4 ++--
 .../Streaming/include/otbStreamingManager.h   |  2 +-
 .../Streaming/include/otbStreamingManager.hxx |  4 ++--
 .../otbTileDimensionTiledStreamingManager.h   |  2 +-
 .../otbTileDimensionTiledStreamingManager.hxx |  4 ++--
 .../Transform/include/otbCompositeTransform.h |  2 +-
 .../include/otbCompositeTransform.hxx         |  4 ++--
 .../Transform/include/otbForwardSensorModel.h |  2 +-
 .../include/otbForwardSensorModel.hxx         |  4 ++--
 .../include/otbGenericMapProjection.h         |  2 +-
 .../include/otbGenericMapProjection.hxx       |  4 ++--
 .../Transform/include/otbGenericRSTransform.h |  2 +-
 .../include/otbGenericRSTransform.hxx         |  4 ++--
 .../include/otbGeocentricTransform.h          |  2 +-
 .../include/otbGeocentricTransform.hxx        |  4 ++--
 .../otbImageToGenericRSOutputParameters.h     |  2 +-
 .../otbImageToGenericRSOutputParameters.hxx   |  4 ++--
 .../include/otbInverseLogPolarTransform.h     |  2 +-
 .../include/otbInverseLogPolarTransform.hxx   |  4 ++--
 .../Transform/include/otbInverseSensorModel.h |  2 +-
 .../include/otbInverseSensorModel.hxx         |  4 ++--
 .../Transform/include/otbLogPolarTransform.h  |  2 +-
 .../include/otbLogPolarTransform.hxx          |  4 ++--
 .../Transform/include/otbSensorModelBase.h    |  2 +-
 .../Transform/include/otbSensorModelBase.hxx  |  4 ++--
 .../include/otbStreamingWarpImageFilter.h     |  2 +-
 .../include/otbStreamingWarpImageFilter.hxx   |  4 ++--
 .../Core/VectorDataBase/include/otbDataNode.h |  2 +-
 .../VectorDataBase/include/otbDataNode.hxx    |  4 ++--
 .../include/otbDataNodeImageFunction.h        |  2 +-
 .../include/otbDataNodeImageFunction.hxx      |  4 ++--
 .../include/otbDataNodeVectorDataFunction.h   |  2 +-
 .../include/otbDataNodeVectorDataFunction.hxx |  4 ++--
 .../otbPolyLineParametricPathWithValue.h      |  2 +-
 .../otbPolyLineParametricPathWithValue.hxx    |  4 ++--
 .../Core/VectorDataBase/include/otbPolygon.h  |  2 +-
 .../VectorDataBase/include/otbPolygon.hxx     |  4 ++--
 .../VectorDataBase/include/otbVectorData.h    |  2 +-
 .../VectorDataBase/include/otbVectorData.hxx  |  4 ++--
 .../include/otbVectorDataProperties.h         |  2 +-
 .../include/otbVectorDataProperties.hxx       |  4 ++--
 .../include/otbVectorDataSource.h             |  2 +-
 .../include/otbVectorDataSource.hxx           |  4 ++--
 .../include/otbCloudDetectionFilter.h         |  2 +-
 .../include/otbCloudDetectionFilter.hxx       |  4 ++--
 .../include/otbCloudEstimatorFilter.h         |  2 +-
 .../include/otbCloudEstimatorFilter.hxx       |  4 ++--
 .../otbDescriptorsListSampleGenerator.h       |  2 +-
 .../otbDescriptorsListSampleGenerator.hxx     |  4 ++--
 .../include/otbFlusserMomentsIFFactory.h      |  2 +-
 .../include/otbFlusserMomentsIFFactory.hxx    |  4 ++--
 .../otbFourierMellinDescriptorsIFFactory.h    |  2 +-
 .../otbFourierMellinDescriptorsIFFactory.hxx  |  4 ++--
 .../include/otbHaralickTexturesIFFactory.h    |  2 +-
 .../include/otbHaralickTexturesIFFactory.hxx  |  4 ++--
 .../otbLabeledSampleLocalizationGenerator.h   |  2 +-
 .../otbLabeledSampleLocalizationGenerator.hxx |  4 ++--
 .../include/otbLocalHistogramIFFactory.h      |  2 +-
 .../include/otbLocalHistogramIFFactory.hxx    |  4 ++--
 .../include/otbObjectDetectionClassifier.h    |  2 +-
 .../include/otbObjectDetectionClassifier.hxx  |  4 ++--
 .../include/otbRadiometricMomentsIFFactory.h  |  2 +-
 .../otbRadiometricMomentsIFFactory.hxx        |  4 ++--
 .../otbStandardMetaImageFunctionBuilder.h     |  2 +-
 .../otbStandardMetaImageFunctionBuilder.hxx   |  4 ++--
 .../include/otbBreakAngularPathListFilter.h   |  2 +-
 .../include/otbBreakAngularPathListFilter.hxx |  4 ++--
 .../include/otbGenericRoadExtractionFilter.h  |  2 +-
 .../otbGenericRoadExtractionFilter.hxx        |  4 ++--
 .../include/otbImageToPathListAlignFilter.h   |  2 +-
 .../include/otbImageToPathListAlignFilter.hxx |  4 ++--
 .../include/otbLikelihoodPathListFilter.h     |  2 +-
 .../include/otbLikelihoodPathListFilter.hxx   |  4 ++--
 .../include/otbLinkPathListFilter.h           |  2 +-
 .../include/otbLinkPathListFilter.hxx         |  4 ++--
 ...otbModulusAndDirectionImageToImageFilter.h |  2 +-
 ...bModulusAndDirectionImageToImageFilter.hxx |  4 ++--
 .../otbNeighborhoodScalarProductFilter.h      |  2 +-
 .../otbNeighborhoodScalarProductFilter.hxx    |  4 ++--
 .../include/otbParallelLinePathListFilter.h   |  2 +-
 .../include/otbParallelLinePathListFilter.hxx |  4 ++--
 .../include/otbRoadExtractionFilter.h         |  2 +-
 .../include/otbRoadExtractionFilter.hxx       |  4 ++--
 .../otbVectorDataToRoadDescriptionFilter.h    |  2 +-
 .../otbVectorDataToRoadDescriptionFilter.hxx  |  4 ++--
 .../otbUrbanAreaDetectionImageFilter.h        |  2 +-
 .../otbUrbanAreaDetectionImageFilter.hxx      |  4 ++--
 .../Corner/include/otbHarrisImageFilter.h     |  2 +-
 .../Corner/include/otbHarrisImageFilter.hxx   |  4 ++--
 .../include/otbHarrisImageToPointSetFilter.h  |  2 +-
 .../otbHarrisImageToPointSetFilter.hxx        |  4 ++--
 ...tialObjectListToRightAnglePointSetFilter.h |  2 +-
 ...alObjectListToRightAnglePointSetFilter.hxx |  4 ++--
 ...tbVectorDataToRightAngleVectorDataFilter.h |  2 +-
 ...VectorDataToRightAngleVectorDataFilter.hxx |  4 ++--
 .../include/otbKeyPointDensityImageFilter.h   |  2 +-
 .../include/otbKeyPointDensityImageFilter.hxx |  4 ++--
 .../otbPointSetDensityEpanechnikovFunction.h  |  2 +-
 ...otbPointSetDensityEpanechnikovFunction.hxx |  4 ++--
 .../include/otbPointSetDensityFunction.h      |  2 +-
 .../include/otbPointSetDensityFunction.hxx    |  4 ++--
 .../otbPointSetDensityGaussianFunction.h      |  2 +-
 .../otbPointSetDensityGaussianFunction.hxx    |  4 ++--
 .../include/otbPointSetToDensityImageFilter.h |  2 +-
 .../otbPointSetToDensityImageFilter.hxx       |  4 ++--
 ...ForwardFourierMellinTransformImageFilter.h |  2 +-
 ...rwardFourierMellinTransformImageFilter.hxx |  4 ++--
 ...otbFourierMellinDescriptorsImageFunction.h |  2 +-
 ...bFourierMellinDescriptorsImageFunction.hxx |  4 ++--
 ...OfOrientedGradientCovariantImageFunction.h |  2 +-
 ...OrientedGradientCovariantImageFunction.hxx |  4 ++--
 .../otbImageToHessianDeterminantImageFilter.h |  2 +-
 ...tbImageToHessianDeterminantImageFilter.hxx |  4 ++--
 .../include/otbImageToSIFTKeyPointSetFilter.h |  2 +-
 .../otbImageToSIFTKeyPointSetFilter.hxx       |  4 ++--
 .../include/otbImageToSURFKeyPointSetFilter.h |  2 +-
 .../otbImageToSURFKeyPointSetFilter.hxx       |  4 ++--
 .../include/otbKeyPointSetsMatchingFilter.h   |  2 +-
 .../include/otbKeyPointSetsMatchingFilter.hxx |  4 ++--
 .../include/otbSiftFastImageFilter.h          |  2 +-
 .../include/otbSiftFastImageFilter.hxx        |  4 ++--
 ...symmetricFusionOfLineDetectorImageFilter.h |  2 +-
 ...mmetricFusionOfLineDetectorImageFilter.hxx |  4 ++--
 .../Edge/include/otbEdgeDensityImageFilter.h  |  2 +-
 .../include/otbEdgeDensityImageFilter.hxx     |  4 ++--
 .../Edge/include/otbEdgeDetectorImageFilter.h |  2 +-
 .../include/otbEdgeDetectorImageFilter.hxx    |  4 ++--
 .../include/otbExtractSegmentsImageFilter.h   |  2 +-
 .../include/otbExtractSegmentsImageFilter.hxx |  4 ++--
 .../otbHoughTransform2DLinesImageFilter.h     |  2 +-
 .../otbHoughTransform2DLinesImageFilter.hxx   |  4 ++--
 .../otbLineCorrelationDetectorImageFilter.h   |  2 +-
 .../otbLineCorrelationDetectorImageFilter.hxx |  4 ++--
 .../include/otbLineDetectorImageFilterBase.h  |  2 +-
 .../otbLineDetectorImageFilterBase.hxx        |  4 ++--
 .../include/otbLineRatioDetectorImageFilter.h |  2 +-
 .../otbLineRatioDetectorImageFilter.hxx       |  4 ++--
 .../Edge/include/otbLineSegmentDetector.h     |  2 +-
 .../Edge/include/otbLineSegmentDetector.hxx   |  4 ++--
 .../Edge/include/otbLocalHoughFilter.h        |  2 +-
 .../Edge/include/otbLocalHoughFilter.hxx      |  4 ++--
 .../otbPersistentVectorizationImageFilter.h   |  2 +-
 .../otbPersistentVectorizationImageFilter.hxx |  4 ++--
 ...tbPixelSuppressionByDirectionImageFilter.h |  2 +-
 ...PixelSuppressionByDirectionImageFilter.hxx |  4 ++--
 .../include/otbStreamingLineSegmentDetector.h |  2 +-
 .../otbStreamingLineSegmentDetector.hxx       |  4 ++--
 .../include/otbTouziEdgeDetectorImageFilter.h |  2 +-
 .../otbTouziEdgeDetectorImageFilter.hxx       |  4 ++--
 .../include/otbComplexMomentPathFunction.h    |  2 +-
 .../include/otbComplexMomentPathFunction.hxx  |  4 ++--
 .../include/otbComplexMomentsImageFunction.h  |  2 +-
 .../otbComplexMomentsImageFunction.hxx        |  4 ++--
 .../include/otbFlusserMomentsImageFunction.h  |  2 +-
 .../otbFlusserMomentsImageFunction.hxx        |  4 ++--
 .../Moments/include/otbFlusserPathFunction.h  |  2 +-
 .../include/otbFlusserPathFunction.hxx        |  4 ++--
 .../include/otbHuMomentsImageFunction.h       |  2 +-
 .../include/otbHuMomentsImageFunction.hxx     |  4 ++--
 .../Moments/include/otbHuPathFunction.h       |  2 +-
 .../Moments/include/otbHuPathFunction.hxx     |  4 ++--
 .../otbRadiometricMomentsImageFilter.h        |  2 +-
 .../otbRadiometricMomentsImageFilter.hxx      |  4 ++--
 .../otbRadiometricMomentsImageFunction.h      |  2 +-
 .../otbRadiometricMomentsImageFunction.hxx    |  4 ++--
 .../include/otbRealMomentsImageFunction.h     |  2 +-
 .../include/otbRealMomentsImageFunction.hxx   |  4 ++--
 .../include/otbAddCarvingPathFilter.h         |  2 +-
 .../include/otbAddCarvingPathFilter.hxx       |  4 ++--
 .../include/otbImageToCarvingPathFilter.h     |  2 +-
 .../include/otbImageToCarvingPathFilter.hxx   |  4 ++--
 .../include/otbRemoveCarvingPathFilter.h      |  2 +-
 .../include/otbRemoveCarvingPathFilter.hxx    |  4 ++--
 .../otbGreyLevelCooccurrenceIndexedList.h     |  2 +-
 .../otbGreyLevelCooccurrenceIndexedList.hxx   |  4 ++--
 .../otbHaralickTexturesImageFunction.h        |  2 +-
 .../otbHaralickTexturesImageFunction.hxx      |  4 ++--
 .../include/otbSFSTexturesImageFilter.h       |  2 +-
 .../include/otbSFSTexturesImageFilter.hxx     |  4 ++--
 .../otbScalarImageToAdvancedTexturesFilter.h  |  2 +-
 ...otbScalarImageToAdvancedTexturesFilter.hxx |  4 ++--
 ...tbScalarImageToHigherOrderTexturesFilter.h |  2 +-
 ...ScalarImageToHigherOrderTexturesFilter.hxx |  4 ++--
 .../otbScalarImageToPanTexTextureFilter.h     |  2 +-
 .../otbScalarImageToPanTexTextureFilter.hxx   |  4 ++--
 .../include/otbScalarImageToTexturesFilter.h  |  2 +-
 .../otbScalarImageToTexturesFilter.hxx        |  4 ++--
 .../include/otbTextureImageFunction.h         |  2 +-
 .../include/otbTextureImageFunction.hxx       |  4 ++--
 ...ctorNeighborhoodJoinHistogramImageFilter.h |  2 +-
 ...orNeighborhoodJoinHistogramImageFilter.hxx |  4 ++--
 .../otbKullbackLeiblerDistanceImageFilter.h   |  2 +-
 .../otbKullbackLeiblerDistanceImageFilter.hxx |  4 ++--
 .../otbKullbackLeiblerProfileImageFilter.h    |  2 +-
 .../otbKullbackLeiblerProfileImageFilter.hxx  |  4 ++--
 ...backLeiblerSupervizedDistanceImageFilter.h |  2 +-
 ...ckLeiblerSupervizedDistanceImageFilter.hxx |  4 ++--
 ...ultivariateAlterationDetectorImageFilter.h |  2 +-
 ...tivariateAlterationDetectorImageFilter.hxx |  4 ++--
 .../include/otbReliefColormapFunctor.h        |  2 +-
 .../include/otbReliefColormapFunctor.hxx      |  4 ++--
 .../otbScalarToRainbowRGBPixelFunctor.h       |  2 +-
 .../otbScalarToRainbowRGBPixelFunctor.hxx     |  4 ++--
 .../Contrast/include/otbApplyGainFilter.h     |  2 +-
 .../Contrast/include/otbApplyGainFilter.hxx   |  4 ++--
 .../otbCLHistogramEqualizationFilter.h        |  2 +-
 .../otbCLHistogramEqualizationFilter.hxx      |  4 ++--
 .../include/otbComputeGainLutFilter.h         |  2 +-
 .../include/otbComputeGainLutFilter.hxx       |  4 ++--
 .../Contrast/include/otbComputeHistoFilter.h  |  2 +-
 .../include/otbComputeHistoFilter.hxx         |  4 ++--
 .../include/otbConvolutionImageFilter.h       |  2 +-
 .../include/otbConvolutionImageFilter.hxx     |  4 ++--
 .../include/otbGaborFilterGenerator.h         |  2 +-
 .../include/otbGaborFilterGenerator.hxx       |  4 ++--
 .../otbOverlapSaveConvolutionImageFilter.h    |  2 +-
 .../otbOverlapSaveConvolutionImageFilter.hxx  |  4 ++--
 .../include/otbDEMCaracteristicsExtractor.h   |  2 +-
 .../include/otbDEMCaracteristicsExtractor.hxx |  4 ++--
 .../DEM/include/otbDEMToImageGenerator.h      |  2 +-
 .../DEM/include/otbDEMToImageGenerator.hxx    |  4 ++--
 .../otbAngularProjectionBinaryImageFilter.h   |  2 +-
 .../otbAngularProjectionBinaryImageFilter.hxx |  4 ++--
 .../include/otbAngularProjectionImageFilter.h |  2 +-
 .../otbAngularProjectionImageFilter.hxx       |  4 ++--
 .../otbAngularProjectionSetImageFilter.h      |  2 +-
 .../otbAngularProjectionSetImageFilter.hxx    |  4 ++--
 .../otbEstimateInnerProductPCAImageFilter.h   |  2 +-
 .../otbEstimateInnerProductPCAImageFilter.hxx |  4 ++--
 .../include/otbFastICAImageFilter.h           |  2 +-
 .../include/otbFastICAImageFilter.hxx         |  4 ++--
 ...astICAInternalOptimizerVectorImageFilter.h |  2 +-
 ...tICAInternalOptimizerVectorImageFilter.hxx |  4 ++--
 .../include/otbInnerProductPCAImageFilter.h   |  2 +-
 .../include/otbInnerProductPCAImageFilter.hxx |  4 ++--
 .../include/otbMNFImageFilter.h               |  2 +-
 .../include/otbMNFImageFilter.hxx             |  6 ++---
 ...bMaximumAutocorrelationFactorImageFilter.h |  2 +-
 ...aximumAutocorrelationFactorImageFilter.hxx |  4 ++--
 .../include/otbNAPCAImageFilter.h             |  2 +-
 .../include/otbNAPCAImageFilter.hxx           |  4 ++--
 .../otbNormalizeInnerProductPCAImageFilter.h  |  2 +-
 ...otbNormalizeInnerProductPCAImageFilter.hxx |  4 ++--
 .../include/otbPCAImageFilter.h               |  2 +-
 .../include/otbPCAImageFilter.hxx             |  6 ++---
 .../otbSparseWvltToAngleMapperListFilter.h    |  2 +-
 .../otbSparseWvltToAngleMapperListFilter.hxx  |  4 ++--
 .../otbBinaryFunctorNeighborhoodImageFilter.h |  2 +-
 ...tbBinaryFunctorNeighborhoodImageFilter.hxx |  4 ++--
 ...naryFunctorNeighborhoodVectorImageFilter.h |  2 +-
 ...ryFunctorNeighborhoodVectorImageFilter.hxx |  4 ++--
 .../include/otbBinaryImageDensityFunction.h   |  2 +-
 .../include/otbBinaryImageDensityFunction.hxx |  4 ++--
 ...naryImageMinimalBoundingRegionCalculator.h |  2 +-
 ...ryImageMinimalBoundingRegionCalculator.hxx |  4 ++--
 .../otbBinaryImageToDensityImageFilter.h      |  2 +-
 .../otbBinaryImageToDensityImageFilter.hxx    |  4 ++--
 .../include/otbBoxAndWhiskerImageFilter.h     |  2 +-
 .../include/otbBoxAndWhiskerImageFilter.hxx   |  4 ++--
 .../include/otbChangeInformationImageFilter.h |  2 +-
 .../otbChangeInformationImageFilter.hxx       |  4 ++--
 .../include/otbChangeLabelImageFilter.h       |  2 +-
 .../include/otbChangeLabelImageFilter.hxx     |  4 ++--
 .../include/otbClampImageFilter.h             |  2 +-
 .../include/otbClampImageFilter.hxx           |  4 ++--
 .../include/otbClampVectorImageFilter.h       |  2 +-
 .../include/otbClampVectorImageFilter.hxx     |  4 ++--
 .../otbConcatenateScalarValueImageFilter.h    |  2 +-
 .../otbConcatenateScalarValueImageFilter.hxx  |  4 ++--
 .../include/otbConcatenateVectorImageFilter.h |  2 +-
 .../otbConcatenateVectorImageFilter.hxx       |  4 ++--
 ...lideanDistanceMetricWithMissingValuePow2.h |  2 +-
 ...deanDistanceMetricWithMissingValuePow2.hxx |  4 ++--
 .../otbFlexibleDistanceWithMissingValue.h     |  2 +-
 .../otbFlexibleDistanceWithMissingValue.hxx   |  4 ++--
 ...otbFunctionWithNeighborhoodToImageFilter.h |  2 +-
 ...bFunctionWithNeighborhoodToImageFilter.hxx |  4 ++--
 .../include/otbGridResampleImageFilter.h      |  2 +-
 .../include/otbGridResampleImageFilter.hxx    |  4 ++--
 .../include/otbMaskedIteratorDecorator.h      |  2 +-
 .../include/otbMatrixImageFilter.h            |  2 +-
 .../include/otbMatrixImageFilter.hxx          |  4 ++--
 .../otbNRIBandImagesToOneNComplexBandsImage.h |  2 +-
 ...tbNRIBandImagesToOneNComplexBandsImage.hxx |  4 ++--
 .../otbOneRIBandImageToOneComplexBandImage.h  |  2 +-
 ...otbOneRIBandImageToOneComplexBandImage.hxx |  4 ++--
 .../include/otbPerBandVectorImageFilter.h     |  2 +-
 .../include/otbPerBandVectorImageFilter.hxx   |  4 ++--
 .../include/otbPrintableImageFilter.h         |  2 +-
 .../include/otbPrintableImageFilter.hxx       |  4 ++--
 .../include/otbShiftScaleVectorImageFilter.h  |  2 +-
 .../otbShiftScaleVectorImageFilter.hxx        |  4 ++--
 .../otbSpectralAngleDistanceImageFilter.h     |  2 +-
 .../otbSpectralAngleDistanceImageFilter.hxx   |  4 ++--
 ...tbStreamingInnerProductVectorImageFilter.h |  2 +-
 ...StreamingInnerProductVectorImageFilter.hxx |  4 ++--
 ...treamingMatrixTransposeMatrixImageFilter.h |  2 +-
 ...eamingMatrixTransposeMatrixImageFilter.hxx |  4 ++--
 .../include/otbStreamingResampleImageFilter.h |  2 +-
 .../otbStreamingResampleImageFilter.hxx       |  4 ++--
 .../include/otbStreamingShrinkImageFilter.h   |  2 +-
 .../include/otbStreamingShrinkImageFilter.hxx |  4 ++--
 .../include/otbThresholdVectorImageFilter.h   |  2 +-
 .../include/otbThresholdVectorImageFilter.hxx |  4 ++--
 .../include/otbTileImageFilter.h              |  2 +-
 .../include/otbTileImageFilter.hxx            |  4 ++--
 .../otbTwoNRIBandsImageToNComplexBandsImage.h |  2 +-
 ...tbTwoNRIBandsImageToNComplexBandsImage.hxx |  4 ++--
 .../otbUnaryFunctorNeighborhoodImageFilter.h  |  2 +-
 ...otbUnaryFunctorNeighborhoodImageFilter.hxx |  4 ++--
 ...FunctorNeighborhoodWithOffsetImageFilter.h |  2 +-
 ...nctorNeighborhoodWithOffsetImageFilter.hxx |  4 ++--
 .../otbUnaryFunctorWithIndexImageFilter.h     |  2 +-
 .../otbUnaryFunctorWithIndexImageFilter.hxx   |  4 ++--
 ...tbUnaryImageFunctorWithVectorImageFilter.h |  2 +-
 ...UnaryImageFunctorWithVectorImageFilter.hxx |  4 ++--
 .../otbVectorImageTo3DScalarImageFilter.h     |  2 +-
 .../otbVectorImageTo3DScalarImageFilter.hxx   |  4 ++--
 .../otbVectorRescaleIntensityImageFilter.h    |  2 +-
 .../otbVectorRescaleIntensityImageFilter.hxx  |  4 ++--
 .../ImageNoise/include/otbFrostImageFilter.h  |  2 +-
 .../include/otbFrostImageFilter.hxx           |  4 ++--
 .../include/otbGammaMAPImageFilter.h          |  2 +-
 .../include/otbGammaMAPImageFilter.hxx        |  4 ++--
 .../ImageNoise/include/otbKuanImageFilter.h   |  2 +-
 .../ImageNoise/include/otbKuanImageFilter.hxx |  4 ++--
 .../ImageNoise/include/otbLeeImageFilter.h    |  2 +-
 .../ImageNoise/include/otbLeeImageFilter.hxx  |  4 ++--
 .../include/otbBandMathImageFilter.h          |  2 +-
 .../include/otbBandMathImageFilter.hxx        |  4 ++--
 .../include/otbMaskMuParserFilter.h           |  2 +-
 .../include/otbMaskMuParserFilter.hxx         |  4 ++--
 .../include/otbMaskMuParserFunctor.h          |  2 +-
 .../include/otbMaskMuParserFunctor.hxx        |  4 ++--
 ...tbParserConditionDataNodeFeatureFunction.h |  2 +-
 ...ParserConditionDataNodeFeatureFunction.hxx |  4 ++--
 .../include/otbBandMathXImageFilter.h         |  2 +-
 .../include/otbBandMathXImageFilter.hxx       |  4 ++--
 .../otbMorphologicalPyramidAnalysisFilter.h   |  2 +-
 .../otbMorphologicalPyramidAnalysisFilter.hxx |  4 ++--
 .../otbMorphologicalPyramidMRToMSConverter.h  |  2 +-
 ...otbMorphologicalPyramidMRToMSConverter.hxx |  4 ++--
 .../otbMorphologicalPyramidResampler.h        |  2 +-
 .../otbMorphologicalPyramidResampler.hxx      |  4 ++--
 ...tbMorphologicalPyramidSegmentationFilter.h |  2 +-
 ...MorphologicalPyramidSegmentationFilter.hxx |  4 ++--
 .../otbMorphologicalPyramidSegmenter.h        |  2 +-
 .../otbMorphologicalPyramidSegmenter.hxx      |  4 ++--
 .../otbMorphologicalPyramidSynthesisFilter.h  |  2 +-
 ...otbMorphologicalPyramidSynthesisFilter.hxx |  4 ++--
 .../Path/include/otbCompacityPathFunction.h   |  2 +-
 .../Path/include/otbCompacityPathFunction.hxx |  4 ++--
 .../Path/include/otbDrawPathFilter.h          |  2 +-
 .../Path/include/otbDrawPathFilter.hxx        |  4 ++--
 .../Path/include/otbDrawPathListFilter.h      |  2 +-
 .../Path/include/otbDrawPathListFilter.hxx    |  4 ++--
 .../otbImageFittingPolygonListFilter.h        |  2 +-
 .../otbImageFittingPolygonListFilter.hxx      |  4 ++--
 .../Path/include/otbImageToEdgePathFilter.h   |  2 +-
 .../Path/include/otbImageToEdgePathFilter.hxx |  4 ++--
 .../Path/include/otbImageToPathFilter.h       |  2 +-
 .../Path/include/otbImageToPathFilter.hxx     |  4 ++--
 .../Path/include/otbImageToPathListFilter.h   |  2 +-
 .../Path/include/otbImageToPathListFilter.hxx |  4 ++--
 .../Path/include/otbOrientationPathFunction.h |  2 +-
 .../include/otbOrientationPathFunction.hxx    |  4 ++--
 .../Filtering/Path/include/otbPathFunction.h  |  2 +-
 .../Path/include/otbPathFunction.hxx          |  4 ++--
 .../Path/include/otbPathListSource.h          |  2 +-
 .../include/otbPathListToHistogramGenerator.h |  2 +-
 .../otbPathListToHistogramGenerator.hxx       |  4 ++--
 .../include/otbPolyLineImageConstIterator.h   |  2 +-
 .../include/otbPolyLineImageConstIterator.hxx |  4 ++--
 ...tbRegionImageToRectangularPathListFilter.h |  2 +-
 ...RegionImageToRectangularPathListFilter.hxx |  6 ++---
 .../include/otbVectorizationPathListFilter.h  |  2 +-
 .../otbVectorizationPathListFilter.hxx        |  4 ++--
 ...MultiChannelsPolarimetricSynthesisFilter.h |  2 +-
 ...ltiChannelsPolarimetricSynthesisFilter.hxx |  4 ++--
 .../include/otbSinclairImageFilter.h          |  2 +-
 .../include/otbSinclairImageFilter.hxx        |  4 ++--
 .../otbSinclairReciprocalImageFilter.h        |  2 +-
 .../otbSinclairReciprocalImageFilter.hxx      |  4 ++--
 .../include/otbEckert4MapProjection.h         |  2 +-
 .../include/otbEckert4MapProjection.hxx       |  4 ++--
 .../otbGCPsToRPCSensorModelImageFilter.h      |  2 +-
 .../otbGCPsToRPCSensorModelImageFilter.hxx    |  4 ++--
 .../include/otbGenericRSResampleImageFilter.h |  2 +-
 .../otbGenericRSResampleImageFilter.hxx       |  4 ++--
 .../include/otbGeographicalDistance.h         |  2 +-
 .../include/otbGeographicalDistance.hxx       |  4 ++--
 .../include/otbGeometriesProjectionFilter.h   |  2 +-
 .../include/otbGeometriesProjectionFilter.hxx |  4 ++--
 .../include/otbGroundSpacingImageFunction.h   |  2 +-
 .../include/otbGroundSpacingImageFunction.hxx |  4 ++--
 .../otbImageToEnvelopeVectorDataFilter.h      |  2 +-
 .../otbImageToEnvelopeVectorDataFilter.hxx    |  4 ++--
 .../otbImportGeoInformationImageFilter.h      |  2 +-
 .../otbImportGeoInformationImageFilter.hxx    |  4 ++--
 .../otbLambertConformalConicMapProjection.h   |  2 +-
 .../otbLambertConformalConicMapProjection.hxx |  4 ++--
 .../otbLeastSquareAffineTransformEstimator.h  |  2 +-
 ...otbLeastSquareAffineTransformEstimator.hxx |  4 ++--
 .../include/otbMollweidMapProjection.h        |  2 +-
 .../include/otbMollweidMapProjection.hxx      |  4 ++--
 .../include/otbOrthoRectificationFilter.h     |  2 +-
 .../include/otbOrthoRectificationFilter.hxx   |  4 ++--
 .../otbPhysicalToRPCSensorModelImageFilter.h  |  2 +-
 ...otbPhysicalToRPCSensorModelImageFilter.hxx |  4 ++--
 .../otbProjectiveProjectionImageFilter.h      |  2 +-
 .../otbProjectiveProjectionImageFilter.hxx    |  4 ++--
 .../Projection/include/otbROIdataConversion.h |  2 +-
 .../include/otbROIdataConversion.hxx          |  4 ++--
 .../include/otbSinusoidalMapProjection.h      |  2 +-
 .../include/otbSinusoidalMapProjection.hxx    |  4 ++--
 .../Projection/include/otbTileMapTransform.h  |  2 +-
 .../include/otbTileMapTransform.hxx           |  4 ++--
 .../include/otbTransMercatorMapProjection.h   |  2 +-
 .../include/otbTransMercatorMapProjection.hxx |  4 ++--
 .../Projection/include/otbUtmMapProjection.h  |  2 +-
 .../include/otbUtmMapProjection.hxx           |  4 ++--
 .../otbVectorDataIntoImageProjectionFilter.h  |  2 +-
 ...otbVectorDataIntoImageProjectionFilter.hxx |  4 ++--
 .../include/otbVectorDataProjectionFilter.h   |  2 +-
 .../include/otbVectorDataProjectionFilter.hxx |  4 ++--
 .../include/otbVectorDataTransformFilter.h    |  2 +-
 .../include/otbVectorDataTransformFilter.hxx  |  4 ++--
 .../otbMeanShiftSmoothingImageFilter.h        |  2 +-
 .../otbMeanShiftSmoothingImageFilter.hxx      |  4 ++--
 .../include/otbConcatenateSampleListFilter.h  |  2 +-
 .../otbConcatenateSampleListFilter.hxx        |  4 ++--
 ...bContinuousMinimumMaximumImageCalculator.h |  2 +-
 ...ontinuousMinimumMaximumImageCalculator.hxx |  4 ++--
 ...otbGaussianAdditiveNoiseSampleListFilter.h |  2 +-
 ...bGaussianAdditiveNoiseSampleListFilter.hxx |  4 ++--
 .../include/otbHistogramStatisticsFunction.h  |  2 +-
 .../otbHistogramStatisticsFunction.hxx        |  4 ++--
 .../include/otbListSampleGenerator.h          |  2 +-
 .../include/otbListSampleGenerator.hxx        |  4 ++--
 .../Statistics/include/otbListSampleSource.h  |  2 +-
 .../include/otbListSampleSource.hxx           |  4 ++--
 .../otbListSampleToBalancedListSampleFilter.h |  2 +-
 ...tbListSampleToBalancedListSampleFilter.hxx |  4 ++--
 .../otbListSampleToHistogramListGenerator.h   |  2 +-
 .../otbListSampleToHistogramListGenerator.hxx |  4 ++--
 .../include/otbListSampleToListSampleFilter.h |  2 +-
 .../otbListSampleToListSampleFilter.hxx       |  4 ++--
 ...pleToVariableDimensionHistogramGenerator.h |  2 +-
 ...eToVariableDimensionHistogramGenerator.hxx |  4 ++--
 .../include/otbLocalHistogramImageFunction.h  |  2 +-
 .../otbLocalHistogramImageFunction.hxx        |  4 ++--
 .../include/otbNormalizeVectorImageFilter.h   |  2 +-
 .../include/otbNormalizeVectorImageFilter.hxx |  6 ++---
 .../include/otbShiftScaleSampleListFilter.h   |  2 +-
 .../include/otbShiftScaleSampleListFilter.hxx |  4 ++--
 .../include/otbStreamingCompareImageFilter.h  |  2 +-
 .../otbStreamingCompareImageFilter.hxx        |  4 ++--
 .../otbStreamingHistogramVectorImageFilter.h  |  2 +-
 ...otbStreamingHistogramVectorImageFilter.hxx |  4 ++--
 .../include/otbStreamingMinMaxImageFilter.h   |  2 +-
 .../include/otbStreamingMinMaxImageFilter.hxx |  4 ++--
 .../otbStreamingMinMaxVectorImageFilter.h     |  2 +-
 .../otbStreamingMinMaxVectorImageFilter.hxx   |  4 ++--
 .../otbStreamingStatisticsImageFilter.h       |  2 +-
 .../otbStreamingStatisticsImageFilter.hxx     |  4 ++--
 ...reamingStatisticsMapFromLabelImageFilter.h |  2 +-
 ...amingStatisticsMapFromLabelImageFilter.hxx |  4 ++--
 .../otbStreamingStatisticsVectorImageFilter.h |  2 +-
 ...tbStreamingStatisticsVectorImageFilter.hxx |  4 ++--
 .../include/otbVarianceImageFilter.h          |  2 +-
 .../include/otbVarianceImageFilter.hxx        |  4 ++--
 .../otbVectorImageToIntensityImageFilter.h    |  2 +-
 .../otbVectorImageToIntensityImageFilter.hxx  |  4 ++--
 .../otbVectorImageToMatrixImageFilter.h       |  2 +-
 .../otbVectorImageToMatrixImageFilter.hxx     |  4 ++--
 .../include/otbConcatenateVectorDataFilter.h  |  2 +-
 .../otbConcatenateVectorDataFilter.hxx        |  4 ++--
 .../otbDBOverlapDataNodeFeatureFunction.h     |  2 +-
 .../otbDBOverlapDataNodeFeatureFunction.hxx   |  4 ++--
 ...sWithNeighborhoodDataNodeFeatureFunction.h |  2 +-
 ...ithNeighborhoodDataNodeFeatureFunction.hxx |  4 ++--
 .../otbSpectralAngleDataNodeFeatureFunction.h |  2 +-
 ...tbSpectralAngleDataNodeFeatureFunction.hxx |  4 ++--
 .../include/otbVectorDataAdapter.h            |  2 +-
 .../include/otbVectorDataAdapter.hxx          |  4 ++--
 .../include/otbVectorDataExtractROI.h         |  2 +-
 .../include/otbVectorDataExtractROI.hxx       |  4 ++--
 .../otbVectorDataToRandomLineGenerator.h      |  2 +-
 .../otbVectorDataToRandomLineGenerator.hxx    |  4 ++--
 ...ectorDataToSpecificDescriptionFilterBase.h |  2 +-
 ...torDataToSpecificDescriptionFilterBase.hxx |  4 ++--
 .../include/otbVectorDataToVectorDataFilter.h |  2 +-
 .../otbVectorDataToVectorDataFilter.hxx       |  4 ++--
 .../include/otbVectorDataToMapFilter.h        |  2 +-
 .../include/otbVectorDataToMapFilter.hxx      |  4 ++--
 .../Wavelet/include/otbSubsampleImageFilter.h |  2 +-
 .../include/otbSubsampleImageFilter.hxx       |  4 ++--
 .../Wavelet/include/otbWaveletFilterBank.h    |  2 +-
 .../Wavelet/include/otbWaveletFilterBank.hxx  |  4 ++--
 .../Wavelet/include/otbWaveletImageFilter.h   |  2 +-
 .../Wavelet/include/otbWaveletImageFilter.hxx |  4 ++--
 .../include/otbWaveletInverseImageFilter.h    |  2 +-
 .../include/otbWaveletInverseImageFilter.hxx  |  4 ++--
 .../Wavelet/include/otbWaveletOperatorBase.h  |  2 +-
 .../include/otbWaveletOperatorBase.hxx        |  4 ++--
 .../include/otbWaveletPacketTransform.h       |  2 +-
 .../include/otbWaveletPacketTransform.hxx     |  4 ++--
 .../Wavelet/include/otbWaveletTransform.h     |  2 +-
 .../Wavelet/include/otbWaveletTransform.hxx   |  4 ++--
 ...tsBandsListToWaveletsSynopsisImageFilter.h |  2 +-
 ...BandsListToWaveletsSynopsisImageFilter.hxx |  4 ++--
 ...tsSynopsisImageToWaveletsBandsListFilter.h |  2 +-
 ...SynopsisImageToWaveletsBandsListFilter.hxx |  4 ++--
 .../Wavelet/src/otbWaveletGenerator.cxx       |  2 +-
 .../Fusion/Fuzzy/include/otbFuzzyVariable.h   |  2 +-
 .../Fusion/Fuzzy/include/otbFuzzyVariable.hxx |  4 ++--
 ...otbNeighborhoodMajorityVotingImageFilter.h |  2 +-
 ...bNeighborhoodMajorityVotingImageFilter.hxx |  4 ++--
 .../include/otbBayesianFusionFilter.h         |  2 +-
 .../include/otbBayesianFusionFilter.hxx       |  4 ++--
 .../otbLmvmPanSharpeningFusionImageFilter.h   |  2 +-
 .../otbLmvmPanSharpeningFusionImageFilter.hxx |  4 ++--
 ...bSimpleRcsPanSharpeningFusionImageFilter.h |  2 +-
 ...impleRcsPanSharpeningFusionImageFilter.hxx |  4 ++--
 .../include/otbLocalRxDetectorFilter.h        |  2 +-
 .../include/otbLocalRxDetectorFilter.hxx      |  4 ++--
 .../otbLocalRxDetectorNonThreadFilter.h       |  2 +-
 .../otbLocalRxDetectorNonThreadFilter.hxx     |  4 ++--
 .../otbEigenvalueLikelihoodMaximisation.h     |  2 +-
 .../otbEigenvalueLikelihoodMaximisation.hxx   |  4 ++--
 .../include/otbVcaImageFilter.h               |  2 +-
 .../include/otbVcaImageFilter.hxx             |  4 ++--
 .../include/otbVirtualDimensionality.h        |  2 +-
 .../include/otbVirtualDimensionality.hxx      |  4 ++--
 .../include/otbISRAUnmixingImageFilter.h      |  2 +-
 .../include/otbISRAUnmixingImageFilter.hxx    |  4 ++--
 .../Unmixing/include/otbMDMDNMFImageFilter.h  |  2 +-
 .../include/otbMDMDNMFImageFilter.hxx         |  4 ++--
 .../include/otbNCLSUnmixingImageFilter.h      |  2 +-
 .../include/otbNCLSUnmixingImageFilter.hxx    |  4 ++--
 .../include/otbSparseUnmixingImageFilter.h    |  2 +-
 .../include/otbSparseUnmixingImageFilter.hxx  |  4 ++--
 .../otbUnConstrainedLeastSquareImageFilter.h  |  2 +-
 ...otbUnConstrainedLeastSquareImageFilter.hxx |  4 ++--
 .../otbImageToOSMVectorDataGenerator.h        |  2 +-
 .../otbImageToOSMVectorDataGenerator.hxx      |  4 ++--
 .../Carto/include/otbMapFileProductWriter.h   |  2 +-
 .../Carto/include/otbMapFileProductWriter.hxx |  4 ++--
 .../include/otbStatisticsXMLFileReader.h      |  2 +-
 .../include/otbStatisticsXMLFileReader.hxx    |  4 ++--
 .../include/otbStatisticsXMLFileWriter.h      |  2 +-
 .../include/otbStatisticsXMLFileWriter.hxx    |  4 ++--
 .../IO/ImageIO/include/otbImageFileReader.h   |  2 +-
 .../IO/ImageIO/include/otbImageFileReader.hxx |  4 ++--
 .../IO/ImageIO/include/otbImageFileWriter.h   |  2 +-
 .../IO/ImageIO/include/otbImageFileWriter.hxx |  4 ++--
 .../include/otbImageSeriesFileReader.h        |  2 +-
 .../include/otbImageSeriesFileReader.hxx      |  4 ++--
 .../include/otbImageSeriesFileReaderBase.h    |  2 +-
 .../include/otbImageSeriesFileReaderBase.hxx  |  4 ++--
 .../ImageIO/include/otbMultiImageFileWriter.h |  2 +-
 .../include/otbMultiImageFileWriter.hxx       |  6 ++---
 .../otbScalarBufferToImageFileWriter.h        |  2 +-
 .../otbScalarBufferToImageFileWriter.hxx      |  4 ++--
 .../KMZWriter/include/otbKmzProductWriter.h   |  2 +-
 .../KMZWriter/include/otbKmzProductWriter.hxx |  4 ++--
 .../include/otbDifferenceImageFilter.h        |  2 +-
 .../include/otbDifferenceImageFilter.hxx      |  4 ++--
 .../include/otbVectorDataFileReader.h         |  2 +-
 .../include/otbVectorDataFileReader.hxx       |  4 ++--
 .../include/otbVectorDataFileWriter.h         |  2 +-
 .../include/otbVectorDataFileWriter.hxx       |  4 ++--
 .../otbConfusionMatrixToMassOfBelief.h        |  2 +-
 .../otbConfusionMatrixToMassOfBelief.hxx      |  4 ++--
 .../otbDSFusionOfClassifiersImageFilter.h     |  2 +-
 .../otbDSFusionOfClassifiersImageFilter.hxx   |  4 ++--
 .../include/otbJointMassOfBeliefFilter.h      |  2 +-
 .../include/otbJointMassOfBeliefFilter.hxx    |  6 ++---
 .../DempsterShafer/include/otbMassOfBelief.h  |  2 +-
 .../include/otbMassOfBelief.hxx               |  4 ++--
 .../include/otbStandardDSCostFunction.h       |  2 +-
 .../include/otbStandardDSCostFunction.hxx     |  4 ++--
 ...bVectorDataToDSValidatedVectorDataFilter.h |  2 +-
 ...ectorDataToDSValidatedVectorDataFilter.hxx |  4 ++--
 .../include/otbAutoencoderModel.h             |  2 +-
 .../include/otbAutoencoderModel.hxx           |  4 ++--
 .../include/otbAutoencoderModelFactory.h      |  2 +-
 .../include/otbAutoencoderModelFactory.hxx    |  4 ++--
 .../otbDimensionalityReductionModelFactory.h  |  2 +-
 ...otbDimensionalityReductionModelFactory.hxx |  4 ++--
 .../otbImageDimensionalityReductionFilter.h   |  2 +-
 .../otbImageDimensionalityReductionFilter.hxx |  4 ++--
 .../include/otbPCAModel.h                     |  2 +-
 .../include/otbPCAModel.hxx                   |  4 ++--
 .../include/otbPCAModelFactory.h              |  2 +-
 .../include/otbPCAModelFactory.hxx            |  4 ++--
 .../include/otbSOMModel.h                     |  2 +-
 .../include/otbSOMModel.hxx                   |  4 ++--
 .../include/otbSOMModelFactory.h              |  2 +-
 .../include/otbSOMModelFactory.hxx            |  4 ++--
 .../LearningBase/include/otbDecisionTree.h    |  2 +-
 .../LearningBase/include/otbDecisionTree.hxx  |  4 ++--
 .../include/otbGaussianModelComponent.h       |  2 +-
 .../include/otbGaussianModelComponent.hxx     |  4 ++--
 .../include/otbImageClassificationFilter.h    |  2 +-
 .../include/otbImageClassificationFilter.hxx  |  4 ++--
 .../otbKMeansImageClassificationFilter.h      |  2 +-
 .../otbKMeansImageClassificationFilter.hxx    |  4 ++--
 .../include/otbMachineLearningModel.h         |  2 +-
 .../include/otbMachineLearningModel.hxx       |  4 ++--
 .../LearningBase/include/otbSEMClassifier.h   |  2 +-
 .../LearningBase/include/otbSEMClassifier.hxx |  4 ++--
 .../include/otbMarkovRandomFieldFilter.h      |  2 +-
 .../include/otbMarkovRandomFieldFilter.hxx    |  4 ++--
 Modules/Learning/SOM/include/otbPeriodicSOM.h |  2 +-
 .../Learning/SOM/include/otbPeriodicSOM.hxx   |  4 ++--
 Modules/Learning/SOM/include/otbSOM.h         |  2 +-
 Modules/Learning/SOM/include/otbSOM.hxx       |  4 ++--
 .../SOM/include/otbSOMActivationBuilder.h     |  2 +-
 .../SOM/include/otbSOMActivationBuilder.hxx   |  4 ++--
 .../Learning/SOM/include/otbSOMClassifier.h   |  2 +-
 .../Learning/SOM/include/otbSOMClassifier.hxx |  4 ++--
 .../include/otbSOMImageClassificationFilter.h |  2 +-
 .../otbSOMImageClassificationFilter.hxx       |  4 ++--
 Modules/Learning/SOM/include/otbSOMMap.h      |  2 +-
 Modules/Learning/SOM/include/otbSOMMap.hxx    |  4 ++--
 .../SOM/include/otbSOMWithMissingValue.h      |  2 +-
 .../SOM/include/otbSOMWithMissingValue.hxx    |  4 ++--
 .../SOM/include/otbSOMbasedImageFilter.h      |  2 +-
 .../SOM/include/otbSOMbasedImageFilter.hxx    |  4 ++--
 .../include/otbImageSampleExtractorFilter.h   |  2 +-
 .../include/otbImageSampleExtractorFilter.hxx |  4 ++--
 .../otbOGRDataToClassStatisticsFilter.h       |  2 +-
 .../otbOGRDataToClassStatisticsFilter.hxx     |  4 ++--
 .../otbOGRDataToSamplePositionFilter.h        |  2 +-
 .../otbOGRDataToSamplePositionFilter.hxx      |  4 ++--
 .../include/otbPersistentSamplingFilterBase.h |  2 +-
 .../otbPersistentSamplingFilterBase.hxx       |  4 ++--
 .../include/otbBoostMachineLearningModel.h    |  2 +-
 .../include/otbBoostMachineLearningModel.hxx  |  4 ++--
 .../otbBoostMachineLearningModelFactory.h     |  2 +-
 .../otbBoostMachineLearningModelFactory.hxx   |  4 ++--
 .../include/otbConfusionMatrixCalculator.h    |  2 +-
 .../include/otbConfusionMatrixCalculator.hxx  |  4 ++--
 .../include/otbConfusionMatrixMeasurements.h  |  2 +-
 .../otbConfusionMatrixMeasurements.hxx        |  4 ++--
 .../otbDecisionTreeMachineLearningModel.h     |  2 +-
 .../otbDecisionTreeMachineLearningModel.hxx   |  4 ++--
 ...bDecisionTreeMachineLearningModelFactory.h |  2 +-
 ...ecisionTreeMachineLearningModelFactory.hxx |  4 ++--
 ...bGradientBoostedTreeMachineLearningModel.h |  2 +-
 ...radientBoostedTreeMachineLearningModel.hxx |  4 ++--
 ...ntBoostedTreeMachineLearningModelFactory.h |  2 +-
 ...BoostedTreeMachineLearningModelFactory.hxx |  4 ++--
 ...otbKNearestNeighborsMachineLearningModel.h |  2 +-
 ...bKNearestNeighborsMachineLearningModel.hxx |  4 ++--
 ...restNeighborsMachineLearningModelFactory.h |  2 +-
 ...stNeighborsMachineLearningModelFactory.hxx |  4 ++--
 .../include/otbLabelMapClassifier.h           |  2 +-
 .../include/otbLabelMapClassifier.hxx         |  4 ++--
 .../include/otbLibSVMMachineLearningModel.h   |  2 +-
 .../include/otbLibSVMMachineLearningModel.hxx |  4 ++--
 .../otbLibSVMMachineLearningModelFactory.h    |  2 +-
 .../otbLibSVMMachineLearningModelFactory.hxx  |  4 ++--
 .../include/otbMachineLearningModelFactory.h  |  2 +-
 .../otbMachineLearningModelFactory.hxx        |  4 ++--
 .../otbNeuralNetworkMachineLearningModel.h    |  2 +-
 .../otbNeuralNetworkMachineLearningModel.hxx  |  4 ++--
 ...NeuralNetworkMachineLearningModelFactory.h |  2 +-
 ...uralNetworkMachineLearningModelFactory.hxx |  4 ++--
 .../otbNormalBayesMachineLearningModel.h      |  2 +-
 .../otbNormalBayesMachineLearningModel.hxx    |  4 ++--
 ...tbNormalBayesMachineLearningModelFactory.h |  2 +-
 ...NormalBayesMachineLearningModelFactory.hxx |  4 ++--
 .../otbRandomForestsMachineLearningModel.h    |  2 +-
 .../otbRandomForestsMachineLearningModel.hxx  |  4 ++--
 ...RandomForestsMachineLearningModelFactory.h |  2 +-
 ...ndomForestsMachineLearningModelFactory.hxx |  4 ++--
 .../otbSVMCrossValidationCostFunction.h       |  2 +-
 .../otbSVMCrossValidationCostFunction.hxx     |  4 ++--
 .../include/otbSVMMachineLearningModel.h      |  2 +-
 .../include/otbSVMMachineLearningModel.hxx    |  4 ++--
 .../otbSVMMachineLearningModelFactory.h       |  2 +-
 .../otbSVMMachineLearningModelFactory.hxx     |  4 ++--
 .../Supervised/include/otbSVMMarginSampler.h  |  2 +-
 .../include/otbSVMMarginSampler.hxx           |  4 ++--
 ...tbSharkRandomForestsMachineLearningModel.h |  2 +-
 ...SharkRandomForestsMachineLearningModel.hxx |  4 ++--
 ...RandomForestsMachineLearningModelFactory.h |  2 +-
 ...ndomForestsMachineLearningModelFactory.hxx |  4 ++--
 .../include/otbContingencyTableCalculator.h   |  2 +-
 .../include/otbContingencyTableCalculator.hxx |  4 ++--
 .../otbSharkKMeansMachineLearningModel.h      |  2 +-
 .../otbSharkKMeansMachineLearningModel.hxx    |  4 ++--
 ...tbSharkKMeansMachineLearningModelFactory.h |  2 +-
 ...SharkKMeansMachineLearningModelFactory.hxx |  4 ++--
 .../include/otbSimpleParallelTiffWriter.h     |  2 +-
 .../include/otbSimpleParallelTiffWriter.hxx   |  4 ++--
 .../MPIVrtWriter/include/otbMPIVrtWriter.h    |  2 +-
 .../MPIVrtWriter/include/otbMPIVrtWriter.hxx  |  4 ++--
 .../include/otbImageListToRCC8GraphFilter.h   |  2 +-
 .../include/otbImageListToRCC8GraphFilter.hxx |  4 ++--
 ...bImageMultiSegmentationToRCC8GraphFilter.h |  2 +-
 ...mageMultiSegmentationToRCC8GraphFilter.hxx |  4 ++--
 .../include/otbImageToImageRCC8Calculator.h   |  2 +-
 .../include/otbImageToImageRCC8Calculator.hxx |  4 ++--
 .../include/otbPolygonListToRCC8GraphFilter.h |  2 +-
 .../otbPolygonListToRCC8GraphFilter.hxx       |  4 ++--
 .../otbPolygonToPolygonRCC8Calculator.h       |  2 +-
 .../otbPolygonToPolygonRCC8Calculator.hxx     |  4 ++--
 .../OBIA/RCC8/include/otbRCC8EdgeIterator.h   |  2 +-
 .../OBIA/RCC8/include/otbRCC8EdgeIterator.hxx |  4 ++--
 Modules/OBIA/RCC8/include/otbRCC8Graph.h      |  2 +-
 Modules/OBIA/RCC8/include/otbRCC8Graph.hxx    |  4 ++--
 .../RCC8/include/otbRCC8GraphFileReader.h     |  2 +-
 .../RCC8/include/otbRCC8GraphFileReader.hxx   |  4 ++--
 .../RCC8/include/otbRCC8GraphFileWriter.h     |  2 +-
 .../RCC8/include/otbRCC8GraphFileWriter.hxx   |  4 ++--
 .../OBIA/RCC8/include/otbRCC8GraphSource.h    |  2 +-
 .../OBIA/RCC8/include/otbRCC8GraphSource.hxx  |  4 ++--
 .../OBIA/RCC8/include/otbRCC8InEdgeIterator.h |  2 +-
 .../RCC8/include/otbRCC8InEdgeIterator.hxx    |  4 ++--
 .../RCC8/include/otbRCC8OutEdgeIterator.h     |  2 +-
 .../RCC8/include/otbRCC8OutEdgeIterator.hxx   |  4 ++--
 Modules/OBIA/RCC8/include/otbRCC8VertexBase.h |  2 +-
 .../OBIA/RCC8/include/otbRCC8VertexBase.hxx   |  4 ++--
 .../OBIA/RCC8/include/otbRCC8VertexIterator.h |  2 +-
 .../RCC8/include/otbRCC8VertexIterator.hxx    |  4 ++--
 .../RCC8/include/otbRCC8VertexWithCompacity.h |  2 +-
 .../include/otbRCC8VertexWithCompacity.hxx    |  4 ++--
 .../include/otbRCC8VertexWithRegionCenter.h   |  2 +-
 .../include/otbRCC8VertexWithRegionCenter.hxx |  4 ++--
 .../include/otbGAndRIndexImageFilter.h        |  2 +-
 .../include/otbGAndRIndexImageFilter.hxx      |  4 ++--
 .../include/otbNDVIDataNodeFeatureFunction.h  |  2 +-
 .../otbNDVIDataNodeFeatureFunction.hxx        |  4 ++--
 .../include/otbRAndBAndNIRIndexImageFilter.h  |  2 +-
 .../otbRAndBAndNIRIndexImageFilter.hxx        |  4 ++--
 .../include/otbRAndGAndNIRIndexImageFilter.h  |  2 +-
 .../otbRAndGAndNIRIndexImageFilter.hxx        |  4 ++--
 .../include/otbRAndNIRIndexImageFilter.h      |  2 +-
 .../include/otbRAndNIRIndexImageFilter.hxx    |  4 ++--
 ...flectanceToSurfaceReflectanceImageFilter.h |  2 +-
 ...ectanceToSurfaceReflectanceImageFilter.hxx |  4 ++--
 ...aceAdjacencyEffectCorrectionSchemeFilter.h |  2 +-
 ...eAdjacencyEffectCorrectionSchemeFilter.hxx |  4 ++--
 .../include/otbSarBrightnessFunction.h        |  2 +-
 .../include/otbSarBrightnessFunction.hxx      |  4 ++--
 .../include/otbSarBrightnessToImageFilter.h   |  2 +-
 .../include/otbSarBrightnessToImageFilter.hxx |  4 ++--
 .../include/otbSarDeburstImageFilter.h        |  2 +-
 .../include/otbSarDeburstImageFilter.hxx      |  4 ++--
 .../include/otbSarParametricMapFunction.h     |  2 +-
 .../include/otbSarParametricMapFunction.hxx   |  4 ++--
 .../otbSarRadiometricCalibrationFunction.h    |  2 +-
 .../otbSarRadiometricCalibrationFunction.hxx  |  4 ++--
 ...tbSarRadiometricCalibrationToImageFilter.h |  2 +-
 ...SarRadiometricCalibrationToImageFilter.hxx |  4 ++--
 .../include/otbTerraSarBrightnessFunctor.h    |  2 +-
 .../include/otbTerraSarBrightnessFunctor.hxx  |  4 ++--
 .../otbTerraSarBrightnessImageFilter.h        |  2 +-
 .../otbTerraSarBrightnessImageFilter.hxx      |  4 ++--
 .../include/otbAtmosphericEffects.h           |  2 +-
 .../include/otbAtmosphericEffects.hxx         |  4 ++--
 .../include/otbImageSimulationMethod.h        |  2 +-
 .../include/otbImageSimulationMethod.hxx      |  4 ++--
 .../otbLabelMapToSimulatedImageFilter.h       |  2 +-
 .../otbLabelMapToSimulatedImageFilter.hxx     |  4 ++--
 .../include/otbLabelToProSailParameters.h     |  2 +-
 .../include/otbLabelToProSailParameters.hxx   |  4 ++--
 .../include/otbReduceSpectralResponse.h       |  2 +-
 .../include/otbReduceSpectralResponse.hxx     |  4 ++--
 ...bReduceSpectralResponseClassifierRAndNIR.h |  2 +-
 ...educeSpectralResponseClassifierRAndNIR.hxx |  4 ++--
 .../Simulation/include/otbSatelliteRSR.h      |  2 +-
 .../Simulation/include/otbSatelliteRSR.hxx    |  4 ++--
 .../include/otbSpatialisationFilter.h         |  2 +-
 .../include/otbSpatialisationFilter.hxx       |  4 ++--
 .../Simulation/include/otbSpectralResponse.h  |  2 +-
 .../include/otbSpectralResponse.hxx           |  4 ++--
 ...otbSurfaceReflectanceToReflectanceFilter.h |  2 +-
 ...bSurfaceReflectanceToReflectanceFilter.hxx |  4 ++--
 .../include/otbDisparityMapEstimationMethod.h |  2 +-
 .../otbDisparityMapEstimationMethod.hxx       |  4 ++--
 .../include/otbDisparityMapMedianFilter.h     |  2 +-
 .../include/otbDisparityMapMedianFilter.hxx   |  4 ++--
 .../include/otbDisparityMapTo3DFilter.h       |  2 +-
 .../include/otbDisparityMapTo3DFilter.hxx     |  4 ++--
 .../include/otbDisparityMapToDEMFilter.h      |  2 +-
 .../include/otbDisparityMapToDEMFilter.hxx    |  4 ++--
 .../include/otbDisparityTranslateFilter.h     |  2 +-
 .../include/otbDisparityTranslateFilter.hxx   |  4 ++--
 .../include/otbFineRegistrationImageFilter.h  |  2 +-
 .../otbFineRegistrationImageFilter.hxx        |  4 ++--
 .../include/otbMultiDisparityMapTo3DFilter.h  |  2 +-
 .../otbMultiDisparityMapTo3DFilter.hxx        |  4 ++--
 .../include/otbNCCRegistrationFilter.h        |  2 +-
 .../include/otbNCCRegistrationFilter.hxx      |  4 ++--
 .../include/otbNCCRegistrationFunction.h      |  2 +-
 .../include/otbNCCRegistrationFunction.hxx    |  4 ++--
 .../otbPixelWiseBlockMatchingImageFilter.h    |  2 +-
 .../otbPixelWiseBlockMatchingImageFilter.hxx  |  4 ++--
 .../include/otbSubPixelDisparityImageFilter.h |  2 +-
 .../otbSubPixelDisparityImageFilter.hxx       |  4 ++--
 ...nesInterpolateDisplacementFieldGenerator.h |  2 +-
 ...sInterpolateDisplacementFieldGenerator.hxx |  4 ++--
 ...olateTransformDisplacementFieldGenerator.h |  2 +-
 ...ateTransformDisplacementFieldGenerator.hxx |  4 ++--
 ...earInterpolateDisplacementFieldGenerator.h |  2 +-
 ...rInterpolateDisplacementFieldGenerator.hxx |  4 ++--
 ...earInterpolateDisplacementFieldGenerator.h |  2 +-
 ...rInterpolateDisplacementFieldGenerator.hxx |  4 ++--
 ...tbNearestPointDisplacementFieldGenerator.h |  2 +-
 ...NearestPointDisplacementFieldGenerator.hxx |  4 ++--
 ...arestTransformDisplacementFieldGenerator.h |  2 +-
 ...estTransformDisplacementFieldGenerator.hxx |  4 ++--
 .../otbPointSetToDisplacementFieldGenerator.h |  2 +-
 ...tbPointSetToDisplacementFieldGenerator.hxx |  4 ++--
 ...ithTransformToDisplacementFieldGenerator.h |  2 +-
 ...hTransformToDisplacementFieldGenerator.hxx |  4 ++--
 .../include/otbAdhesionCorrectionFilter.h     |  2 +-
 .../include/otbAdhesionCorrectionFilter.hxx   |  4 ++--
 .../include/otbBijectionCoherencyFilter.h     |  2 +-
 .../include/otbBijectionCoherencyFilter.hxx   |  4 ++--
 .../Stereo/include/otbLineOfSightOptimizer.h  |  2 +-
 .../include/otbLineOfSightOptimizer.hxx       |  4 ++--
 .../Stereo/include/otbMulti3DMapToDEMFilter.h |  2 +-
 .../include/otbMulti3DMapToDEMFilter.hxx      |  4 ++--
 ...otbStereoSensorModelToElevationMapFilter.h |  2 +-
 ...bStereoSensorModelToElevationMapFilter.hxx |  4 ++--
 ...ereorectificationDisplacementFieldSource.h |  2 +-
 ...eorectificationDisplacementFieldSource.hxx |  4 ++--
 .../otbLabelObjectOpeningMuParserFilter.h     |  2 +-
 .../otbLabelObjectOpeningMuParserFilter.hxx   |  4 ++--
 ...ponentSegmentationOBIAToVectorDataFilter.h |  2 +-
 ...nentSegmentationOBIAToVectorDataFilter.hxx |  4 ++--
 .../otbLabelImageRegionMergingFilter.h        |  2 +-
 .../otbLabelImageRegionMergingFilter.hxx      |  4 ++--
 .../otbLabelImageRegionPruningFilter.h        |  2 +-
 .../otbLabelImageRegionPruningFilter.hxx      |  4 ++--
 .../otbLabelImageToOGRDataSourceFilter.h      |  2 +-
 .../otbLabelImageToOGRDataSourceFilter.hxx    |  4 ++--
 .../include/otbLabelImageToVectorDataFilter.h |  2 +-
 .../otbLabelImageToVectorDataFilter.hxx       |  4 ++--
 .../include/otbLabelMapToVectorDataFilter.h   |  2 +-
 .../include/otbLabelMapToVectorDataFilter.hxx |  4 ++--
 .../otbOGRDataSourceToLabelImageFilter.h      |  2 +-
 .../otbOGRDataSourceToLabelImageFilter.hxx    |  4 ++--
 .../otbPersistentImageToOGRDataFilter.h       |  2 +-
 .../otbPersistentImageToOGRDataFilter.hxx     |  4 ++--
 .../otbPersistentImageToOGRLayerFilter.h      |  2 +-
 .../otbPersistentImageToOGRLayerFilter.hxx    |  4 ++--
 .../otbPersistentImageToVectorDataFilter.h    |  2 +-
 .../otbPersistentImageToVectorDataFilter.hxx  |  4 ++--
 .../include/otbRasterizeVectorDataFilter.h    |  2 +-
 .../include/otbRasterizeVectorDataFilter.hxx  |  4 ++--
 .../include/otbVectorDataToLabelImageFilter.h |  2 +-
 .../otbVectorDataToLabelImageFilter.hxx       |  4 ++--
 .../include/otbVectorDataToLabelMapFilter.h   |  2 +-
 .../include/otbVectorDataToLabelMapFilter.hxx |  4 ++--
 ...VectorDataToLabelMapWithAttributesFilter.h |  2 +-
 ...ctorDataToLabelMapWithAttributesFilter.hxx |  4 ++--
 ...tbLabelizeConfidenceConnectedImageFilter.h |  2 +-
 ...LabelizeConfidenceConnectedImageFilter.hxx |  4 ++--
 ...otbLabelizeConnectedThresholdImageFilter.h |  2 +-
 ...bLabelizeConnectedThresholdImageFilter.hxx |  4 ++--
 .../include/otbLabelizeImageFilterBase.h      |  2 +-
 .../include/otbLabelizeImageFilterBase.hxx    |  4 ++--
 ...LabelizeNeighborhoodConnectedImageFilter.h |  2 +-
 ...belizeNeighborhoodConnectedImageFilter.hxx |  4 ++--
 .../include/otbRelabelComponentImageFilter.h  |  2 +-
 .../otbRelabelComponentImageFilter.hxx        |  4 ++--
 ...hiftConnectedComponentSegmentationFilter.h |  2 +-
 ...ftConnectedComponentSegmentationFilter.hxx |  4 ++--
 .../include/otbMeanShiftSegmentationFilter.h  |  2 +-
 .../otbMeanShiftSegmentationFilter.hxx        |  4 ++--
 .../Metrics/include/otbHooverInstanceFilter.h |  2 +-
 .../include/otbHooverInstanceFilter.hxx       |  4 ++--
 .../Metrics/include/otbHooverMatrixFilter.h   |  2 +-
 .../Metrics/include/otbHooverMatrixFilter.hxx |  4 ++--
 .../otbClosingOpeningMorphologicalFilter.h    |  2 +-
 .../otbClosingOpeningMorphologicalFilter.hxx  |  4 ++--
 ...odesicMorphologyDecompositionImageFilter.h |  2 +-
 ...esicMorphologyDecompositionImageFilter.hxx |  4 ++--
 ...phologyIterativeDecompositionImageFilter.h |  2 +-
 ...ologyIterativeDecompositionImageFilter.hxx |  4 ++--
 .../include/otbImageToProfileFilter.h         |  2 +-
 .../include/otbImageToProfileFilter.hxx       |  4 ++--
 ...bMorphologicalProfilesSegmentationFilter.h |  2 +-
 ...orphologicalProfilesSegmentationFilter.hxx |  4 ++--
 .../otbOpeningClosingMorphologicalFilter.h    |  2 +-
 .../otbOpeningClosingMorphologicalFilter.hxx  |  4 ++--
 ...ivativeToMultiScaleCharacteristicsFilter.h |  2 +-
 ...ativeToMultiScaleCharacteristicsFilter.hxx |  4 ++--
 .../otbProfileToProfileDerivativeFilter.h     |  2 +-
 .../otbProfileToProfileDerivativeFilter.hxx   |  4 ++--
 .../otbOGRLayerStreamStitchingFilter.h        |  2 +-
 .../otbOGRLayerStreamStitchingFilter.hxx      |  4 ++--
 ...reamingImageToOGRLayerSegmentationFilter.h |  2 +-
 ...amingImageToOGRLayerSegmentationFilter.hxx |  4 ++--
 .../include/otbWatershedSegmentationFilter.h  |  2 +-
 .../otbWatershedSegmentationFilter.hxx        |  4 ++--
 .../include/otbWrapperApplication.h           |  2 +-
 .../otbWrapperComplexInputImageParameter.h    |  2 +-
 .../otbWrapperComplexInputImageParameter.hxx  |  4 ++--
 .../include/otbWrapperInputImageParameter.h   |  2 +-
 .../include/otbWrapperInputImageParameter.hxx |  4 ++--
 .../include/otbWrapperParameterList.h         |  2 +-
 .../include/otbWrapperParameterList.hxx       |  4 ++--
 .../include/otbWrapperProxyParameter.h        |  2 +-
 Utilities/Doxygen/doxygen.config.in           |  2 +-
 Utilities/Maintenance/BuildHeaderTest.py      |  8 +++----
 1137 files changed, 1740 insertions(+), 1740 deletions(-)

diff --git a/CMake/OTBModuleHeaderTest.cmake b/CMake/OTBModuleHeaderTest.cmake
index ca2f7cb5ef..1b01c7e82e 100644
--- a/CMake/OTBModuleHeaderTest.cmake
+++ b/CMake/OTBModuleHeaderTest.cmake
@@ -46,7 +46,7 @@ if(NOT OTB_USE_OPENCV)
 	SET(BANNED_HEADERS "${BANNED_HEADERS} otbDecisionTreeMachineLearningModelFactory.h otbDecisionTreeMachineLearningModel.h otbKNearestNeighborsMachineLearningModelFactory.h otbKNearestNeighborsMachineLearningModel.h otbRandomForestsMachineLearningModelFactory.h otbRandomForestsMachineLearningModel.h otbSVMMachineLearningModelFactory.h otbSVMMachineLearningModel.h otbGradientBoostedTreeMachineLearningModelFactory.h otbGradientBoostedTreeMachineLearningModel.h otbBoostMachineLearningModelFactory.h otbBoostMachineLearningModel.h otbNeuralNetworkMachineLearningModelFactory.h otbNeuralNetworkMachineLearningModel.h otbNormalBayesMachineLearningModelFactory.h otbNormalBayesMachineLearningModel.h otbRequiresOpenCVCheck.h otbOpenCVUtils.h otbCvRTreesWrapper.h")
 endif()
 if(NOT OTB_USE_SHARK)
-  SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.txx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h  otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.txx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.txx")
+  SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.hxx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h  otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.hxx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.hxx")
 endif()
 if(NOT OTB_USE_LIBSVM)
 	SET(BANNED_HEADERS "${BANNED_HEADERS} otbLibSVMMachineLearningModel.h otbLibSVMMachineLearningModelFactory.h")
diff --git a/Documentation/SoftwareGuide/Examples/RunExamples.pl b/Documentation/SoftwareGuide/Examples/RunExamples.pl
index 9d6f330cc3..dfb6efb548 100644
--- a/Documentation/SoftwareGuide/Examples/RunExamples.pl
+++ b/Documentation/SoftwareGuide/Examples/RunExamples.pl
@@ -2,7 +2,7 @@
 
 #
 #
-# This Script is used to infer figure dependencies from the .cxx/.txx source
+# This Script is used to infer figure dependencies from the .cxx/.hxx source
 # files in the Insight/Examples directory.
 # 
 # This automatic generation mechanism guaranties that the figures 
@@ -77,7 +77,7 @@ $numArgs = $#ARGV + 1;
 if( $numArgs < 5 )
   {
       print "Usage arguments: \n";
-      print "  Name of the .cxx/.txx file (with extension).\n";
+      print "  Name of the .cxx/.hxx file (with extension).\n";
       print "  OTBExecsDirectoryPath \n";
       print "  Cmake file to be generated\n";
       print "  Name of the TEX file generated, so dependencies can be specified\n";
@@ -121,7 +121,7 @@ sub GetArgsAndFilenames {
   #Exec file anme is assumed to be the same as the source filename
   my $volume; my $directories;
   ($volume,$directories,$inputsourcefile) = File::Spec->splitpath( $inputfilename );
-  $inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.txx|\.TXX)/; 
+  $inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.hxx|\.HXX)/; 
   my $execfilenamebase = $1;
 
   #If the paths have a trailing /, remove it.
diff --git a/Documentation/SoftwareGuide/Latex/Introduction.tex b/Documentation/SoftwareGuide/Latex/Introduction.tex
index f3ae6653ba..ad782dca9f 100644
--- a/Documentation/SoftwareGuide/Latex/Introduction.tex
+++ b/Documentation/SoftwareGuide/Latex/Introduction.tex
@@ -200,7 +200,7 @@ aware of.
         \url{http://www.orfeo-toolbox.org/doxygen/}.
 
 	\item[Header Files.] Each OTB class is implemented with a .h and
-        .cxx/.txx file (.txx file for templated classes). All methods
+        .cxx/.hxx file (.hxx file for templated classes). All methods
         found in the .h header files are documented and provide a quick way
         to find documentation for a particular method. (Indeed, Doxygen uses
         the header documentation to produces its output.)
diff --git a/Documentation/SoftwareGuide/Latex/Iterators.tex b/Documentation/SoftwareGuide/Latex/Iterators.tex
index 1c303cbbf1..590eeac55a 100644
--- a/Documentation/SoftwareGuide/Latex/Iterators.tex
+++ b/Documentation/SoftwareGuide/Latex/Iterators.tex
@@ -397,15 +397,15 @@ tasks more efficient or easier to implement.
 %./Common/itkFloodFilledFunctionConditionalIterator.h (BaseClass)
 
 %[ here are all classes where these filters are used:
-% ./BasicFilters/itkConfidenceConnectedImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkConnectedThresholdImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkIsolatedConnectedImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkNeighborhoodConnectedImageFilter.txx (ImageFunction)
+% ./BasicFilters/itkConfidenceConnectedImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkConnectedThresholdImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkIsolatedConnectedImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkNeighborhoodConnectedImageFilter.hxx (ImageFunction)
 %
-% ./Common/itkBinaryBallStructuringElement.txx (SpatialFunction)
-% ./Common/itkBloxCoreAtomImage.txx (SpatialFunction)
-% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.txx (SpatialFunction)
-% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx (SpatialFunction)
+% ./Common/itkBinaryBallStructuringElement.hxx (SpatialFunction)
+% ./Common/itkBloxCoreAtomImage.hxx (SpatialFunction)
+% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.hxx (SpatialFunction)
+% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.hxx (SpatialFunction)
 %]
 
 %\subsection{itk::FloodFilledImageFunctionConditionalIterator}
diff --git a/Documentation/SoftwareGuide/Latex/SystemOverview.tex b/Documentation/SoftwareGuide/Latex/SystemOverview.tex
index 76e6e9c361..915953c123 100644
--- a/Documentation/SoftwareGuide/Latex/SystemOverview.tex
+++ b/Documentation/SoftwareGuide/Latex/SystemOverview.tex
@@ -152,7 +152,7 @@ simplest syntax errors.
 
 In ITK and OTB classes are defined by a maximum of two files: a header \code{.h} file
 and an implementation file---\code{.cxx} if a non-templated class, and a
-\code{.txx} if a templated class.
+\code{.hxx} if a templated class.
 The header files contain class declarations
 and formatted comments that are used by the Doxygen documentation
 system to automatically produce HTML manual pages.
diff --git a/Documentation/SoftwareGuide/Latex/WriteAFilter.tex b/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
index c6cf45a7df..c210051ca6 100644
--- a/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
+++ b/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
@@ -521,12 +521,12 @@ defaults (usually zero) for all parameters.  The copy constructor and
 assignment operator should be declared \code{private} and not implemented,
 to prevent instantiating the filter without the factory methods (above). 
 
-Finally, the template implementation code (in the \code{.txx} file) should
+Finally, the template implementation code (in the \code{.hxx} file) should
 be included, bracketed by a test for manual instantiation, thus:
 
 \begin{verbatim}
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "itkExampleFilter.txx"
+#include "itkExampleFilter.hxx"
 #endif
 \end{verbatim}
 
diff --git a/Documentation/SoftwareGuide/Latex/WriteModules.tex b/Documentation/SoftwareGuide/Latex/WriteModules.tex
index b707526e38..e959f0a7d2 100644
--- a/Documentation/SoftwareGuide/Latex/WriteModules.tex
+++ b/Documentation/SoftwareGuide/Latex/WriteModules.tex
@@ -85,7 +85,7 @@ if(NOT OTB_SOURCE_DIR)
 
 \section{The include folder}
 
-The include folder will contain all your headers (*.h files) and template method boy files (*.txx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required). 
+The include folder will contain all your headers (*.h files) and template method boy files (*.hxx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required). 
 
 \section{The src folder }
 
diff --git a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
index 7dcb3976a0..a28764cc15 100644
--- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
@@ -152,7 +152,7 @@ private:
 
 // Software Guide : BeginLatex
 //
-// Pay attention to the fact that no \code{.txx} file is needed, since
+// Pay attention to the fact that no \code{.hxx} file is needed, since
 // filtering operation is implemented in the
 // \doxygen{otb}{BinaryFunctorNeighborhoodImageFilter} class. So all
 // the algorithmics part is inside the functor.
diff --git a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
index e0c6d878a1..f4d52bf934 100644
--- a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
+++ b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
@@ -61,7 +61,7 @@ std::ostream & Join(std::ostream &os, TRange const& range, std::string const& se
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbJoinContainer.txx"
+// #include "otbJoinContainer.hxx"
 #endif
 
 #endif // otbJoinContainer_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
index 9306c6575b..91b65ec13c 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
@@ -172,7 +172,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbGeometriesSet.txx"
+// #include "otbGeometriesSet.hxx"
 #endif
 
 #endif // otbGeometriesSet_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index 26089652fb..3e604dab36 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -394,7 +394,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeometriesToGeometriesFilter.txx"
+#include "otbGeometriesToGeometriesFilter.hxx"
 #endif
 
 #endif // otbGeometriesToGeometriesFilter_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
index f93df4b179..d76e49380b 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeometriesToGeometriesFilter_txx
-#define otbGeometriesToGeometriesFilter_txx
+#ifndef otbGeometriesToGeometriesFilter_hxx
+#define otbGeometriesToGeometriesFilter_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
diff --git a/Modules/Adapters/GdalAdapters/include/otbImageReference.h b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
index b0b5429bf7..0a4f80a11d 100644
--- a/Modules/Adapters/GdalAdapters/include/otbImageReference.h
+++ b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
@@ -173,7 +173,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbImageReference.txx"
+// #include "otbImageReference.hxx"
 #endif
 
 #endif // otbImageReference_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index 2456e38858..f75d86e784 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -572,7 +572,7 @@ namespace boost { namespace foreach {
 #endif
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataSourceWrapper.txx"
+#include "otbOGRDataSourceWrapper.hxx"
 #endif
 
 #endif // otbOGRDataSourceWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
index 202a223c97..e2990958c6 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
@@ -20,12 +20,12 @@
 
 
 /**\ingroup Geometry
- * \file    otbOGRDataSourceWrapper.txx
+ * \file    otbOGRDataSourceWrapper.hxx
  * \internal this file is meant to be included by otbOGRDataSourceWrapper.h
  */
 
-#ifndef otbOGRDataSourceWrapper_txx
-#define otbOGRDataSourceWrapper_txx
+#ifndef otbOGRDataSourceWrapper_hxx
+#define otbOGRDataSourceWrapper_hxx
 
 #include "otbOGRDataSourceWrapper.h"
 
@@ -132,4 +132,4 @@ Value otb::ogr::DataSource::layer_iter<Value>::dereference() const
 }
 
 
-#endif // otbOGRDataSourceWrapper_txx
+#endif // otbOGRDataSourceWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
index 945241bda3..e0cb6b3005 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
@@ -367,7 +367,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRFeatureWrapper.txx"
+#include "otbOGRFeatureWrapper.hxx"
 #endif
 
 #endif // otbOGRFeatureWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
index df46cee99d..8b0203a3a1 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRFeatureWrapper_txx
-#define otbOGRFeatureWrapper_txx
+#ifndef otbOGRFeatureWrapper_hxx
+#define otbOGRFeatureWrapper_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -208,4 +208,4 @@ void otb::ogr::Feature::PrintSelf(std::ostream & os, itk::Indent indent) const
   UncheckedPrintSelf(os, indent);
 }
 
-#endif // otbOGRFeatureWrapper_txx
+#endif // otbOGRFeatureWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
index 8b3f627571..3f5e4c1e0f 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
@@ -222,7 +222,7 @@ private:
 } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRFieldWrapper.txx"
+#include "otbOGRFieldWrapper.hxx"
 #endif
 
 #endif // otbOGRFieldWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
index 1e74ea5aff..082cf8b4fa 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbOGRFieldWrapper_txx
-#define otbOGRFieldWrapper_txx
+#ifndef otbOGRFieldWrapper_hxx
+#define otbOGRFieldWrapper_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -495,4 +495,4 @@ OGRField & otb::ogr::Field::ogr() const
   return const_cast <Field*>(this)->ogr();
 }
 
-#endif // otbOGRFieldWrapper_txx
+#endif // otbOGRFieldWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
index 2b7a20c7a4..46643e9768 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
@@ -94,7 +94,7 @@ TResult apply(TGeometry * geometry, TFunctor functor)
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbOGRGeometriesVisitor.txx"
+// #include "otbOGRGeometriesVisitor.hxx"
 #endif
 
 #endif // otbOGRGeometriesVisitor_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
index b5aaa58530..98a86d849a 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
@@ -161,7 +161,7 @@ OTBGdalAdapters_EXPORT UniqueGeometryPtr SimplifyPreserveTopology(OGRGeometry co
 } } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbOGRGeometryWrapper.txx"
+// #include "otbOGRGeometryWrapper.hxx"
 #endif
 
 #endif // otbOGRGeometryWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index 1a111523fe..eab6c14a67 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -553,7 +553,7 @@ inline bool operator!=(Layer const& lhs, Layer const& rhs)
 } } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbLayerWrapper.txx"
+// #include "otbLayerWrapper.hxx"
 #endif
 
 #endif // otbOGRLayerWrapper_h
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
index 72e87a389c..d7e1401098 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
@@ -214,23 +214,23 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLearningApplicationBase.txx"
+#include "otbLearningApplicationBase.hxx"
 #ifdef OTB_USE_OPENCV
-#include "otbTrainBoost.txx"
-#include "otbTrainDecisionTree.txx"
-#include "otbTrainGradientBoostedTree.txx"
-#include "otbTrainKNN.txx"
-#include "otbTrainNeuralNetwork.txx"
-#include "otbTrainNormalBayes.txx"
-#include "otbTrainRandomForests.txx"
-#include "otbTrainSVM.txx"
+#include "otbTrainBoost.hxx"
+#include "otbTrainDecisionTree.hxx"
+#include "otbTrainGradientBoostedTree.hxx"
+#include "otbTrainKNN.hxx"
+#include "otbTrainNeuralNetwork.hxx"
+#include "otbTrainNormalBayes.hxx"
+#include "otbTrainRandomForests.hxx"
+#include "otbTrainSVM.hxx"
 #endif
 #ifdef OTB_USE_LIBSVM
-#include "otbTrainLibSVM.txx"
+#include "otbTrainLibSVM.hxx"
 #endif
 #ifdef OTB_USE_SHARK
-#include "otbTrainSharkRandomForests.txx"
-#include "otbTrainSharkKMeans.txx"
+#include "otbTrainSharkRandomForests.hxx"
+#include "otbTrainSharkKMeans.hxx"
 #endif
 #endif
 
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
index 9fc20626d4..7ecc30ab6a 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLearningApplicationBase_txx
-#define otbLearningApplicationBase_txx
+#ifndef otbLearningApplicationBase_hxx
+#define otbLearningApplicationBase_hxx
 
 #include "otbLearningApplicationBase.h"
 // only need this filter as a dummy process object
diff --git a/Modules/Applications/AppClassification/include/otbTrainBoost.hxx b/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
index f971a2a629..7ea1b673f9 100644
--- a/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainBoost_txx
-#define otbTrainBoost_txx
+#ifndef otbTrainBoost_hxx
+#define otbTrainBoost_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbBoostMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
index 01284b5826..324bc7dd1d 100644
--- a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainDecisionTree_txx
-#define otbTrainDecisionTree_txx
+#ifndef otbTrainDecisionTree_hxx
+#define otbTrainDecisionTree_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbDecisionTreeMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
index 30a3fde157..719bf8b06e 100644
--- a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainGradientBoostedTree_txx
-#define otbTrainGradientBoostedTree_txx
+#ifndef otbTrainGradientBoostedTree_hxx
+#define otbTrainGradientBoostedTree_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbGradientBoostedTreeMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
index 3ca86e31cd..594983e175 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
@@ -300,7 +300,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainImagesBase.txx"
+#include "otbTrainImagesBase.hxx"
 #endif
 
 #endif //otbTrainImagesBase_h
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx b/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
index 15d599176a..edede857d7 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainImagesBase_txx
-#define otbTrainImagesBase_txx
+#ifndef otbTrainImagesBase_hxx
+#define otbTrainImagesBase_hxx
 
 #include "otbTrainImagesBase.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainKNN.hxx b/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
index 71e02215db..74639e3a70 100644
--- a/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainKNN_txx
-#define otbTrainKNN_txx
+#ifndef otbTrainKNN_hxx
+#define otbTrainKNN_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbKNearestNeighborsMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx b/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
index 0e34ad78c4..bd4a29a757 100644
--- a/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainLibSVM_txx
-#define otbTrainLibSVM_txx
+#ifndef otbTrainLibSVM_hxx
+#define otbTrainLibSVM_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbLibSVMMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
index 33a4930ac4..72becd8d6b 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainNeuralNetwork_txx
-#define otbTrainNeuralNetwork_txx
+#ifndef otbTrainNeuralNetwork_hxx
+#define otbTrainNeuralNetwork_hxx
 #include <boost/lexical_cast.hpp>
 #include "otbLearningApplicationBase.h"
 #include "otbNeuralNetworkMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
index f796e8e975..59f882356f 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainNormalBayes_txx
-#define otbTrainNormalBayes_txx
+#ifndef otbTrainNormalBayes_hxx
+#define otbTrainNormalBayes_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbNormalBayesMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx b/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
index e19777a686..1751f92702 100644
--- a/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainRandomForests_txx
-#define otbTrainRandomForests_txx
+#ifndef otbTrainRandomForests_hxx
+#define otbTrainRandomForests_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbRandomForestsMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainSVM.hxx b/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
index ab5138ba33..1e3f47d30f 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainSVM_txx
-#define otbTrainSVM_txx
+#ifndef otbTrainSVM_hxx
+#define otbTrainSVM_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbSVMMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx b/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
index ca03ea33b2..f2008908f1 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainSharkKMeans_txx
-#define otbTrainSharkKMeans_txx
+#ifndef otbTrainSharkKMeans_hxx
+#define otbTrainSharkKMeans_hxx
 
 #include "otbLearningApplicationBase.h"
 #include "otbSharkKMeansMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx b/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
index fa7ef6646a..3160740f3f 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainSharkRandomForests_txx
-#define otbTrainSharkRandomForests_txx
+#ifndef otbTrainSharkRandomForests_hxx
+#define otbTrainSharkRandomForests_hxx
 
 #include "otbLearningApplicationBase.h"
 #include "otbSharkRandomForestsMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
index 300b1b5879..2327462210 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
@@ -190,7 +190,7 @@ protected:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainVectorBase.txx"
+#include "otbTrainVectorBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
index 453db3f3f0..676cd0eeb3 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainVectorBase_txx
-#define otbTrainVectorBase_txx
+#ifndef otbTrainVectorBase_hxx
+#define otbTrainVectorBase_hxx
 
 #include "otbTrainVectorBase.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
index f474167e38..6a36fe0e7c 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainAutoencoder_txx
-#define otbDimensionalityReductionTrainAutoencoder_txx
+#ifndef otbDimensionalityReductionTrainAutoencoder_hxx
+#define otbDimensionalityReductionTrainAutoencoder_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbAutoencoderModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
index 03016916cb..f490d47e05 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainPCA_txx
-#define otbDimensionalityReductionTrainPCA_txx
+#ifndef otbDimensionalityReductionTrainPCA_hxx
+#define otbDimensionalityReductionTrainPCA_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbPCAModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
index 51cdd9e1ac..dc0f4190f7 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainSOM_txx
-#define otbDimensionalityReductionTrainSOM_txx
+#ifndef otbDimensionalityReductionTrainSOM_hxx
+#define otbDimensionalityReductionTrainSOM_hxx
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbSOMModel.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
index b0a2ae847a..ec833ea574 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
@@ -135,12 +135,12 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainDimensionalityReductionApplicationBase.txx"
-#include "otbDimensionalityReductionTrainSOM.txx"
+#include "otbTrainDimensionalityReductionApplicationBase.hxx"
+#include "otbDimensionalityReductionTrainSOM.hxx"
 
 #ifdef OTB_USE_SHARK
-#include "otbDimensionalityReductionTrainAutoencoder.txx"
-#include "otbDimensionalityReductionTrainPCA.txx"
+#include "otbDimensionalityReductionTrainAutoencoder.hxx"
+#include "otbDimensionalityReductionTrainPCA.hxx"
 #endif
 #endif
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
index 0575410176..3852a24bb1 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainDimensionalityReductionApplicationBase_txx
-#define otbTrainDimensionalityReductionApplicationBase_txx
+#ifndef otbTrainDimensionalityReductionApplicationBase_hxx
+#define otbTrainDimensionalityReductionApplicationBase_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index 14e61cb810..9a4d7b949d 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -56,7 +56,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCommandProgressUpdate.txx"
+#include "otbCommandProgressUpdate.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.hxx b/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
index 95c745407f..8f6010dd8c 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCommandProgressUpdate_txx
-#define otbCommandProgressUpdate_txx
+#ifndef otbCommandProgressUpdate_hxx
+#define otbCommandProgressUpdate_hxx
 
 #include "otbCommandProgressUpdate.h"
 
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
index c46fdb1519..21752b0539 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.h
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.h
@@ -110,7 +110,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecimateImageFilter.txx"
+#include "otbDecimateImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.hxx b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
index 9450dd7b8f..bfd1a471f8 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.hxx
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbDecimateImageFilter_txx
-#define otbDecimateImageFilter_txx
+#ifndef otbDecimateImageFilter_hxx
+#define otbDecimateImageFilter_hxx
 
 #include "otbDecimateImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
index ec9a18e583..823deeb7c1 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.h
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDotProductImageFilter.txx"
+#include "otbDotProductImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.hxx b/Modules/Core/Common/include/otbDotProductImageFilter.hxx
index 0ac971c2af..7d2266ec20 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.hxx
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDotProductImageFilter_txx
-#define otbDotProductImageFilter_txx
+#ifndef otbDotProductImageFilter_hxx
+#define otbDotProductImageFilter_hxx
 
 #include "otbDotProductImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index 2b0af570c1..ae026455e4 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -138,7 +138,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFunctionToImageFilter.txx"
+#include "otbFunctionToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
index c743bb92c6..826df4d8ed 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFunctionToImageFilter_txx
-#define otbFunctionToImageFilter_txx
+#ifndef otbFunctionToImageFilter_hxx
+#define otbFunctionToImageFilter_hxx
 
 #include "otbFunctionToImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index dd4fb6c937..77246dc9d2 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -235,7 +235,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageAndVectorImageOperationFilter.txx"
+#include "otbImageAndVectorImageOperationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
index 89e1133992..0199986738 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageAndVectorImageOperationFilter_txx
-#define otbImageAndVectorImageOperationFilter_txx
+#ifndef otbImageAndVectorImageOperationFilter_hxx
+#define otbImageAndVectorImageOperationFilter_hxx
 
 #include "otbImageAndVectorImageOperationFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 8104d9990b..e9ac73c411 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionAdaptativeSplitter.txx"
+# include "otbImageRegionAdaptativeSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
index b9bb88e318..08370077a7 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionAdaptativeSplitter_txx
-#define otbImageRegionAdaptativeSplitter_txx
+#ifndef otbImageRegionAdaptativeSplitter_hxx
+#define otbImageRegionAdaptativeSplitter_hxx
 
 #include "otbImageRegionAdaptativeSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
index 5c59809713..31d8242760 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -130,7 +130,7 @@ private:
 #endif
 
 #ifndef ITK_MANUAL_INSTANTIATION
-# include "otbImageRegionNonUniformMultidimensionalSplitter.txx"
+# include "otbImageRegionNonUniformMultidimensionalSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
index 7002576fe1..bc61209bdf 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionNonUniformMultidimensionalSplitter_txx
-#define otbImageRegionNonUniformMultidimensionalSplitter_txx
+#ifndef otbImageRegionNonUniformMultidimensionalSplitter_hxx
+#define otbImageRegionNonUniformMultidimensionalSplitter_hxx
 #include "otbImageRegionNonUniformMultidimensionalSplitter.h"
 
 namespace otb
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
index 7825a41a29..c08d86f28e 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
@@ -143,7 +143,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionSquareTileSplitter.txx"
+# include "otbImageRegionSquareTileSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
index 45a57b557b..f09e0d0215 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionSquareTileSplitter_txx
-#define otbImageRegionSquareTileSplitter_txx
+#ifndef otbImageRegionSquareTileSplitter_hxx
+#define otbImageRegionSquareTileSplitter_hxx
 
 #include "otbImageRegionSquareTileSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
index 7e58227ac8..2d20c9f54d 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
@@ -138,7 +138,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionTileMapSplitter.txx"
+# include "otbImageRegionTileMapSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
index d01034baab..2e4c793eb3 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionTileMapSplitter_txx
-#define otbImageRegionTileMapSplitter_txx
+#ifndef otbImageRegionTileMapSplitter_hxx
+#define otbImageRegionTileMapSplitter_hxx
 
 #include "otbImageRegionTileMapSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
index 8846d0ebd3..9701077133 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToModulusAndDirectionImageFilter.txx"
+#include "otbImageToModulusAndDirectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
index ab571da29e..01362430c5 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToModulusAndDirectionImageFilter_txx
-#define otbImageToModulusAndDirectionImageFilter_txx
+#ifndef otbImageToModulusAndDirectionImageFilter_hxx
+#define otbImageToModulusAndDirectionImageFilter_hxx
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/Common/include/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
index 63396d7112..bb5c1895fe 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.h
+++ b/Modules/Core/Common/include/otbImportImageFilter.h
@@ -181,7 +181,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportImageFilter.txx"
+#include "otbImportImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImportImageFilter.hxx b/Modules/Core/Common/include/otbImportImageFilter.hxx
index f6affce633..6fe7242247 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImportImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportImageFilter_txx
-#define otbImportImageFilter_txx
+#ifndef otbImportImageFilter_hxx
+#define otbImportImageFilter_hxx
 
 #include "otbImportImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
index d4681c48f7..d05e6b8da7 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.h
@@ -186,7 +186,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportVectorImageFilter.txx"
+#include "otbImportVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.hxx b/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
index 1db7462175..4257b6208c 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportVectorImageFilter_txx
-#define otbImportVectorImageFilter_txx
+#ifndef otbImportVectorImageFilter_hxx
+#define otbImportVectorImageFilter_hxx
 
 #include "otbImportVectorImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index 57b13394dd..088e5b58a0 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -166,7 +166,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbModelComponentBase.txx"
+#include "otbModelComponentBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbModelComponentBase.hxx b/Modules/Core/Common/include/otbModelComponentBase.hxx
index 11ba6164ba..4010d24262 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.hxx
+++ b/Modules/Core/Common/include/otbModelComponentBase.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbModelComponentBase_txx
-#define otbModelComponentBase_txx
+#ifndef otbModelComponentBase_hxx
+#define otbModelComponentBase_hxx
 
 #include <iostream>
 
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index 8908d95d4c..74afdecc93 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -171,7 +171,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbQuaternaryFunctorImageFilter.txx"
+#include "otbQuaternaryFunctorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
index 3c63cb5ed7..c5ac5bc00f 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbQuaternaryFunctorImageFilter_txx
-#define otbQuaternaryFunctorImageFilter_txx
+#ifndef otbQuaternaryFunctorImageFilter_hxx
+#define otbQuaternaryFunctorImageFilter_hxx
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
index be7389057d..78fd678fd0 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRGBAPixelConverter.txx"
+#include "otbRGBAPixelConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.hxx b/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
index cd5dd0c527..fff51b0cac 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRGBAPixelConverter_txx
-#define otbRGBAPixelConverter_txx
+#ifndef otbRGBAPixelConverter_hxx
+#define otbRGBAPixelConverter_hxx
 
 #include "otbRGBAPixelConverter.h"
 
diff --git a/Modules/Core/Common/include/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
index b3c5276953..dcd7bbb14a 100644
--- a/Modules/Core/Common/include/otbRectangle.h
+++ b/Modules/Core/Common/include/otbRectangle.h
@@ -122,6 +122,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRectangle.txx"
+#include "otbRectangle.hxx"
 #endif
 #endif
diff --git a/Modules/Core/Common/include/otbRectangle.hxx b/Modules/Core/Common/include/otbRectangle.hxx
index 31c46b4044..8ada6f1d92 100644
--- a/Modules/Core/Common/include/otbRectangle.hxx
+++ b/Modules/Core/Common/include/otbRectangle.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRectangle_txx
-#define otbRectangle_txx
+#ifndef otbRectangle_hxx
+#define otbRectangle_hxx
 
 #include "otbRectangle.h"
 
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
index 1b80e8f8cf..c40490a09d 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
@@ -250,7 +250,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubsampledImageRegionConstIterator.txx"
+#include "otbSubsampledImageRegionConstIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
index 1775311060..45c50f98bb 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSubsampledImageRegionConstIterator_txx
-#define otbSubsampledImageRegionConstIterator_txx
+#ifndef otbSubsampledImageRegionConstIterator_hxx
+#define otbSubsampledImageRegionConstIterator_hxx
 
 #include "otbSubsampledImageRegionConstIterator.h"
 
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index 99c1ab7b70..a48a69cced 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -141,7 +141,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodVectorImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
index 3570f86651..1ab1825878 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_txx
-#define otbUnaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodVectorImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index 59c5c5090b..ce20d49d12 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorVectorImageFilter.txx"
+#include "otbUnaryFunctorVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
index 004a6a7b4e..92cb277eef 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorVectorImageFilter_txx
-#define otbUnaryFunctorVectorImageFilter_txx
+#ifndef otbUnaryFunctorVectorImageFilter_hxx
+#define otbUnaryFunctorVectorImageFilter_hxx
 
 #include "otbUnaryFunctorVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index f17916deec..c83e7dcafa 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -156,7 +156,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx"
+#include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
index cb0cff09da..ac16a26213 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
-#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_hxx
+#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_hxx
 
 #include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
index 2e773e1443..be24d2fa89 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
@@ -295,7 +295,7 @@ private:
 }// namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVariableLengthVectorConverter.txx"
+#include "otbVariableLengthVectorConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx b/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
index a306a58f20..d599e2949a 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVariableLengthVectorConverter_txx
-#define otbVariableLengthVectorConverter_txx
+#ifndef otbVariableLengthVectorConverter_hxx
+#define otbVariableLengthVectorConverter_hxx
 
 #include "otbVariableLengthVectorConverter.h"
 #include <complex>
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
index ca9d4d372b..fcde4929d4 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
@@ -83,7 +83,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConvertPixelBuffer.txx"
+#include "otbConvertPixelBuffer.hxx"
 #endif
 
 #endif // otbConvertPixelBuffer_h
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
index fa18a81ca7..0df8cff4d6 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConvertPixelBuffer_txx
-#define otbConvertPixelBuffer_txx
+#ifndef otbConvertPixelBuffer_hxx
+#define otbConvertPixelBuffer_hxx
 #include "otbConvertPixelBuffer.h"
 
 #include "itkConvertPixelBuffer.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index 1e3c3444bf..e534de8bbe 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractROI.txx"
+#include "otbExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.hxx b/Modules/Core/ImageBase/include/otbExtractROI.hxx
index 968abfd481..7e96af168d 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractROI_txx
-#define otbExtractROI_txx
+#ifndef otbExtractROI_hxx
+#define otbExtractROI_hxx
 
 #include "otbExtractROI.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index 864d249b2c..ec00649f94 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -181,7 +181,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractROIBase.txx"
+#include "otbExtractROIBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.hxx b/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
index 26108adf67..b205f21380 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractROIBase_txx
-#define otbExtractROIBase_txx
+#ifndef otbExtractROIBase_hxx
+#define otbExtractROIBase_hxx
 
 #include "otbExtractROIBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
index fade2644fa..6dc3e630f8 100644
--- a/Modules/Core/ImageBase/include/otbImage.h
+++ b/Modules/Core/ImageBase/include/otbImage.h
@@ -271,7 +271,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImage.txx"
+#include "otbImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImage.hxx b/Modules/Core/ImageBase/include/otbImage.hxx
index 096a725960..68de67df33 100644
--- a/Modules/Core/ImageBase/include/otbImage.hxx
+++ b/Modules/Core/ImageBase/include/otbImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImage_txx
-#define otbImage_txx
+#ifndef otbImage_hxx
+#define otbImage_hxx
 
 
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
index c7ae05be26..ab6b8108e1 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFunctionAdaptor.txx"
+#include "otbImageFunctionAdaptor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
index feaca84b81..01e9a092ab 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFunctionAdaptor_txx
-#define otbImageFunctionAdaptor_txx
+#ifndef otbImageFunctionAdaptor_hxx
+#define otbImageFunctionAdaptor_hxx
 
 #include "otbImageFunctionAdaptor.h"
 
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index ced97e4d6a..c957d023ad 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageOfVectorsToMonoChannelExtractROI.txx"
+#include "otbImageOfVectorsToMonoChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
index dc186f8212..60978bcf9f 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageOfVectorsToMonoChannelExtractROI_txx
-#define otbImageOfVectorsToMonoChannelExtractROI_txx
+#ifndef otbImageOfVectorsToMonoChannelExtractROI_hxx
+#define otbImageOfVectorsToMonoChannelExtractROI_hxx
 
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
index 430e0db2de..62ff3eb9c3 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMetaImageFunction.txx"
+#include "otbMetaImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx b/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
index 5cc59208c0..b70e9e064c 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMetaImageFunction_txx
-#define otbMetaImageFunction_txx
+#ifndef otbMetaImageFunction_hxx
+#define otbMetaImageFunction_hxx
 
 #include "otbMetaImageFunction.h"
 #include "otbImageFunctionAdaptor.h"
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index ad7a6b1dfa..b1bfddf3fa 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiChannelExtractROI.txx"
+#include "otbMultiChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
index 783886e201..5ceae10590 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiChannelExtractROI_txx
-#define otbMultiChannelExtractROI_txx
+#ifndef otbMultiChannelExtractROI_hxx
+#define otbMultiChannelExtractROI_hxx
 
 #include "otbMultiChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index bc36862211..708160c2c8 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -123,7 +123,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiToMonoChannelExtractROI.txx"
+#include "otbMultiToMonoChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
index 2d2ff06047..3633007b3c 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiToMonoChannelExtractROI_txx
-#define otbMultiToMonoChannelExtractROI_txx
+#ifndef otbMultiToMonoChannelExtractROI_hxx
+#define otbMultiToMonoChannelExtractROI_hxx
 
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
index bf6ebaaaca..2c218297b0 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.h
+++ b/Modules/Core/ImageBase/include/otbVectorImage.h
@@ -212,7 +212,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImage.txx"
+#include "otbVectorImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.hxx b/Modules/Core/ImageBase/include/otbVectorImage.hxx
index f6123af584..d40402b8fe 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.hxx
+++ b/Modules/Core/ImageBase/include/otbVectorImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImage_txx
-#define otbVectorImage_txx
+#ifndef otbVectorImage_hxx
+#define otbVectorImage_hxx
 
 
 #include "otbVectorImage.h"
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index 9e758654c9..b13758ea6b 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -211,7 +211,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBCOInterpolateImageFunction.txx"
+#include "otbBCOInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
index 820381f28a..f91f902762 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBCOInterpolateImageFunction_txx
-#define otbBCOInterpolateImageFunction_txx
+#ifndef otbBCOInterpolateImageFunction_hxx
+#define otbBCOInterpolateImageFunction_hxx
 
 #include "otbBCOInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
index 5a4efef22b..e46d9a1999 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplineDecompositionImageFilter.txx"
+#include "otbBSplineDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
index aefceafbd7..08e85b3eab 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplineDecompositionImageFilter_txx
-#define otbBSplineDecompositionImageFilter_txx
+#ifndef otbBSplineDecompositionImageFilter_hxx
+#define otbBSplineDecompositionImageFilter_hxx
 #include "otbBSplineDecompositionImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index 20fc576db7..37f20c7c38 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -191,7 +191,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplineInterpolateImageFunction.txx"
+#include "otbBSplineInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
index 34c0963815..ae50ccf495 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplineInterpolateImageFunction_txx
-#define otbBSplineInterpolateImageFunction_txx
+#ifndef otbBSplineInterpolateImageFunction_hxx
+#define otbBSplineInterpolateImageFunction_hxx
 #include "otbBSplineInterpolateImageFunction.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index 32cf44b794..7904220cf6 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -161,7 +161,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericInterpolateImageFunction.txx"
+#include "otbGenericInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
index 08c5d98b54..1f51fb380e 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericInterpolateImageFunction_txx
-#define otbGenericInterpolateImageFunction_txx
+#ifndef otbGenericInterpolateImageFunction_hxx
+#define otbGenericInterpolateImageFunction_hxx
 #include "otbGenericInterpolateImageFunction.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
index ce501c9632..2c18138985 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
@@ -324,7 +324,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProlateInterpolateImageFunction.txx"
+#include "otbProlateInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
index c9d045293f..c1042a8e86 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProlateInterpolateImageFunction_txx
-#define otbProlateInterpolateImageFunction_txx
+#ifndef otbProlateInterpolateImageFunction_hxx
+#define otbProlateInterpolateImageFunction_hxx
 
 #include "otbProlateInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.h b/Modules/Core/Interpolation/include/otbStreamingTraits.h
index bf62da25ac..48c2ffeb3b 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.h
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.h
@@ -122,7 +122,7 @@ public:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingTraits.txx"
+#include "otbStreamingTraits.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
index eed5e75d7b..a8960821cc 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingTraits_txx
-#define otbStreamingTraits_txx
+#ifndef otbStreamingTraits_hxx
+#define otbStreamingTraits_hxx
 
 #include "otbStreamingTraits.h"
 
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
index 4de1c9940b..99edf48c28 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
@@ -190,7 +190,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWindowedSincInterpolateImageFunctionBase.txx"
+#include "otbWindowedSincInterpolateImageFunctionBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
index bda4ad2bbf..5b9ae7eca5 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWindowedSincInterpolateImageFunctionBase_txx
-#define otbWindowedSincInterpolateImageFunctionBase_txx
+#ifndef otbWindowedSincInterpolateImageFunctionBase_hxx
+#define otbWindowedSincInterpolateImageFunctionBase_hxx
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
index 166517718c..0a1d5b7480 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
@@ -94,7 +94,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAttributesMapOpeningLabelMapFilter.txx"
+#include "otbAttributesMapOpeningLabelMapFilter.hxx"
 #endif
 
 #endif // otbAttributesMapOpeningLabelMapFilter_h
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
index a0ac363b0b..4639d40e0a 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbAttributesMapOpeningLabelMapFilter_txx
-#define otbAttributesMapOpeningLabelMapFilter_txx
+#ifndef otbAttributesMapOpeningLabelMapFilter_hxx
+#define otbAttributesMapOpeningLabelMapFilter_hxx
 
 #include "otbAttributesMapOpeningLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
index 75a56344e1..4b1a5bd724 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
@@ -214,7 +214,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandsStatisticsAttributesLabelMapFilter.txx"
+#include "otbBandsStatisticsAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
index 1de1c638d2..51b29436e2 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandsStatisticsAttributesLabelMapFilter_txx
-#define otbBandsStatisticsAttributesLabelMapFilter_txx
+#ifndef otbBandsStatisticsAttributesLabelMapFilter_hxx
+#define otbBandsStatisticsAttributesLabelMapFilter_hxx
 
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
index 04487819d1..db348fc45d 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
@@ -102,7 +102,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToLabelMapWithAttributesFilter.txx"
+#include "otbImageToLabelMapWithAttributesFilter.hxx"
 #endif
 #endif
 
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
index a21ad1bc69..a61193322a 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToLabelMapWithAttributesFilter_txx
-#define otbImageToLabelMapWithAttributesFilter_txx
+#ifndef otbImageToLabelMapWithAttributesFilter_hxx
+#define otbImageToLabelMapWithAttributesFilter_hxx
 
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
index 25ada97fee..d32932af93 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
@@ -141,7 +141,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKMeansAttributesLabelMapFilter.txx"
+#include "otbKMeansAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
index 376a478eed..5037c74a18 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKMeansAttributesLabelMapFilter_txx
-#define otbKMeansAttributesLabelMapFilter_txx
+#ifndef otbKMeansAttributesLabelMapFilter_hxx
+#define otbKMeansAttributesLabelMapFilter_hxx
 
 #include "otbKMeansAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
index 7afab7bc58..3b6f48c296 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
@@ -156,7 +156,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToLabelMapWithAdjacencyFilter.txx"
+#include "otbLabelImageToLabelMapWithAdjacencyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
index 9c3cca18f5..6c44669fc9 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_txx
-#define otbLabelImageToLabelMapWithAdjacencyFilter_txx
+#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_hxx
+#define otbLabelImageToLabelMapWithAdjacencyFilter_hxx
 
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
index bdc32d74aa..38c69995fc 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.h
@@ -80,7 +80,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapSource.txx"
+#include "otbLabelMapSource.hxx"
 #endif
 
 #endif // otbLabelMapSource_h
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.hxx b/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
index 99da44f698..692927d322 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelMapSource_txx
-#define otbLabelMapSource_txx
+#ifndef otbLabelMapSource_hxx
+#define otbLabelMapSource_hxx
 
 #include "otbLabelMapSource.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
index 50dcc9f616..f61621d85e 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
@@ -121,7 +121,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToAttributeImageFilter.txx"
+#include "otbLabelMapToAttributeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
index de2dd0759a..545770af81 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelMapToAttributeImageFilter_txx
-#define otbLabelMapToAttributeImageFilter_txx
+#ifndef otbLabelMapToAttributeImageFilter_hxx
+#define otbLabelMapToAttributeImageFilter_hxx
 
 #include "otbLabelMapToAttributeImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
index 6df4c11ff0..4d3a146a19 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
@@ -96,7 +96,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbLabelMapToLabelImageFilter.txx"
+#include "otbLabelMapToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
index 704515e5f8..2e374137d5 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToLabelImageFilter_txx
-#define otbLabelMapToLabelImageFilter_txx
+#ifndef otbLabelMapToLabelImageFilter_hxx
+#define otbLabelMapToLabelImageFilter_hxx
 
 #include "otbLabelMapToLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
index e2e0196934..7adfbf0875 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToSampleListFilter.txx"
+#include "otbLabelMapToSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
index 0c58b9ff4d..5536892a37 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToSampleListFilter_txx
-#define otbLabelMapToSampleListFilter_txx
+#ifndef otbLabelMapToSampleListFilter_hxx
+#define otbLabelMapToSampleListFilter_hxx
 
 #include "otbLabelMapToSampleListFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
index d1ff1f0703..1166ebd218 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
@@ -90,7 +90,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapWithClassLabelToClassLabelImageFilter.txx"
+#include "otbLabelMapWithClassLabelToClassLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
index 8fd58ce42d..29bda0b702 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_txx
-#define otbLabelMapWithClassLabelToClassLabelImageFilter_txx
+#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_hxx
+#define otbLabelMapWithClassLabelToClassLabelImageFilter_hxx
 
 #include "otbLabelMapWithClassLabelToClassLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
index c0ec1bf654..198667f8b5 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapWithClassLabelToLabeledSampleListFilter.txx"
+#include "otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
index 698d65d59d..67fe403317 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
-#define otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
+#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_hxx
+#define otbLabelMapWithClassLabelToLabeledSampleListFilter_hxx
 
 #include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
 #include "itkDataObject.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
index dcddceaeb3..1d7b92178e 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
@@ -235,7 +235,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelObjectToPolygonFunctor.txx"
+#include "otbLabelObjectToPolygonFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
index 66566b8d23..56d470b3e5 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelObjectToPolygonFunctor_txx
-#define otbLabelObjectToPolygonFunctor_txx
+#ifndef otbLabelObjectToPolygonFunctor_hxx
+#define otbLabelObjectToPolygonFunctor_hxx
 
 
 #include "otbLabelObjectToPolygonFunctor.h"
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
index 5bfb512b33..e22a5fdd96 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
@@ -111,7 +111,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMinMaxAttributesLabelMapFilter.txx"
+#include "otbMinMaxAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
index 976bbea70c..347b70f721 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMinMaxAttributesLabelMapFilter_txx
-#define otbMinMaxAttributesLabelMapFilter_txx
+#ifndef otbMinMaxAttributesLabelMapFilter_hxx
+#define otbMinMaxAttributesLabelMapFilter_hxx
 
 #include "otbMinMaxAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
index d255c9c260..4ec17f3c73 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeAttributesLabelMapFilter.txx"
+#include "otbNormalizeAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
index 3577e34e65..2163240d34 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeAttributesLabelMapFilter_txx
-#define otbNormalizeAttributesLabelMapFilter_txx
+#ifndef otbNormalizeAttributesLabelMapFilter_hxx
+#define otbNormalizeAttributesLabelMapFilter_hxx
 
 #include "otbNormalizeAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
index f170e49e69..0986f45b0b 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
@@ -311,7 +311,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShapeAttributesLabelMapFilter.txx"
+#include "otbShapeAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
index 54b9349e2c..ba322f8fdb 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShapeAttributesLabelMapFilter_txx
-#define otbShapeAttributesLabelMapFilter_txx
+#ifndef otbShapeAttributesLabelMapFilter_hxx
+#define otbShapeAttributesLabelMapFilter_hxx
 
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
index 117e5e4382..af8eec1e03 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
@@ -211,7 +211,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsAttributesLabelMapFilter.txx"
+#include "otbStatisticsAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
index ff4007865c..ab497246c8 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsAttributesLabelMapFilter_txx
-#define otbStatisticsAttributesLabelMapFilter_txx
+#ifndef otbStatisticsAttributesLabelMapFilter_hxx
+#define otbStatisticsAttributesLabelMapFilter_hxx
 
 #include "otbStatisticsAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
index f57bd48360..422e4642e6 100644
--- a/Modules/Core/ObjectList/include/otbImageList.h
+++ b/Modules/Core/ObjectList/include/otbImageList.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageList.txx"
+#include "otbImageList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageList.hxx b/Modules/Core/ObjectList/include/otbImageList.hxx
index dec0ab8b3e..c05983383e 100644
--- a/Modules/Core/ObjectList/include/otbImageList.hxx
+++ b/Modules/Core/ObjectList/include/otbImageList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageList_txx
-#define otbImageList_txx
+#ifndef otbImageList_hxx
+#define otbImageList_hxx
 
 #include "otbImageList.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
index 65012ab388..c0a84d4162 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.h
+++ b/Modules/Core/ObjectList/include/otbImageListSource.h
@@ -76,6 +76,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListSource.txx"
+#include "otbImageListSource.hxx"
 #endif
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.hxx b/Modules/Core/ObjectList/include/otbImageListSource.hxx
index 74d1cb6d08..b20d54ebe6 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListSource_txx
-#define otbImageListSource_txx
+#ifndef otbImageListSource_hxx
+#define otbImageListSource_hxx
 
 #include "otbImageListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index 56c067b409..35a1cf6824 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -85,7 +85,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageFilter.txx"
+#include "otbImageListToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
index dd941f3f20..fef2c09e0c 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageFilter_txx
-#define otbImageListToImageFilter_txx
+#ifndef otbImageListToImageFilter_hxx
+#define otbImageListToImageFilter_hxx
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
index 814df0753f..89777a6f2e 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
@@ -107,7 +107,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageListApplyFilter.txx"
+#include "otbImageListToImageListApplyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
index 5a876281fe..14bbfe5d90 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageListApplyFilter_txx
-#define otbImageListToImageListApplyFilter_txx
+#ifndef otbImageListToImageListApplyFilter_hxx
+#define otbImageListToImageListApplyFilter_hxx
 
 #include "otbImageListToImageListApplyFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index 1fff1873d2..d216e47d95 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -83,7 +83,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageListFilter.txx"
+#include "otbImageListToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
index df0c723bc5..3f81b9f494 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageListFilter_txx
-#define otbImageListToImageListFilter_txx
+#ifndef otbImageListToImageListFilter_hxx
+#define otbImageListToImageListFilter_hxx
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
index 53a5049836..793781c0ad 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
@@ -93,7 +93,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToSingleImageFilter.txx"
+#include "otbImageListToSingleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
index 3ad9e1593c..e969b6f9a2 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageListToSingleImageFilter_txx
-#define otbImageListToSingleImageFilter_txx
+#ifndef otbImageListToSingleImageFilter_hxx
+#define otbImageListToSingleImageFilter_hxx
 
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
index 3841c8b9f7..3afd278bff 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
@@ -94,7 +94,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToVectorImageFilter.txx"
+#include "otbImageListToVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
index d8eac8e271..72b455b39a 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToVectorImageFilter_txx
-#define otbImageListToVectorImageFilter_txx
+#ifndef otbImageListToVectorImageFilter_hxx
+#define otbImageListToVectorImageFilter_hxx
 
 #include "otbImageListToVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
index 92370fa43d..37e5da8f83 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
@@ -81,7 +81,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToImageListFilter.txx"
+#include "otbImageToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
index 36432c7590..8abc067c2d 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToImageListFilter_txx
-#define otbImageToImageListFilter_txx
+#ifndef otbImageToImageListFilter_hxx
+#define otbImageToImageListFilter_hxx
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
index de9814f934..1da4fe163c 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.h
+++ b/Modules/Core/ObjectList/include/otbObjectList.h
@@ -619,7 +619,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectList.txx"
+#include "otbObjectList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectList.hxx b/Modules/Core/ObjectList/include/otbObjectList.hxx
index 84f600c6fd..8eb5f5c829 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectList_txx
-#define otbObjectList_txx
+#ifndef otbObjectList_hxx
+#define otbObjectList_hxx
 
 #include "otbObjectList.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 3dbefeecdf..1f8c365e56 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -201,7 +201,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectListSource.txx"
+#include "otbObjectListSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.hxx b/Modules/Core/ObjectList/include/otbObjectListSource.hxx
index 1bfa2d3a82..1879b44dcc 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectListSource_txx
-#define otbObjectListSource_txx
+#ifndef otbObjectListSource_hxx
+#define otbObjectListSource_hxx
 
 #include "otbObjectListSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index b906edffbd..e3e2e7ad12 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -122,7 +122,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectListToObjectListFilter.txx"
+#include "otbObjectListToObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
index 0db61c009d..1557397fd3 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectListToObjectListFilter_txx
-#define otbObjectListToObjectListFilter_txx
+#ifndef otbObjectListToObjectListFilter_hxx
+#define otbObjectListToObjectListFilter_hxx
 
 #include "otbObjectListToObjectListFilter.h"
 #include "itkProgressReporter.h"
@@ -80,7 +80,7 @@ ObjectListToObjectListFilter<TInputList, TOutputList>
                                           ));
   if (stopIndex > requestedElements) stopIndex = requestedElements;
 
-  //Note: check the itkImageSource.txx for the compuration done there.
+  //Note: check the itkImageSource.hxx for the compuration done there.
   // for now, there is no requested region for ObjectListFilter, so we don't
   // compute anything here.
   return threadCount;
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
index ec873d99d6..aeb140d2e6 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorObjectListBooleanFilter.txx"
+#include "otbUnaryFunctorObjectListBooleanFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
index cfd006df74..3bcb197290 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorObjectListBooleanFilter_txx
-#define otbUnaryFunctorObjectListBooleanFilter_txx
+#ifndef otbUnaryFunctorObjectListBooleanFilter_hxx
+#define otbUnaryFunctorObjectListBooleanFilter_hxx
 
 #include "otbUnaryFunctorObjectListBooleanFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
index 8d84273489..a58050a77b 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorObjectListFilter.txx"
+#include "otbUnaryFunctorObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
index 5c0585e10a..f6691f4c77 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorObjectListFilter_txx
-#define otbUnaryFunctorObjectListFilter_txx
+#ifndef otbUnaryFunctorObjectListFilter_hxx
+#define otbUnaryFunctorObjectListFilter_hxx
 
 #include "otbUnaryFunctorObjectListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
index 150b97af55..0d518f2d77 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
@@ -90,7 +90,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToImageListFilter.txx"
+#include "otbVectorImageToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
index b941f7b7b2..1027b7b13a 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToImageListFilter_txx
-#define otbVectorImageToImageListFilter_txx
+#ifndef otbVectorImageToImageListFilter_hxx
+#define otbVectorImageToImageListFilter_hxx
 
 #include "otbVectorImageToImageListFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index 98b5fff521..1f59931ab9 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -132,7 +132,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPointSetFilter.txx"
+#include "otbImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
index 884113dbb6..3c71a6fb40 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPointSetFilter_txx
-#define otbImageToPointSetFilter_txx
+#ifndef otbImageToPointSetFilter_hxx
+#define otbImageToPointSetFilter_hxx
 
 #include "otbImageToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
index 4065ccae0d..a41683e787 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.h
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetExtractROI.txx"
+#include "otbPointSetExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx b/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
index 4975f90b15..13b79dde37 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetExtractROI_txx
-#define otbPointSetExtractROI_txx
+#ifndef otbPointSetExtractROI_hxx
+#define otbPointSetExtractROI_hxx
 
 #include "otbPointSetExtractROI.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index 3e27810889..5774fddba8 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetFunction.txx"
+#include "otbPointSetFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.hxx b/Modules/Core/PointSet/include/otbPointSetFunction.hxx
index bdb7079881..7a0d43cd6a 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetFunction_txx
-#define otbPointSetFunction_txx
+#ifndef otbPointSetFunction_hxx
+#define otbPointSetFunction_hxx
 
 #include "otbPointSetFunction.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
index cc74ddd871..8282633b14 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbPointSetSource.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetSource.txx"
+#include "otbPointSetSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.hxx b/Modules/Core/PointSet/include/otbPointSetSource.hxx
index 2aad45741e..a9f14ba83d 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetSource_txx
-#define otbPointSetSource_txx
+#ifndef otbPointSetSource_hxx
+#define otbPointSetSource_hxx
 
 #include "otbPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index 52923cbd5d..90a1629f9a 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -85,7 +85,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToPointSetFilter.txx"
+#include "otbPointSetToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
index 3a93d570f4..4fc56588a8 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToPointSetFilter_txx
-#define otbPointSetToPointSetFilter_txx
+#ifndef otbPointSetToPointSetFilter_hxx
+#define otbPointSetToPointSetFilter_hxx
 
 #include "otbPointSetToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
index cfc09283ae..4659e73fad 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
@@ -107,7 +107,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomPointSetSource.txx"
+#include "otbRandomPointSetSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx b/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
index 2c942dd348..9e1d08d09a 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRandomPointSetSource_txx
-#define otbRandomPointSetSource_txx
+#ifndef otbRandomPointSetSource_hxx
+#define otbRandomPointSetSource_hxx
 
 #include "otbRandomPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
index 3f158f90f3..04198cf307 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
@@ -100,7 +100,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbThresholdImageToPointSetFilter.txx"
+#include "otbThresholdImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
index b5ac50e908..655fd6b562 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbThresholdImageToPointSetFilter_txx
-#define otbThresholdImageToPointSetFilter_txx
+#ifndef otbThresholdImageToPointSetFilter_hxx
+#define otbThresholdImageToPointSetFilter_hxx
 
 #include "otbThresholdImageToPointSetFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
index 9b1dedfa6a..d254bb5313 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
@@ -93,7 +93,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTransformPointSetFilter.txx"
+#include "otbTransformPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx b/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
index ab2c61c6ea..46952f8631 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTransformPointSetFilter_txx
-#define otbTransformPointSetFilter_txx
+#ifndef otbTransformPointSetFilter_hxx
+#define otbTransformPointSetFilter_hxx
 
 #include "otbTransformPointSetFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
index b113b03677..6578ef3bd9 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawLineSpatialObjectFilter.txx"
+#include "otbDrawLineSpatialObjectFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
index a4e90d8420..e1078094b5 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDrawLineSpatialObjectFilter_txx
-#define otbDrawLineSpatialObjectFilter_txx
+#ifndef otbDrawLineSpatialObjectFilter_hxx
+#define otbDrawLineSpatialObjectFilter_hxx
 
 #include "otbDrawLineSpatialObjectFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
index 9232ed96f6..35cf3faa1b 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
@@ -132,7 +132,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawLineSpatialObjectListFilter.txx"
+#include "otbDrawLineSpatialObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
index ca5762b2f4..f03179f78d 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDrawLineSpatialObjectListFilter_txx
-#define otbDrawLineSpatialObjectListFilter_txx
+#ifndef otbDrawLineSpatialObjectListFilter_hxx
+#define otbDrawLineSpatialObjectListFilter_hxx
 
 #include "otbDrawLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index 728546e2fd..ebb26fa737 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -97,7 +97,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToLineSpatialObjectListFilter.txx"
+#include "otbImageToLineSpatialObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
index 9c6a0d9cd8..dbd0b023b7 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToLineSpatialObjectListFilter_txx
-#define otbImageToLineSpatialObjectListFilter_txx
+#ifndef otbImageToLineSpatialObjectListFilter_hxx
+#define otbImageToLineSpatialObjectListFilter_hxx
 
 #include "otbImageToLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
index 091e37c0a4..1bc33fcb4f 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
@@ -132,7 +132,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObject.txx"
+#include "otbLineSpatialObject.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
index 5cd5e52337..3e5e99c95a 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObject_txx
-#define otbLineSpatialObject_txx
+#ifndef otbLineSpatialObject_hxx
+#define otbLineSpatialObject_hxx
 
 
 #include "otbLineSpatialObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index d3174d7ed9..52dc4682fb 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObjectListToPointSetFilter.txx"
+#include "otbLineSpatialObjectListToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
index 878f13ca85..a07beaabe7 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObjectListToPointSetFilter_txx
-#define otbLineSpatialObjectListToPointSetFilter_txx
+#ifndef otbLineSpatialObjectListToPointSetFilter_hxx
+#define otbLineSpatialObjectListToPointSetFilter_hxx
 
 #include "otbLineSpatialObjectListToPointSetFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
index 76e0d0592f..4bd45e6e04 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
@@ -79,7 +79,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialObjectSource.txx"
+#include "otbSpatialObjectSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
index 03443b15f5..52653276eb 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialObjectSource_txx
-#define otbSpatialObjectSource_txx
+#ifndef otbSpatialObjectSource_hxx
+#define otbSpatialObjectSource_hxx
 
 #include "otbSpatialObjectSource.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index ba728d927f..f530b3f4e8 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -163,7 +163,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialObjectToImageDrawingFilter.txx"
+#include "otbSpatialObjectToImageDrawingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
index cd29810f73..77fccfe8f1 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialObjectToImageDrawingFilter_txx
-#define otbSpatialObjectToImageDrawingFilter_txx
+#ifndef otbSpatialObjectToImageDrawingFilter_hxx
+#define otbSpatialObjectToImageDrawingFilter_hxx
 
 #include "otbSpatialObjectToImageDrawingFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
index 10283c7db8..a63e5c7c7c 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfDivisionsStrippedStreamingManager.txx"
+#include "otbNumberOfDivisionsStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
index 437ac71466..ce248caaff 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfDivisionsStrippedStreamingManager_txx
-#define otbNumberOfDivisionsStrippedStreamingManager_txx
+#ifndef otbNumberOfDivisionsStrippedStreamingManager_hxx
+#define otbNumberOfDivisionsStrippedStreamingManager_hxx
 
 #include "otbNumberOfDivisionsStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
index 270dc471e7..a0572cbe03 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
@@ -84,7 +84,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfDivisionsTiledStreamingManager.txx"
+#include "otbNumberOfDivisionsTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
index 16212ca365..ae2f3a31bc 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfDivisionsTiledStreamingManager_txx
-#define otbNumberOfDivisionsTiledStreamingManager_txx
+#ifndef otbNumberOfDivisionsTiledStreamingManager_hxx
+#define otbNumberOfDivisionsTiledStreamingManager_hxx
 
 #include "otbNumberOfDivisionsTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
index 6426c858b6..6bd16c833a 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
@@ -89,7 +89,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfLinesStrippedStreamingManager.txx"
+#include "otbNumberOfLinesStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
index 64f12ae90a..c7a78ed14d 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfLinesStrippedStreamingManager_txx
-#define otbNumberOfLinesStrippedStreamingManager_txx
+#ifndef otbNumberOfLinesStrippedStreamingManager_hxx
+#define otbNumberOfLinesStrippedStreamingManager_hxx
 
 #include "otbNumberOfLinesStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
index f319c00c46..8a98ff6bd3 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
@@ -98,7 +98,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentFilterStreamingDecorator.txx"
+#include "otbPersistentFilterStreamingDecorator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
index 1d1596c794..c86b6feaa9 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentFilterStreamingDecorator_txx
-#define otbPersistentFilterStreamingDecorator_txx
+#ifndef otbPersistentFilterStreamingDecorator_hxx
+#define otbPersistentFilterStreamingDecorator_hxx
 
 #include "otbPersistentFilterStreamingDecorator.h"
 
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
index 2ddeccf215..f4533fa6db 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
@@ -103,7 +103,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenAdaptativeStreamingManager.txx"
+#include "otbRAMDrivenAdaptativeStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
index 743d5de281..03b3b3a0c5 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenAdaptativeStreamingManager_txx
-#define otbRAMDrivenAdaptativeStreamingManager_txx
+#ifndef otbRAMDrivenAdaptativeStreamingManager_hxx
+#define otbRAMDrivenAdaptativeStreamingManager_hxx
 
 #include "otbRAMDrivenAdaptativeStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
index 332c2610d2..d4dc1a8b8a 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
@@ -101,7 +101,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenStrippedStreamingManager.txx"
+#include "otbRAMDrivenStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
index 1eb39cbc5a..3bb770ad7f 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenStrippedStreamingManager_txx
-#define otbRAMDrivenStrippedStreamingManager_txx
+#ifndef otbRAMDrivenStrippedStreamingManager_hxx
+#define otbRAMDrivenStrippedStreamingManager_hxx
 
 #include "otbRAMDrivenStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
index d5b40a858c..19883b4577 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
@@ -97,7 +97,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenTiledStreamingManager.txx"
+#include "otbRAMDrivenTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
index c094cc90a0..e9034910dc 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenTiledStreamingManager_txx
-#define otbRAMDrivenTiledStreamingManager_txx
+#ifndef otbRAMDrivenTiledStreamingManager_hxx
+#define otbRAMDrivenTiledStreamingManager_hxx
 
 #include "otbRAMDrivenTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index d01a475cf1..562ee55994 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -200,7 +200,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingImageVirtualWriter.txx"
+#include "otbStreamingImageVirtualWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
index 7336993ed3..25994d53f6 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingImageVirtualWriter_txx
-#define otbStreamingImageVirtualWriter_txx
+#ifndef otbStreamingImageVirtualWriter_hxx
+#define otbStreamingImageVirtualWriter_hxx
 #include "otbStreamingImageVirtualWriter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
index 860fa455ec..a73908415f 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbStreamingManager.h
@@ -128,7 +128,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingManager.txx"
+#include "otbStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.hxx b/Modules/Core/Streaming/include/otbStreamingManager.hxx
index 9d2f3ddbd8..7d7cfb7e3e 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingManager_txx
-#define otbStreamingManager_txx
+#ifndef otbStreamingManager_hxx
+#define otbStreamingManager_hxx
 
 #include "otbStreamingManager.h"
 #include "otbConfigurationManager.h"
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
index a4286febb0..f9b84aa2a8 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
@@ -90,7 +90,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileDimensionTiledStreamingManager.txx"
+#include "otbTileDimensionTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
index e89e3986cb..d3d9184c65 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileDimensionTiledStreamingManager_txx
-#define otbTileDimensionTiledStreamingManager_txx
+#ifndef otbTileDimensionTiledStreamingManager_hxx
+#define otbTileDimensionTiledStreamingManager_hxx
 
 #include "otbTileDimensionTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
index a152662542..de5274c63b 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.h
+++ b/Modules/Core/Transform/include/otbCompositeTransform.h
@@ -145,7 +145,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCompositeTransform.txx"
+#include "otbCompositeTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.hxx b/Modules/Core/Transform/include/otbCompositeTransform.hxx
index 76ff270d45..e95cf9abbe 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.hxx
+++ b/Modules/Core/Transform/include/otbCompositeTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCompositeTransform_txx
-#define otbCompositeTransform_txx
+#ifndef otbCompositeTransform_hxx
+#define otbCompositeTransform_hxx
 
 #include "otbCompositeTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
index 29d22c0551..f58e9cc2e0 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.h
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.h
@@ -93,7 +93,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbForwardSensorModel.txx"
+#include "otbForwardSensorModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.hxx b/Modules/Core/Transform/include/otbForwardSensorModel.hxx
index e7f11bd392..710b8522ba 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.hxx
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbForwardSensorModel_txx
-#define otbForwardSensorModel_txx
+#ifndef otbForwardSensorModel_hxx
+#define otbForwardSensorModel_hxx
 
 #include "otbForwardSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
index a41106563a..01a1fda7e6 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.h
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.h
@@ -126,7 +126,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericMapProjection.txx"
+#include "otbGenericMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.hxx b/Modules/Core/Transform/include/otbGenericMapProjection.hxx
index 9d25594acd..9538333e35 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.hxx
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericMapProjection_txx
-#define otbGenericMapProjection_txx
+#ifndef otbGenericMapProjection_hxx
+#define otbGenericMapProjection_hxx
 
 #include "otbGenericMapProjection.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
index 433d99955d..e18309fac3 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.h
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.h
@@ -223,7 +223,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRSTransform.txx"
+#include "otbGenericRSTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.hxx b/Modules/Core/Transform/include/otbGenericRSTransform.hxx
index 879cba0d6d..85027522d3 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.hxx
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRSTransform_txx
-#define otbGenericRSTransform_txx
+#ifndef otbGenericRSTransform_hxx
+#define otbGenericRSTransform_hxx
 
 #include "otbGenericRSTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
index fd9ed8975e..3993231905 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.h
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.h
@@ -82,7 +82,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeocentricTransform.txx"
+#include "otbGeocentricTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.hxx b/Modules/Core/Transform/include/otbGeocentricTransform.hxx
index 6e55426b5f..de3732df65 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.hxx
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeocentricTransform_txx
-#define otbGeocentricTransform_txx
+#ifndef otbGeocentricTransform_hxx
+#define otbGeocentricTransform_hxx
 
 #include "otbGeocentricTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index 6a36ced78b..b8e1b0f536 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -192,7 +192,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToGenericRSOutputParameters.txx"
+#include "otbImageToGenericRSOutputParameters.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
index ece487e037..3a5293cb2d 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToGenericRSOutputParameters_txx
-#define otbImageToGenericRSOutputParameters_txx
+#ifndef otbImageToGenericRSOutputParameters_hxx
+#define otbImageToGenericRSOutputParameters_hxx
 
 
 #include "otbImageToGenericRSOutputParameters.h"
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
index 01ab403dc3..b9931b46a0 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
@@ -137,7 +137,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInverseLogPolarTransform.txx"
+#include "otbInverseLogPolarTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx b/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
index 086965210f..4859dc0526 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInverseLogPolarTransform_txx
-#define otbInverseLogPolarTransform_txx
+#ifndef otbInverseLogPolarTransform_hxx
+#define otbInverseLogPolarTransform_hxx
 
 #include "otbInverseLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
index c76405f7eb..75fbde40f3 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.h
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.h
@@ -95,7 +95,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInverseSensorModel.txx"
+#include "otbInverseSensorModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.hxx b/Modules/Core/Transform/include/otbInverseSensorModel.hxx
index 9c967e7cc2..5679ae7deb 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.hxx
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInverseSensorModel_txx
-#define otbInverseSensorModel_txx
+#ifndef otbInverseSensorModel_hxx
+#define otbInverseSensorModel_hxx
 
 #include "otbInverseSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
index c9894eafa5..0bd4c6d528 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.h
@@ -141,7 +141,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLogPolarTransform.txx"
+#include "otbLogPolarTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.hxx b/Modules/Core/Transform/include/otbLogPolarTransform.hxx
index 9b1d54915d..f49f3f13d8 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.hxx
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLogPolarTransform_txx
-#define otbLogPolarTransform_txx
+#ifndef otbLogPolarTransform_hxx
+#define otbLogPolarTransform_hxx
 
 #include "otbLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index e3c4f313a5..ddab6a0bbf 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -111,7 +111,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSensorModelBase.txx"
+#include "otbSensorModelBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.hxx b/Modules/Core/Transform/include/otbSensorModelBase.hxx
index e324e86a48..541c74949e 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.hxx
+++ b/Modules/Core/Transform/include/otbSensorModelBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSensorModelBase_txx
-#define otbSensorModelBase_txx
+#ifndef otbSensorModelBase_hxx
+#define otbSensorModelBase_hxx
 
 #include "otbSensorModelBase.h"
 
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index dea4315b01..ce77efe8ac 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingWarpImageFilter.txx"
+#include "otbStreamingWarpImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
index 211bf8f3a3..c6146d9552 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingWarpImageFilter_txx
-#define otbStreamingWarpImageFilter_txx
+#ifndef otbStreamingWarpImageFilter_hxx
+#define otbStreamingWarpImageFilter_hxx
 
 #include "otbStreamingWarpImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index 2ee30191be..660827d5ad 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -325,7 +325,7 @@ private:
 } // end namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNode.txx"
+#include "otbDataNode.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.hxx b/Modules/Core/VectorDataBase/include/otbDataNode.hxx
index a31ddfbc5b..f5473f2472 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNode_txx
-#define otbDataNode_txx
+#ifndef otbDataNode_hxx
+#define otbDataNode_hxx
 
 #include "otbDataNode.h"
 #include "otbMetaDataKey.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
index 0dcf7dff7a..5444659538 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
@@ -206,7 +206,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNodeImageFunction.txx"
+#include "otbDataNodeImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
index 681c4ccf21..419e3c8df1 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNodeImageFunction_txx
-#define otbDataNodeImageFunction_txx
+#ifndef otbDataNodeImageFunction_hxx
+#define otbDataNodeImageFunction_hxx
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
index 0be2c90bcd..182898a877 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
@@ -106,7 +106,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNodeVectorDataFunction.txx"
+#include "otbDataNodeVectorDataFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
index fc09a14f7a..037c2784fd 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNodeVectorDataFunction_txx
-#define otbDataNodeVectorDataFunction_txx
+#ifndef otbDataNodeVectorDataFunction_hxx
+#define otbDataNodeVectorDataFunction_hxx
 
 #include "otbDataNodeVectorDataFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
index c7839f8b6d..330335a6fc 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
@@ -138,7 +138,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolyLineParametricPathWithValue.txx"
+#include "otbPolyLineParametricPathWithValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
index 48df17969f..d56e726d55 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolyLineParametricPathWithValue_txx
-#define otbPolyLineParametricPathWithValue_txx
+#ifndef otbPolyLineParametricPathWithValue_hxx
+#define otbPolyLineParametricPathWithValue_hxx
 
 #include "otbPolyLineParametricPathWithValue.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
index f6db4f70f9..abc4ad7ac0 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.h
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.h
@@ -160,6 +160,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygon.txx"
+#include "otbPolygon.hxx"
 #endif
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.hxx b/Modules/Core/VectorDataBase/include/otbPolygon.hxx
index 3eb5d8c393..ce58be44fd 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.hxx
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygon_txx
-#define otbPolygon_txx
+#ifndef otbPolygon_hxx
+#define otbPolygon_hxx
 
 #include "otbPolygon.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index b4a1757c00..77a1c19c31 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorData.txx"
+#include "otbVectorData.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.hxx b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
index 9e84ca0912..bbb2df515e 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorData_txx
-#define otbVectorData_txx
+#ifndef otbVectorData_hxx
+#define otbVectorData_hxx
 
 #include "otbVectorData.h"
 #include "itkPreOrderTreeIterator.h"
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index a89fa4665b..fee18b413d 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -104,7 +104,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataProperties.txx"
+#include "otbVectorDataProperties.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
index dfbc33ebd6..27f849899f 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataProperties_txx
-#define otbVectorDataProperties_txx
+#ifndef otbVectorDataProperties_hxx
+#define otbVectorDataProperties_hxx
 
 #include "otbVectorDataProperties.h"
 #include <algorithm>
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
index 7572c713c1..528d8ed4b4 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataSource.txx"
+#include "otbVectorDataSource.hxx"
 #endif
 
 #endif // otbVectorDataSource_h
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx b/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
index 2a8f3d40e6..b602ea48fa 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataSource_txx
-#define otbVectorDataSource_txx
+#ifndef otbVectorDataSource_hxx
+#define otbVectorDataSource_hxx
 
 #include "otbVectorDataSource.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
index f49a55fb55..f6b5ecfa62 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCloudDetectionFilter.txx"
+#include "otbCloudDetectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
index d24eb24d62..c66f84924e 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCloudDetectionFilter_txx
-#define otbCloudDetectionFilter_txx
+#ifndef otbCloudDetectionFilter_hxx
+#define otbCloudDetectionFilter_hxx
 
 #include "otbCloudDetectionFilter.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
index 914137fd85..066d2dd47e 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCloudEstimatorFilter.txx"
+#include "otbCloudEstimatorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
index 1b17acfa3d..71fe001707 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCloudEstimatorFilter_txx
-#define otbCloudEstimatorFilter_txx
+#ifndef otbCloudEstimatorFilter_hxx
+#define otbCloudEstimatorFilter_hxx
 
 #include "otbCloudEstimatorFilter.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
index 274e4f76d1..1afc7a6669 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
@@ -373,7 +373,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDescriptorsListSampleGenerator.txx"
+#include "otbDescriptorsListSampleGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
index a6390c070f..47c11bb229 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDescriptorsListSampleGenerator_txx
-#define otbDescriptorsListSampleGenerator_txx
+#ifndef otbDescriptorsListSampleGenerator_hxx
+#define otbDescriptorsListSampleGenerator_hxx
 
 #include "otbDescriptorsListSampleGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
index 95653d5425..ef9faf92de 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserMomentsIFFactory.txx"
+#include "otbFlusserMomentsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
index ae50adff9a..337fef095c 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserMomentsIFFactory_txx
-#define otbFlusserMomentsIFFactory_txx
+#ifndef otbFlusserMomentsIFFactory_hxx
+#define otbFlusserMomentsIFFactory_hxx
 
 #include "otbFlusserMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
index 1c5291859b..cca84eb5c7 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
@@ -92,7 +92,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFourierMellinDescriptorsIFFactory.txx"
+#include "otbFourierMellinDescriptorsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
index 0de242a51a..4ed3cccd7d 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFourierMellinDescriptorsIFFactory_txx
-#define otbFourierMellinDescriptorsIFFactory_txx
+#ifndef otbFourierMellinDescriptorsIFFactory_hxx
+#define otbFourierMellinDescriptorsIFFactory_hxx
 
 #include "otbFourierMellinDescriptorsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
index 8274254333..8826d9d11f 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
@@ -94,7 +94,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHaralickTexturesIFFactory.txx"
+#include "otbHaralickTexturesIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
index de2d4929f1..bb24f81460 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHaralickTexturesIFFactory_txx
-#define otbHaralickTexturesIFFactory_txx
+#ifndef otbHaralickTexturesIFFactory_hxx
+#define otbHaralickTexturesIFFactory_hxx
 
 #include "otbHaralickTexturesIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
index ebe68953a0..ea8045afcf 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabeledSampleLocalizationGenerator.txx"
+#include "otbLabeledSampleLocalizationGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
index 0045af00e4..6de63961c1 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabeledSampleLocalizationGenerator_txx
-#define otbLabeledSampleLocalizationGenerator_txx
+#ifndef otbLabeledSampleLocalizationGenerator_hxx
+#define otbLabeledSampleLocalizationGenerator_hxx
 
 #include "otbLabeledSampleLocalizationGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
index cbbf8d133e..4bc4fd7b2e 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHistogramIFFactory.txx"
+#include "otbLocalHistogramIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
index a251d3c030..f00052d61a 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHistogramIFFactory_txx
-#define otbLocalHistogramIFFactory_txx
+#ifndef otbLocalHistogramIFFactory_hxx
+#define otbLocalHistogramIFFactory_hxx
 
 #include "otbLocalHistogramIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
index 52dbaa8b6c..e9038a93f4 100644
--- a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
+++ b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
@@ -387,7 +387,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectDetectionClassifier.txx"
+#include "otbObjectDetectionClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
index 884cf3f076..27f12b54d4 100644
--- a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectDetectionClassifier_txx
-#define otbObjectDetectionClassifier_txx
+#ifndef otbObjectDetectionClassifier_hxx
+#define otbObjectDetectionClassifier_hxx
 
 #include "otbObjectDetectionClassifier.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
index 945fc56218..d05ee02301 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsIFFactory.txx"
+#include "otbRadiometricMomentsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
index 39ca90d588..77108870f8 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsIFFactory_txx
-#define otbRadiometricMomentsIFFactory_txx
+#ifndef otbRadiometricMomentsIFFactory_hxx
+#define otbRadiometricMomentsIFFactory_hxx
 
 #include "otbRadiometricMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
index 02af7640de..8dc32a8e95 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
@@ -190,7 +190,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStandardMetaImageFunctionBuilder.txx"
+#include "otbStandardMetaImageFunctionBuilder.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
index e54db83fed..1307e3bf9e 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStandardMetaImageFunctionBuilder_txx
-#define otbStandardMetaImageFunctionBuilder_txx
+#ifndef otbStandardMetaImageFunctionBuilder_hxx
+#define otbStandardMetaImageFunctionBuilder_hxx
 
 #include "otbStandardMetaImageFunctionBuilder.h"
 
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
index d39a63c750..7dfe47acd9 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
@@ -88,7 +88,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBreakAngularPathListFilter.txx"
+#include "otbBreakAngularPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
index d7a72743e8..902592407e 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBreakAngularPathListFilter_txx
-#define otbBreakAngularPathListFilter_txx
+#ifndef otbBreakAngularPathListFilter_hxx
+#define otbBreakAngularPathListFilter_hxx
 
 #include "otbBreakAngularPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index 0ef02b0c81..d0847581f6 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -249,7 +249,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRoadExtractionFilter.txx"
+#include "otbGenericRoadExtractionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
index 32d2638ea9..4623513a20 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRoadExtractionFilter_txx
-#define otbGenericRoadExtractionFilter_txx
+#ifndef otbGenericRoadExtractionFilter_hxx
+#define otbGenericRoadExtractionFilter_hxx
 
 #include "otbGenericRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
index 7b1d94539a..983052715c 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathListAlignFilter.txx"
+#include "otbImageToPathListAlignFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
index 459b09310f..632bba0fe8 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPathListAlignFilter_txx
-#define otbImageToPathListAlignFilter_txx
+#ifndef otbImageToPathListAlignFilter_hxx
+#define otbImageToPathListAlignFilter_hxx
 
 #include "otbImageToPathListAlignFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
index 5930c35d5a..771313b24d 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
@@ -99,7 +99,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLikelihoodPathListFilter.txx"
+#include "otbLikelihoodPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
index 99e40bc8f3..d1c8a3d360 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLikelihoodPathListFilter_txx
-#define otbLikelihoodPathListFilter_txx
+#ifndef otbLikelihoodPathListFilter_hxx
+#define otbLikelihoodPathListFilter_hxx
 
 #include "otbLikelihoodPathListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
index d0fe805cf7..6d8dc01979 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
@@ -123,7 +123,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLinkPathListFilter.txx"
+#include "otbLinkPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
index 631dba20b5..32b9450f7a 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLinkPathListFilter_txx
-#define otbLinkPathListFilter_txx
+#ifndef otbLinkPathListFilter_hxx
+#define otbLinkPathListFilter_hxx
 
 #include "otbLinkPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index ab10ba8352..152095678f 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbModulusAndDirectionImageToImageFilter.txx"
+#include "otbModulusAndDirectionImageToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
index aed6e93c4b..1ff4f89164 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbModulusAndDirectionImageToImageFilter_txx
-#define otbModulusAndDirectionImageToImageFilter_txx
+#ifndef otbModulusAndDirectionImageToImageFilter_hxx
+#define otbModulusAndDirectionImageToImageFilter_hxx
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
index 2f82bf2dbb..9e39bae2e1 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
@@ -105,7 +105,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeighborhoodScalarProductFilter.txx"
+#include "otbNeighborhoodScalarProductFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
index 7c26c7476f..a6a80d6eaf 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeighborhoodScalarProductFilter_txx
-#define otbNeighborhoodScalarProductFilter_txx
+#ifndef otbNeighborhoodScalarProductFilter_hxx
+#define otbNeighborhoodScalarProductFilter_hxx
 
 #include "otbNeighborhoodScalarProductFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
index adbae3394a..49dc64059f 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
@@ -155,7 +155,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbParallelLinePathListFilter.txx"
+#include "otbParallelLinePathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
index c6a8b83bd0..95aa5a5e50 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbParallelLinePathListFilter_txx
-#define otbParallelLinePathListFilter_txx
+#ifndef otbParallelLinePathListFilter_hxx
+#define otbParallelLinePathListFilter_hxx
 
 #include "otbParallelLinePathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
index 5259b4e0b2..367bf27190 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
@@ -165,7 +165,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRoadExtractionFilter.txx"
+#include "otbRoadExtractionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
index 6b120eaf6b..3bfea872d0 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRoadExtractionFilter_txx
-#define otbRoadExtractionFilter_txx
+#ifndef otbRoadExtractionFilter_hxx
+#define otbRoadExtractionFilter_hxx
 
 #include "otbRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
index 1d2c6bfe01..0fd5526edb 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
@@ -136,7 +136,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRoadDescriptionFilter.txx"
+#include "otbVectorDataToRoadDescriptionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
index 17849a42e9..bbe91a8907 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRoadDescriptionFilter_txx
-#define otbVectorDataToRoadDescriptionFilter_txx
+#ifndef otbVectorDataToRoadDescriptionFilter_hxx
+#define otbVectorDataToRoadDescriptionFilter_hxx
 
 #include "otbVectorDataToRoadDescriptionFilter.h"
 
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
index 03ff84dfde..d4fdf9c0e2 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
@@ -262,7 +262,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUrbanAreaDetectionImageFilter.txx"
+#include "otbUrbanAreaDetectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
index 70c9775412..721ef15538 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUrbanAreaDetectionImageFilter_txx
-#define otbUrbanAreaDetectionImageFilter_txx
+#ifndef otbUrbanAreaDetectionImageFilter_hxx
+#define otbUrbanAreaDetectionImageFilter_hxx
 
 #include "otbUrbanAreaDetectionImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
index 9fae4a897f..d9ccf8eddb 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHarrisImageFilter.txx"
+#include "otbHarrisImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx b/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
index e3a39d4b26..7b0795e59a 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHarrisImageFilter_txx
-#define otbHarrisImageFilter_txx
+#ifndef otbHarrisImageFilter_hxx
+#define otbHarrisImageFilter_hxx
 
 #include "otbHarrisImageFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
index 39eaa3bce2..867285d770 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHarrisImageToPointSetFilter.txx"
+#include "otbHarrisImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
index d9cc6edd1f..609b96ecd3 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHarrisImageToPointSetFilter_txx
-#define otbHarrisImageToPointSetFilter_txx
+#ifndef otbHarrisImageToPointSetFilter_hxx
+#define otbHarrisImageToPointSetFilter_hxx
 
 #include "otbHarrisImageToPointSetFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index e8d4c6c0a8..77905f8c5d 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -157,7 +157,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObjectListToRightAnglePointSetFilter.txx"
+#include "otbLineSpatialObjectListToRightAnglePointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
index 3cc3f5a5ef..704408cd77 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_txx
-#define otbLineSpatialObjectListToRightAnglePointSetFilter_txx
+#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_hxx
+#define otbLineSpatialObjectListToRightAnglePointSetFilter_hxx
 
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "itkLineIterator.h"
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index b07920e67c..5de73247de 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -110,7 +110,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRightAngleVectorDataFilter.txx"
+#include "otbVectorDataToRightAngleVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
index a6ee8f224f..9b8c19e6ba 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRightAngleVectorDataFilter_txx
-#define otbVectorDataToRightAngleVectorDataFilter_txx
+#ifndef otbVectorDataToRightAngleVectorDataFilter_hxx
+#define otbVectorDataToRightAngleVectorDataFilter_hxx
 
 #include "otbVectorDataToRightAngleVectorDataFilter.h"
 #include "otbVectorData.h"
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
index a1f07c482d..82cfa22d22 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
@@ -121,7 +121,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKeyPointDensityImageFilter.txx"
+#include "otbKeyPointDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
index e08c7e52bb..22b02cba98 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKeyPointDensityImageFilter_txx
-#define otbKeyPointDensityImageFilter_txx
+#ifndef otbKeyPointDensityImageFilter_hxx
+#define otbKeyPointDensityImageFilter_hxx
 
 #include "otbKeyPointDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
index 2080f6f2a7..0c5d9ddb60 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
@@ -83,7 +83,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityEpanechnikovFunction.txx"
+#include "otbPointSetDensityEpanechnikovFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
index f6e3f64d34..129eac74aa 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityEpanechnikovFunction_txx
-#define otbPointSetDensityEpanechnikovFunction_txx
+#ifndef otbPointSetDensityEpanechnikovFunction_hxx
+#define otbPointSetDensityEpanechnikovFunction_hxx
 
 #include "otbPointSetDensityEpanechnikovFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
index 271fdf3e5f..4650ae5906 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
@@ -82,7 +82,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityFunction.txx"
+#include "otbPointSetDensityFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
index 971217acf6..cb8511508b 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityFunction_txx
-#define otbPointSetDensityFunction_txx
+#ifndef otbPointSetDensityFunction_hxx
+#define otbPointSetDensityFunction_hxx
 
 #include "otbPointSetDensityFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
index f4ec551e79..d09bf7f041 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
@@ -83,7 +83,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityGaussianFunction.txx"
+#include "otbPointSetDensityGaussianFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
index f506061236..6f5762dfd4 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityGaussianFunction_txx
-#define otbPointSetDensityGaussianFunction_txx
+#ifndef otbPointSetDensityGaussianFunction_hxx
+#define otbPointSetDensityGaussianFunction_hxx
 
 #include "otbPointSetDensityGaussianFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
index bd07312edd..15206e3065 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
@@ -113,7 +113,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToDensityImageFilter.txx"
+#include "otbPointSetToDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
index 09c672b715..487114368e 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToDensityImageFilter_txx
-#define otbPointSetToDensityImageFilter_txx
+#ifndef otbPointSetToDensityImageFilter_hxx
+#define otbPointSetToDensityImageFilter_hxx
 
 #include "otbPointSetToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
index 8c7474ec8a..f1dd2b9ff4 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
@@ -169,7 +169,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbForwardFourierMellinTransformImageFilter.txx"
+#include "otbForwardFourierMellinTransformImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
index 9d48d66ff2..3d52de5b85 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbForwardFourierMellinTransformImageFilter_txx
-#define otbForwardFourierMellinTransformImageFilter_txx
+#ifndef otbForwardFourierMellinTransformImageFilter_hxx
+#define otbForwardFourierMellinTransformImageFilter_hxx
 
 #include "otbForwardFourierMellinTransformImageFilter.h"
 #include "itkImageDuplicator.h"
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
index 0a78af0f05..477dd88f80 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
@@ -149,7 +149,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFourierMellinDescriptorsImageFunction.txx"
+#include "otbFourierMellinDescriptorsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
index cb243ca5fb..3285ba9193 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFourierMellinDescriptorsImageFunction_txx
-#define otbFourierMellinDescriptorsImageFunction_txx
+#ifndef otbFourierMellinDescriptorsImageFunction_hxx
+#define otbFourierMellinDescriptorsImageFunction_hxx
 
 #include "otbFourierMellinDescriptorsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index 82d0b64555..1df3a0951c 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -151,7 +151,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramOfOrientedGradientCovariantImageFunction.txx"
+#include "otbHistogramOfOrientedGradientCovariantImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
index 63df3b5de8..5c7f668ebc 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_txx
-#define otbHistogramOfOrientedGradientCovariantImageFunction_txx
+#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_hxx
+#define otbHistogramOfOrientedGradientCovariantImageFunction_hxx
 
 #include "otbHistogramOfOrientedGradientCovariantImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
index 009f709194..20c9b8ff93 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
@@ -155,7 +155,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToHessianDeterminantImageFilter.txx"
+#include "otbImageToHessianDeterminantImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
index 249db9334f..920b3e1cef 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageToHessianDeterminantImageFilter_txx
-#define otbImageToHessianDeterminantImageFilter_txx
+#ifndef otbImageToHessianDeterminantImageFilter_hxx
+#define otbImageToHessianDeterminantImageFilter_hxx
 
 #include "otbImageToHessianDeterminantImageFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
index e4386292c1..24380e2065 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
@@ -398,7 +398,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToSIFTKeyPointSetFilter.txx"
+#include "otbImageToSIFTKeyPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
index e34a5a8ba4..f2eba3fa16 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToSIFTKeyPointSetFilter_txx
-#define otbImageToSIFTKeyPointSetFilter_txx
+#ifndef otbImageToSIFTKeyPointSetFilter_hxx
+#define otbImageToSIFTKeyPointSetFilter_hxx
 
 #include "otbImageToSIFTKeyPointSetFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
index 0dd8d10791..47dd1750a4 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
@@ -245,7 +245,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToSURFKeyPointSetFilter.txx"
+#include "otbImageToSURFKeyPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
index 4221e4ba0c..d787e1c9c0 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToSURFKeyPointSetFilter_txx
-#define otbImageToSURFKeyPointSetFilter_txx
+#ifndef otbImageToSURFKeyPointSetFilter_hxx
+#define otbImageToSURFKeyPointSetFilter_hxx
 
 #include "otbImageToSURFKeyPointSetFilter.h"
 #include "itkCenteredRigid2DTransform.h"
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
index d5851c125e..f99d530bc2 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
@@ -132,6 +132,6 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKeyPointSetsMatchingFilter.txx"
+#include "otbKeyPointSetsMatchingFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
index e4719fb196..66a458cc1c 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKeyPointSetsMatchingFilter_txx
-#define otbKeyPointSetsMatchingFilter_txx
+#ifndef otbKeyPointSetsMatchingFilter_hxx
+#define otbKeyPointSetsMatchingFilter_hxx
 
 #include "otbKeyPointSetsMatchingFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
index ff1e7ef2b5..339b539d28 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
@@ -110,7 +110,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSiftFastImageFilter.txx"
+#include "otbSiftFastImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
index 6f7d96db40..816a4aaa90 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSiftFastImageFilter_txx
-#define otbSiftFastImageFilter_txx
+#ifndef otbSiftFastImageFilter_hxx
+#define otbSiftFastImageFilter_hxx
 
 #include "otbSiftFastImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
index b05a3de798..eb74194ef0 100644
--- a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
@@ -105,7 +105,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAsymmetricFusionOfLineDetectorImageFilter.txx"
+#include "otbAsymmetricFusionOfLineDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
index 9821873023..ee169f4615 100644
--- a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAsymmetricFusionOfLineDetectorImageFilter_txx
-#define otbAsymmetricFusionOfLineDetectorImageFilter_txx
+#ifndef otbAsymmetricFusionOfLineDetectorImageFilter_hxx
+#define otbAsymmetricFusionOfLineDetectorImageFilter_hxx
 
 #include "otbAsymmetricFusionOfLineDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
index 9bdddd6390..75169f5d2b 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
@@ -125,7 +125,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEdgeDensityImageFilter.txx"
+#include "otbEdgeDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
index 8730e98aff..e72023a2dc 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEdgeDensityImageFilter_txx
-#define otbEdgeDensityImageFilter_txx
+#ifndef otbEdgeDensityImageFilter_hxx
+#define otbEdgeDensityImageFilter_hxx
 
 #include "otbEdgeDensityImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index d0c50c4707..0b71e7c650 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEdgeDetectorImageFilter.txx"
+#include "otbEdgeDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
index 861166ede9..733b9e80b5 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEdgeDetectorImageFilter_txx
-#define otbEdgeDetectorImageFilter_txx
+#ifndef otbEdgeDetectorImageFilter_hxx
+#define otbEdgeDetectorImageFilter_hxx
 
 #include "otbEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
index fe557e5224..ad458f0441 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
@@ -155,7 +155,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractSegmentsImageFilter.txx"
+#include "otbExtractSegmentsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
index 592da7d726..2f609d13c5 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractSegmentsImageFilter_txx
-#define otbExtractSegmentsImageFilter_txx
+#ifndef otbExtractSegmentsImageFilter_hxx
+#define otbExtractSegmentsImageFilter_hxx
 
 #include "otbExtractSegmentsImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
index 758e33dd45..bd3c95f4c3 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
@@ -239,7 +239,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHoughTransform2DLinesImageFilter.txx"
+#include "otbHoughTransform2DLinesImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
index 893e1829c7..f2256c6601 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHoughTransform2DLinesImageFilter_txx
-#define otbHoughTransform2DLinesImageFilter_txx
+#ifndef otbHoughTransform2DLinesImageFilter_hxx
+#define otbHoughTransform2DLinesImageFilter_hxx
 
 #include "otbHoughTransform2DLinesImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
index abac114da0..53ffa02879 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineCorrelationDetectorImageFilter.txx"
+#include "otbLineCorrelationDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
index 81b08ff5cb..6c4da8b6e4 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineCorrelationDetectorImageFilter_txx
-#define otbLineCorrelationDetectorImageFilter_txx
+#ifndef otbLineCorrelationDetectorImageFilter_hxx
+#define otbLineCorrelationDetectorImageFilter_hxx
 
 #include "otbLineCorrelationDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
index cbd7713119..204589dce0 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineDetectorImageFilterBase.txx"
+#include "otbLineDetectorImageFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
index b5ca1a2661..1f9c512bae 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineDetectorImageFilterBase_txx
-#define otbLineDetectorImageFilterBase_txx
+#ifndef otbLineDetectorImageFilterBase_hxx
+#define otbLineDetectorImageFilterBase_hxx
 
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
index 6a77da7f3b..ee30972f2c 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineRatioDetectorImageFilter.txx"
+#include "otbLineRatioDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
index c8f8ec7d66..638656418e 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineRatioDetectorImageFilter_txx
-#define otbLineRatioDetectorImageFilter_txx
+#ifndef otbLineRatioDetectorImageFilter_hxx
+#define otbLineRatioDetectorImageFilter_hxx
 
 #include "otbLineRatioDetectorImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index 4cc70ff2cf..9e335d2e8b 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -286,7 +286,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSegmentDetector.txx"
+#include "otbLineSegmentDetector.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx b/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
index b2a181823a..1d81fbfa31 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSegmentDetector_txx
-#define otbLineSegmentDetector_txx
+#ifndef otbLineSegmentDetector_hxx
+#define otbLineSegmentDetector_hxx
 
 #include "otbLineSegmentDetector.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index 365febc98f..ae3493aa30 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -167,7 +167,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHoughFilter.txx"
+#include "otbLocalHoughFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx b/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
index b6a21b20f2..5c11092c8d 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHoughFilter_txx
-#define otbLocalHoughFilter_txx
+#ifndef otbLocalHoughFilter_hxx
+#define otbLocalHoughFilter_hxx
 
 #include "otbLocalHoughFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
index cf7e0cf03e..76bbd311b6 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
@@ -107,7 +107,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentVectorizationImageFilter.txx"
+#include "otbPersistentVectorizationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
index 07fe9cf2b3..ca33dad9df 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentVectorizationImageFilter_txx
-#define otbPersistentVectorizationImageFilter_txx
+#ifndef otbPersistentVectorizationImageFilter_hxx
+#define otbPersistentVectorizationImageFilter_hxx
 
 #include "otbPersistentVectorizationImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index 2da9dac793..2c7fcf936f 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPixelSuppressionByDirectionImageFilter.txx"
+#include "otbPixelSuppressionByDirectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
index 807a04901c..c6f0824955 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPixelSuppressionByDirectionImageFilter_txx
-#define otbPixelSuppressionByDirectionImageFilter_txx
+#ifndef otbPixelSuppressionByDirectionImageFilter_hxx
+#define otbPixelSuppressionByDirectionImageFilter_hxx
 
 #include "otbPixelSuppressionByDirectionImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
index fc250afcf3..2601c28516 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
@@ -112,7 +112,7 @@ public:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingLineSegmentDetector.txx"
+#include "otbStreamingLineSegmentDetector.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
index 7b1a111568..395d6e2e61 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingLineSegmentDetector_txx
-#define otbStreamingLineSegmentDetector_txx
+#ifndef otbStreamingLineSegmentDetector_hxx
+#define otbStreamingLineSegmentDetector_hxx
 
 #include "otbStreamingLineSegmentDetector.h"
 
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
index 37393478a3..40b5d84fca 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTouziEdgeDetectorImageFilter.txx"
+#include "otbTouziEdgeDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
index 8f80efc200..d6bda2c7e4 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTouziEdgeDetectorImageFilter_txx
-#define otbTouziEdgeDetectorImageFilter_txx
+#ifndef otbTouziEdgeDetectorImageFilter_hxx
+#define otbTouziEdgeDetectorImageFilter_hxx
 
 #include "otbTouziEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
index 6c1b29f682..9379b905e6 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
@@ -117,7 +117,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComplexMomentPathFunction.txx"
+#include "otbComplexMomentPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
index e4f5c28b6c..564842094d 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComplexMomentPathFunction_txx
-#define otbComplexMomentPathFunction_txx
+#ifndef otbComplexMomentPathFunction_hxx
+#define otbComplexMomentPathFunction_hxx
 
 #include "otbComplexMomentPathFunction.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
index 42b10edd4f..dcbc4e7abf 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
@@ -138,7 +138,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComplexMomentsImageFunction.txx"
+#include "otbComplexMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
index 731f7ec363..495d538100 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComplexMomentsImageFunction_txx
-#define otbComplexMomentsImageFunction_txx
+#ifndef otbComplexMomentsImageFunction_hxx
+#define otbComplexMomentsImageFunction_hxx
 
 #include "otbComplexMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
index 4b8bf18288..3b08a1e644 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
@@ -146,7 +146,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserMomentsImageFunction.txx"
+#include "otbFlusserMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
index 2caf81f8d5..d6a281010d 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserMomentsImageFunction_txx
-#define otbFlusserMomentsImageFunction_txx
+#ifndef otbFlusserMomentsImageFunction_hxx
+#define otbFlusserMomentsImageFunction_hxx
 
 #include "otbFlusserMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
index 9955d55334..e72c3a9a3d 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
@@ -115,7 +115,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserPathFunction.txx"
+#include "otbFlusserPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx b/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
index 7fc0f74bfe..0c73d58388 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserPathFunction_txx
-#define otbFlusserPathFunction_txx
+#ifndef otbFlusserPathFunction_hxx
+#define otbFlusserPathFunction_hxx
 
 #include "otbFlusserPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
index 0f344ccee6..abdf6184e0 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
@@ -142,7 +142,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHuMomentsImageFunction.txx"
+#include "otbHuMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
index abc21c1f2b..95aca0605d 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHuMomentsImageFunction_txx
-#define otbHuMomentsImageFunction_txx
+#ifndef otbHuMomentsImageFunction_hxx
+#define otbHuMomentsImageFunction_hxx
 
 #include "otbHuMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
index 1174935d27..a113fd2f09 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.h
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.h
@@ -112,7 +112,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHuPathFunction.txx"
+#include "otbHuPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.hxx b/Modules/Feature/Moments/include/otbHuPathFunction.hxx
index f390206f73..b217ba49fa 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHuPathFunction_txx
-#define otbHuPathFunction_txx
+#ifndef otbHuPathFunction_hxx
+#define otbHuPathFunction_hxx
 
 #include "otbHuPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
index 72ef9176c6..abe2a5209d 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -108,7 +108,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsImageFilter.txx"
+#include "otbRadiometricMomentsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
index 5c4275f31b..235726c006 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsImageFilter_txx
-#define otbRadiometricMomentsImageFilter_txx
+#ifndef otbRadiometricMomentsImageFilter_hxx
+#define otbRadiometricMomentsImageFilter_hxx
 
 #include "otbRadiometricMomentsImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
index 23a70bcb0d..d020e72988 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
@@ -128,7 +128,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsImageFunction.txx"
+#include "otbRadiometricMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
index faaf359660..c437697870 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsImageFunction_txx
-#define otbRadiometricMomentsImageFunction_txx
+#ifndef otbRadiometricMomentsImageFunction_hxx
+#define otbRadiometricMomentsImageFunction_hxx
 
 #include "otbRadiometricMomentsImageFunction.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
index 96d50a31da..18bd8ad176 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
@@ -124,7 +124,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRealMomentsImageFunction.txx"
+#include "otbRealMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
index 4a6d0d0576..5e6f75b110 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRealMomentsImageFunction_txx
-#define otbRealMomentsImageFunction_txx
+#ifndef otbRealMomentsImageFunction_hxx
+#define otbRealMomentsImageFunction_hxx
 
 #include "otbRealMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
index dd1bef6975..9d773ca236 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAddCarvingPathFilter.txx"
+#include "otbAddCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
index 506f894347..bfdaebef1c 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbAddCarvingPathFilter_txx
-#define otbAddCarvingPathFilter_txx
+#ifndef otbAddCarvingPathFilter_hxx
+#define otbAddCarvingPathFilter_hxx
 
 #include "otbAddCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
index 47e68f6a0f..2143bf729f 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
@@ -110,7 +110,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToCarvingPathFilter.txx"
+#include "otbImageToCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
index 70bbb0be7c..414351d4d6 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToCarvingPathFilter_txx
-#define otbImageToCarvingPathFilter_txx
+#ifndef otbImageToCarvingPathFilter_hxx
+#define otbImageToCarvingPathFilter_hxx
 
 #include "otbImageToCarvingPathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
index 93bc57457b..a5d18c8d1f 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRemoveCarvingPathFilter.txx"
+#include "otbRemoveCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
index 5052be60db..840ce9e738 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRemoveCarvingPathFilter_txx
-#define otbRemoveCarvingPathFilter_txx
+#ifndef otbRemoveCarvingPathFilter_hxx
+#define otbRemoveCarvingPathFilter_hxx
 
 #include "otbRemoveCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
index 08be9dbedd..a0d9879115 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
@@ -191,7 +191,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGreyLevelCooccurrenceIndexedList.txx"
+#include "otbGreyLevelCooccurrenceIndexedList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
index 477ad9cab3..77a7bba6bf 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbGreyLevelCooccurrenceIndexedList_txx
-#define otbGreyLevelCooccurrenceIndexedList_txx
+#ifndef otbGreyLevelCooccurrenceIndexedList_hxx
+#define otbGreyLevelCooccurrenceIndexedList_hxx
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
index fbbdbbc872..b52de36f95 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
@@ -233,7 +233,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHaralickTexturesImageFunction.txx"
+#include "otbHaralickTexturesImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
index b5dce464fe..896b7939c6 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHaralickTexturesImageFunction_txx
-#define otbHaralickTexturesImageFunction_txx
+#ifndef otbHaralickTexturesImageFunction_hxx
+#define otbHaralickTexturesImageFunction_hxx
 
 #include "otbHaralickTexturesImageFunction.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
index b05eace44b..403431c4ca 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
@@ -238,7 +238,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSFSTexturesImageFilter.txx"
+#include "otbSFSTexturesImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
index c52d07d491..eb0dd44ce3 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSFSTexturesImageFilter_txx
-#define otbSFSTexturesImageFilter_txx
+#ifndef otbSFSTexturesImageFilter_hxx
+#define otbSFSTexturesImageFilter_hxx
 
 #include "otbSFSTexturesImageFilter.h"
 
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 4b6b233f9b..e03748dc54 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -257,7 +257,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToAdvancedTexturesFilter.txx"
+#include "otbScalarImageToAdvancedTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
index 447170e096..20dad10abf 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToAdvancedTexturesFilter_txx
-#define otbScalarImageToAdvancedTexturesFilter_txx
+#ifndef otbScalarImageToAdvancedTexturesFilter_hxx
+#define otbScalarImageToAdvancedTexturesFilter_hxx
 
 #include "otbScalarImageToAdvancedTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index 64943649a0..5ab564b9c4 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -242,7 +242,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToHigherOrderTexturesFilter.txx"
+#include "otbScalarImageToHigherOrderTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
index 8ca02b8e89..167bc20975 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToHigherOrderTexturesFilter_txx
-#define otbScalarImageToHigherOrderTexturesFilter_txx
+#ifndef otbScalarImageToHigherOrderTexturesFilter_hxx
+#define otbScalarImageToHigherOrderTexturesFilter_hxx
 
 #include "otbScalarImageToHigherOrderTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index 62bcff4a85..b19c4b6148 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -146,7 +146,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToPanTexTextureFilter.txx"
+#include "otbScalarImageToPanTexTextureFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
index 85f393bb9a..a679cce10b 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToPanTexTextureFilter_txx
-#define otbScalarImageToPanTexTextureFilter_txx
+#ifndef otbScalarImageToPanTexTextureFilter_hxx
+#define otbScalarImageToPanTexTextureFilter_hxx
 
 #include "otbScalarImageToPanTexTextureFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index f6471ec1c5..e39d3b58ed 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -256,7 +256,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToTexturesFilter.txx"
+#include "otbScalarImageToTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
index 229dd4da1f..1057373d7b 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbScalarImageToTexturesFilter_txx
-#define otbScalarImageToTexturesFilter_txx
+#ifndef otbScalarImageToTexturesFilter_hxx
+#define otbScalarImageToTexturesFilter_hxx
 
 #include "otbScalarImageToTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
index a5bf535619..e072f34e78 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.h
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbTextureImageFunction.txx"
+# include "otbTextureImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.hxx b/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
index ea9fc35e4b..7c886cb65c 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTextureImageFunction_txx
-#define otbTextureImageFunction_txx
+#ifndef otbTextureImageFunction_hxx
+#define otbTextureImageFunction_hxx
 
 #include "otbTextureImageFunction.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index 47495938a1..ba29141bfb 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
index 8cc83055d0..de66fde4e0 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
-#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
index f51d0fd638..31ab012693 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
@@ -181,7 +181,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerDistanceImageFilter.txx"
+#include "otbKullbackLeiblerDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
index 3e5bdf3e57..e3f8730057 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKullbackLeiblerDistanceImageFilter_txx
-#define otbKullbackLeiblerDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerDistanceImageFilter_hxx
+#define otbKullbackLeiblerDistanceImageFilter_hxx
 
 #include "otbKullbackLeiblerDistanceImageFilter.h"
 #include <vector>
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
index ee680d2edd..b3afb8c382 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
@@ -198,7 +198,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerProfileImageFilter.txx"
+#include "otbKullbackLeiblerProfileImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
index 75fa419841..2539453c2e 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKullbackLeiblerProfileImageFilter_txx
-#define otbKullbackLeiblerProfileImageFilter_txx
+#ifndef otbKullbackLeiblerProfileImageFilter_hxx
+#define otbKullbackLeiblerProfileImageFilter_hxx
 
 #include <vector>
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index 209d6e8b17..a24d9bf8ff 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -163,7 +163,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerSupervizedDistanceImageFilter.txx"
+#include "otbKullbackLeiblerSupervizedDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
index 58c8485b23..58c169e892 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_txx
-#define otbKullbackLeiblerSupervizedDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_hxx
+#define otbKullbackLeiblerSupervizedDistanceImageFilter_hxx
 
 #include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index a89729f0ab..0f761cd775 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -179,7 +179,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultivariateAlterationDetectorImageFilter.txx"
+#include "otbMultivariateAlterationDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
index 6506c91cca..5caa2b0012 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultivariateAlterationDetectorImageFilter_txx
-#define otbMultivariateAlterationDetectorImageFilter_txx
+#ifndef otbMultivariateAlterationDetectorImageFilter_hxx
+#define otbMultivariateAlterationDetectorImageFilter_hxx
 
 #include "otbMultivariateAlterationDetectorImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
index 39d5f44fcd..97736c3193 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
@@ -74,7 +74,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReliefColormapFunctor.txx"
+#include "otbReliefColormapFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
index 673607d969..502703ebd3 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReliefColormapFunctor_txx
-#define otbReliefColormapFunctor_txx
+#ifndef otbReliefColormapFunctor_hxx
+#define otbReliefColormapFunctor_hxx
 
 #include "otbReliefColormapFunctor.h"
 
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
index 1282cda0b6..d71152df1c 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
@@ -171,7 +171,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarToRainbowRGBPixelFunctor.txx"
+#include "otbScalarToRainbowRGBPixelFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
index f31937ac5f..b21e4e2ae2 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbScalarToRainbowRGBPixelFunctor_txx
-#define otbScalarToRainbowRGBPixelFunctor_txx
+#ifndef otbScalarToRainbowRGBPixelFunctor_hxx
+#define otbScalarToRainbowRGBPixelFunctor_hxx
 
 #include "otbScalarToRainbowRGBPixelFunctor.h"
 
diff --git a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
index c735725382..89deb20644 100644
--- a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
+++ b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
@@ -138,7 +138,7 @@ private :
 }  // End namespace otb
   
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbApplyGainFilter.txx"
+#include "otbApplyGainFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx b/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
index 28bd851c0d..4036de756b 100644
--- a/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbApplyGainFilter_txx
-#define otbApplyGainFilter_txx
+#ifndef otbApplyGainFilter_hxx
+#define otbApplyGainFilter_hxx
 
 #include "otbApplyGainFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
index edd5167a9b..d8fe0d2c66 100644
--- a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
+++ b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
@@ -179,7 +179,7 @@ private :
 }  // End namespace otb
   
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCLHistogramEqualizationFilter.txx"
+#include "otbCLHistogramEqualizationFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
index f5cbebd96b..d2f945b140 100644
--- a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCLHistogramEqualizationFilter_txx
-#define otbCLHistogramEqualizationFilter_txx
+#ifndef otbCLHistogramEqualizationFilter_hxx
+#define otbCLHistogramEqualizationFilter_hxx
 
 #include "otbCLHistogramEqualizationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
index 5a4c088dbc..0dd3c07c99 100644
--- a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
+++ b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
@@ -122,7 +122,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComputeGainLutFilter.txx"
+#include "otbComputeGainLutFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
index ccf1b85752..2491a7a160 100644
--- a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComputeGainLutFilter_txx
-#define otbComputeGainLutFilter_txx
+#ifndef otbComputeGainLutFilter_hxx
+#define otbComputeGainLutFilter_hxx
 
 #include "otbComputeGainLutFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
index 2f54203b24..5068cae0ab 100644
--- a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
+++ b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
@@ -154,7 +154,7 @@ private:
 }  // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComputeHistoFilter.txx"
+#include "otbComputeHistoFilter.hxx"
 #endif
   
 #endif
diff --git a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
index c29b223c64..1360b66030 100644
--- a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComputeHistoFilter_txx
-#define otbComputeHistoFilter_txx
+#ifndef otbComputeHistoFilter_hxx
+#define otbComputeHistoFilter_hxx
 
 #include "otbComputeHistoFilter.h"
 
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
index f7c9c1206e..b664e67143 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConvolutionImageFilter.txx"
+#include "otbConvolutionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
index 95abd81275..09934d80b6 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConvolutionImageFilter_txx
-#define otbConvolutionImageFilter_txx
+#ifndef otbConvolutionImageFilter_hxx
+#define otbConvolutionImageFilter_hxx
 #include "otbConvolutionImageFilter.h"
 
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
index edd770eb4b..546ba8229a 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
@@ -149,7 +149,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaborFilterGenerator.txx"
+#include "otbGaborFilterGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
index 8e22f2fa6d..03cea48f91 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaborFilterGenerator_txx
-#define otbGaborFilterGenerator_txx
+#ifndef otbGaborFilterGenerator_hxx
+#define otbGaborFilterGenerator_hxx
 
 #include "otbGaborFilterGenerator.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
index d806a1782b..4c51f8c72d 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
@@ -179,7 +179,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOverlapSaveConvolutionImageFilter.txx"
+#include "otbOverlapSaveConvolutionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
index cf17fc776a..0c2ce7774d 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOverlapSaveConvolutionImageFilter_txx
-#define otbOverlapSaveConvolutionImageFilter_txx
+#ifndef otbOverlapSaveConvolutionImageFilter_hxx
+#define otbOverlapSaveConvolutionImageFilter_hxx
 
 #include "itkConfigure.h"
 
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
index 110850719e..7778236afb 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
@@ -165,7 +165,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDEMCaracteristicsExtractor.txx"
+#include "otbDEMCaracteristicsExtractor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
index a8fd3e49f2..227381aff1 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDEMCaracteristicsExtractor_txx
-#define otbDEMCaracteristicsExtractor_txx
+#ifndef otbDEMCaracteristicsExtractor_hxx
+#define otbDEMCaracteristicsExtractor_hxx
 
 #include "otbDEMCaracteristicsExtractor.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
index 7b9866c51c..3f6d97d971 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
@@ -201,7 +201,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDEMToImageGenerator.txx"
+#include "otbDEMToImageGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
index 140fd20416..87f197cca9 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDEMToImageGenerator_txx
-#define otbDEMToImageGenerator_txx
+#ifndef otbDEMToImageGenerator_hxx
+#define otbDEMToImageGenerator_hxx
 
 #include "otbDEMToImageGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 5dd2c46622..83c7221863 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -105,7 +105,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionBinaryImageFilter.txx"
+#include "otbAngularProjectionBinaryImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
index bd4ee67c12..768f895475 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionBinaryImageFilter_txx
-#define otbAngularProjectionBinaryImageFilter_txx
+#ifndef otbAngularProjectionBinaryImageFilter_hxx
+#define otbAngularProjectionBinaryImageFilter_hxx
 #include "otbAngularProjectionBinaryImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index 4a8a4f906c..d253c2e342 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -108,7 +108,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionImageFilter.txx"
+#include "otbAngularProjectionImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
index bb9195c9c0..b4885472d4 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionImageFilter_txx
-#define otbAngularProjectionImageFilter_txx
+#ifndef otbAngularProjectionImageFilter_hxx
+#define otbAngularProjectionImageFilter_hxx
 #include "otbAngularProjectionImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
index 9a8bdd9e4f..de6eea92eb 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
@@ -142,7 +142,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionSetImageFilter.txx"
+#include "otbAngularProjectionSetImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
index 7bbda45c4f..126c38b4d4 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionSetImageFilter_txx
-#define otbAngularProjectionSetImageFilter_txx
+#ifndef otbAngularProjectionSetImageFilter_hxx
+#define otbAngularProjectionSetImageFilter_hxx
 #include "otbAngularProjectionSetImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index 54287e49af..a7be9ed88b 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -115,7 +115,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEstimateInnerProductPCAImageFilter.txx"
+#include "otbEstimateInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
index 3bf3fcdcf6..d02f8cc5a7 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEstimateInnerProductPCAImageFilter_txx
-#define otbEstimateInnerProductPCAImageFilter_txx
+#ifndef otbEstimateInnerProductPCAImageFilter_hxx
+#define otbEstimateInnerProductPCAImageFilter_hxx
 
 #include "otbEstimateInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
index 064032466a..0d037136fa 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
@@ -199,7 +199,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFastICAImageFilter.txx"
+#include "otbFastICAImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
index d0a793bb8c..e3c432eb25 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFastICAImageFilter_txx
-#define otbFastICAImageFilter_txx
+#ifndef otbFastICAImageFilter_hxx
+#define otbFastICAImageFilter_hxx
 
 #include "otbFastICAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
index 30be138c35..c49130b3e6 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -123,7 +123,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFastICAInternalOptimizerVectorImageFilter.txx"
+#include "otbFastICAInternalOptimizerVectorImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
index d27232d588..532e649979 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFastICAInternalOptimizerVectorImageFilter_txx
-#define otbFastICAInternalOptimizerVectorImageFilter_txx
+#ifndef otbFastICAInternalOptimizerVectorImageFilter_hxx
+#define otbFastICAInternalOptimizerVectorImageFilter_hxx
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 #include <itkMacro.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
index c0cdfd353c..59b921cb4e 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
@@ -167,7 +167,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInnerProductPCAImageFilter.txx"
+#include "otbInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
index 10f098ee6b..c54bc7f31e 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInnerProductPCAImageFilter_txx
-#define otbInnerProductPCAImageFilter_txx
+#ifndef otbInnerProductPCAImageFilter_hxx
+#define otbInnerProductPCAImageFilter_hxx
 
 #include "otbInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index 5fb0c7812a..189f853a3a 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -210,7 +210,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMNFImageFilter.txx"
+#include "otbMNFImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
index 5f6317bc24..e9a03578e6 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMNFImageFilter_txx
-#define otbMNFImageFilter_txx
+#ifndef otbMNFImageFilter_hxx
+#define otbMNFImageFilter_hxx
 #include "otbMNFImageFilter.h"
 
 #include "itkMacro.h"
@@ -500,6 +500,6 @@ MNFImageFilter< TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTransf
 
 } // end of namespace otb
 
-#endif // otbMNFImageFilter_txx
+#endif // otbMNFImageFilter_hxx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index d9fa6f3c72..7690839a57 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -168,7 +168,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaximumAutocorrelationFactorImageFilter.txx"
+#include "otbMaximumAutocorrelationFactorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
index 27bd86488b..ed6b2a476e 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaximumAutocorrelationFactorImageFilter_txx
-#define otbMaximumAutocorrelationFactorImageFilter_txx
+#ifndef otbMaximumAutocorrelationFactorImageFilter_hxx
+#define otbMaximumAutocorrelationFactorImageFilter_hxx
 
 #include "otbMaximumAutocorrelationFactorImageFilter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index 791d9cc993..77108d3568 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -98,7 +98,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNAPCAImageFilter.txx"
+#include "otbNAPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
index bedbf28d7e..b4edb9b649 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNAPCAImageFilter_txx
-#define otbNAPCAImageFilter_txx
+#ifndef otbNAPCAImageFilter_hxx
+#define otbNAPCAImageFilter_hxx
 #include "otbNAPCAImageFilter.h"
 
 #include "itkMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index ed2e9055c9..8634a8803c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -123,7 +123,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeInnerProductPCAImageFilter.txx"
+#include "otbNormalizeInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
index 4b3cb027f1..c3df8ebd49 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeInnerProductPCAImageFilter_txx
-#define otbNormalizeInnerProductPCAImageFilter_txx
+#ifndef otbNormalizeInnerProductPCAImageFilter_hxx
+#define otbNormalizeInnerProductPCAImageFilter_hxx
 
 #include "otbNormalizeInnerProductPCAImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
index 4b64ed6c90..93255c3d9c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
@@ -216,7 +216,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAImageFilter.txx"
+#include "otbPCAImageFilter.hxx"
 #endif
 
 #endif // otbPCAImageFilter_h
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
index 722630fb2b..1d645a225d 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPCAImageFilter_txx
-#define otbPCAImageFilter_txx
+#ifndef otbPCAImageFilter_hxx
+#define otbPCAImageFilter_hxx
 #include "otbPCAImageFilter.h"
 
 #include "itkMacro.h"
@@ -481,6 +481,6 @@ PCAImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
 
 } // end of namespace otb
 
-#endif // otbPCAImageFilter_txx
+#endif // otbPCAImageFilter_hxx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
index c419eb0937..b31ab79a0b 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
@@ -135,7 +135,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSparseWvltToAngleMapperListFilter.txx"
+#include "otbSparseWvltToAngleMapperListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
index 70a12f8d31..0c034e2487 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSparseWvltToAngleMapperListFilter_txx
-#define otbSparseWvltToAngleMapperListFilter_txx
+#ifndef otbSparseWvltToAngleMapperListFilter_hxx
+#define otbSparseWvltToAngleMapperListFilter_hxx
 #include "otbSparseWvltToAngleMapperListFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index be6ed177f3..4003d83c8f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -162,7 +162,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
index a451d910ef..a378f33566 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodImageFilter_txx
-#define otbBinaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index 716ddffc5f..43e809b825 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -151,7 +151,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodVectorImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
index d3c17f5dfc..106a270bb0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_txx
-#define otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
index 2bff0830a2..c8ed019138 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbBinaryImageDensityFunction.txx"
+# include "otbBinaryImageDensityFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
index 03df369721..1091d35337 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbBinaryImageDensityFunction_txx
-#define otbBinaryImageDensityFunction_txx
+#ifndef otbBinaryImageDensityFunction_hxx
+#define otbBinaryImageDensityFunction_hxx
 
 #include "otbBinaryImageDensityFunction.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
index d92770582b..fff4c75470 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryImageMinimalBoundingRegionCalculator.txx"
+#include "otbBinaryImageMinimalBoundingRegionCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
index 653edcdd6b..9599fdddaf 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryImageMinimalBoundingRegionCalculator_txx
-#define otbBinaryImageMinimalBoundingRegionCalculator_txx
+#ifndef otbBinaryImageMinimalBoundingRegionCalculator_hxx
+#define otbBinaryImageMinimalBoundingRegionCalculator_hxx
 
 #include "otbBinaryImageMinimalBoundingRegionCalculator.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index c4643f0fe9..284f373d33 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -102,7 +102,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryImageToDensityImageFilter.txx"
+#include "otbBinaryImageToDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
index b7dbfbdb51..fce404674a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryImageToDensityImageFilter_txx
-#define otbBinaryImageToDensityImageFilter_txx
+#ifndef otbBinaryImageToDensityImageFilter_hxx
+#define otbBinaryImageToDensityImageFilter_hxx
 
 #include "otbBinaryImageToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index 1bd82ea6dd..81b44f3a73 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -117,7 +117,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoxAndWhiskerImageFilter.txx"
+#include "otbBoxAndWhiskerImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
index adf2a01578..6329fc7cbc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoxAndWhiskerImageFilter_txx
-#define otbBoxAndWhiskerImageFilter_txx
+#ifndef otbBoxAndWhiskerImageFilter_hxx
+#define otbBoxAndWhiskerImageFilter_hxx
 
 #include <vector>
 #include <algorithm>
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
index 513067e457..0239a07224 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
@@ -86,7 +86,7 @@ private:
 } // End of namespace OTB
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbChangeInformationImageFilter.txx"
+#include "otbChangeInformationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
index c4453be608..f468a4c4c9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbChangeInformationImageFilter_txx
-#define otbChangeInformationImageFilter_txx
+#ifndef otbChangeInformationImageFilter_hxx
+#define otbChangeInformationImageFilter_hxx
 
 #include "otbChangeInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
index 61b28b9415..1ccd64c494 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbChangeLabelImageFilter.txx"
+#include "otbChangeLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
index f77931d96e..9e89f90a77 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbChangeLabelImageFilter_txx
-#define otbChangeLabelImageFilter_txx
+#ifndef otbChangeLabelImageFilter_hxx
+#define otbChangeLabelImageFilter_hxx
 
 #include "otbChangeLabelImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
index 478eb95222..ff96f83908 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClampImageFilter.txx"
+#include "otbClampImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
index b1ac37e2e3..e7c78d0ead 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbClampImageFilter_txx
-#define otbClampImageFilter_txx
+#ifndef otbClampImageFilter_hxx
+#define otbClampImageFilter_hxx
 
 #include "otbClampImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
index 2703b00568..57c3b7c3cf 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -145,7 +145,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClampVectorImageFilter.txx"
+#include "otbClampVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
index 6c8377af30..438df2397f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbClampVectorImageFilter_txx
-#define otbClampVectorImageFilter_txx
+#ifndef otbClampVectorImageFilter_hxx
+#define otbClampVectorImageFilter_hxx
 
 #include "otbClampVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
index 16fd357f76..4c3a747ab4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateScalarValueImageFilter.txx"
+#include "otbConcatenateScalarValueImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
index c248ff00de..07be0e4712 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateScalarValueImageFilter_txx
-#define otbConcatenateScalarValueImageFilter_txx
+#ifndef otbConcatenateScalarValueImageFilter_hxx
+#define otbConcatenateScalarValueImageFilter_hxx
 
 #include "otbConcatenateScalarValueImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index 4b3ca239f2..266e5689db 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -109,6 +109,6 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateVectorImageFilter.txx"
+#include "otbConcatenateVectorImageFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
index 868b1f82a7..6e7ae0596a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateVectorImageFilter_txx
-#define otbConcatenateVectorImageFilter_txx
+#ifndef otbConcatenateVectorImageFilter_hxx
+#define otbConcatenateVectorImageFilter_hxx
 
 #include "otbConcatenateVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
index 3fe2d4f77a..452027fe34 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
@@ -101,7 +101,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEuclideanDistanceMetricWithMissingValuePow2.txx"
+#include "otbEuclideanDistanceMetricWithMissingValuePow2.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
index 22e30334d5..053afd50a1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_txx
-#define otbEuclideanDistanceMetricWithMissingValuePow2_txx
+#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_hxx
+#define otbEuclideanDistanceMetricWithMissingValuePow2_hxx
 
 #include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
 #include "itkMeasurementVectorTraits.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
index 3a703c921a..b066bfb613 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
@@ -116,7 +116,7 @@ double FlexibleDistanceWithMissingValue<TVector>::Beta = 2.0;
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlexibleDistanceWithMissingValue.txx"
+#include "otbFlexibleDistanceWithMissingValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
index 530107c381..80649d8aba 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbFlexibleDistanceWithMissingValue_txx
-#define otbFlexibleDistanceWithMissingValue_txx
+#ifndef otbFlexibleDistanceWithMissingValue_hxx
+#define otbFlexibleDistanceWithMissingValue_hxx
 
 #include "otbFlexibleDistanceWithMissingValue.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 3491ffa706..e705815307 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -155,7 +155,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFunctionWithNeighborhoodToImageFilter.txx"
+#include "otbFunctionWithNeighborhoodToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
index fcf6697cb1..c273425f31 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFunctionWithNeighborhoodToImageFilter_txx
-#define otbFunctionWithNeighborhoodToImageFilter_txx
+#ifndef otbFunctionWithNeighborhoodToImageFilter_hxx
+#define otbFunctionWithNeighborhoodToImageFilter_hxx
 
 #include "otbFunctionWithNeighborhoodToImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
index 8acc6ecbf4..ad8cc78e00 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
@@ -216,7 +216,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGridResampleImageFilter.txx"
+#include "otbGridResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
index a8cad22025..df609b6a8c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGridResampleImageFilter_txx
-#define otbGridResampleImageFilter_txx
+#ifndef otbGridResampleImageFilter_hxx
+#define otbGridResampleImageFilter_hxx
 
 #include "otbGridResampleImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h b/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
index 5f63908f5d..c3ed65d650 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
@@ -128,7 +128,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskedIteratorDecorator.txx"
+#include "otbMaskedIteratorDecorator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
index db2bd2da37..8535271c43 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
@@ -145,7 +145,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMatrixImageFilter.txx"
+#include "otbMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
index f1be743978..2d5a0e20ca 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMatrixImageFilter_txx
-#define otbMatrixImageFilter_txx
+#ifndef otbMatrixImageFilter_hxx
+#define otbMatrixImageFilter_hxx
 
 #include "otbMatrixImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
index 5bd1a876c6..40b3149dd9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNRIBandImagesToOneNComplexBandsImage.txx"
+#include "otbNRIBandImagesToOneNComplexBandsImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
index b10623b27b..3dcfa2d4f1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNRIBandImagesToOneNComplexBandsImage_txx
-#define otbNRIBandImagesToOneNComplexBandsImage_txx
+#ifndef otbNRIBandImagesToOneNComplexBandsImage_hxx
+#define otbNRIBandImagesToOneNComplexBandsImage_hxx
 
 #include "otbNRIBandImagesToOneNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
index 07ee238693..5ce3c6994d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOneRIBandImageToOneComplexBandImage.txx"
+#include "otbOneRIBandImageToOneComplexBandImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
index fee16d1c71..648ed0eb75 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOneRIBandImageToOneComplexBandImage_txx
-#define otbOneRIBandImageToOneComplexBandImage_txx
+#ifndef otbOneRIBandImageToOneComplexBandImage_hxx
+#define otbOneRIBandImageToOneComplexBandImage_hxx
 
 #include "otbOneRIBandImageToOneComplexBandImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
index 10e25c7f38..899f681918 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
@@ -119,7 +119,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPerBandVectorImageFilter.txx"
+#include "otbPerBandVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
index d551fea721..d63c6e9cd0 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPerBandVectorImageFilter_txx
-#define otbPerBandVectorImageFilter_txx
+#ifndef otbPerBandVectorImageFilter_hxx
+#define otbPerBandVectorImageFilter_hxx
 
 #include "otbPerBandVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
index 346a34f2ff..127a162889 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
@@ -266,7 +266,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPrintableImageFilter.txx"
+#include "otbPrintableImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
index fb17ea44e7..1ecc701de4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPrintableImageFilter_txx
-#define otbPrintableImageFilter_txx
+#ifndef otbPrintableImageFilter_hxx
+#define otbPrintableImageFilter_hxx
 
 #include "otbPrintableImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
index 5924b31d00..ae74603e1f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
@@ -220,7 +220,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShiftScaleVectorImageFilter.txx"
+#include "otbShiftScaleVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
index 0f32bad762..97bb3c84bc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShiftScaleVectorImageFilter_txx
-#define otbShiftScaleVectorImageFilter_txx
+#ifndef otbShiftScaleVectorImageFilter_hxx
+#define otbShiftScaleVectorImageFilter_hxx
 
 #include "otbShiftScaleVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index 3efa48850e..c5d7e7ee4e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -111,7 +111,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralAngleDistanceImageFilter.txx"
+#include "otbSpectralAngleDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
index a3d3308042..138bc5caf6 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralAngleDistanceImageFilter_txx
-#define otbSpectralAngleDistanceImageFilter_txx
+#ifndef otbSpectralAngleDistanceImageFilter_hxx
+#define otbSpectralAngleDistanceImageFilter_hxx
 
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index 48eec84de7..a21d06af07 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -228,7 +228,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingInnerProductVectorImageFilter.txx"
+#include "otbStreamingInnerProductVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
index f3b0d7db69..6832e46636 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingInnerProductVectorImageFilter_txx
-#define otbStreamingInnerProductVectorImageFilter_txx
+#ifndef otbStreamingInnerProductVectorImageFilter_hxx
+#define otbStreamingInnerProductVectorImageFilter_hxx
 #include "otbStreamingInnerProductVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
index 6f03f9b757..1b16426c8f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -284,7 +284,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMatrixTransposeMatrixImageFilter.txx"
+#include "otbStreamingMatrixTransposeMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
index 80e2dafd50..1f4937692c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMatrixTransposeMatrixImageFilter_txx
-#define otbStreamingMatrixTransposeMatrixImageFilter_txx
+#ifndef otbStreamingMatrixTransposeMatrixImageFilter_hxx
+#define otbStreamingMatrixTransposeMatrixImageFilter_hxx
 
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
index 19c15d4e6c..58f3b90263 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -201,7 +201,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingResampleImageFilter.txx"
+#include "otbStreamingResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
index 003425a9e3..f02c31b010 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingResampleImageFilter_txx
-#define otbStreamingResampleImageFilter_txx
+#ifndef otbStreamingResampleImageFilter_hxx
+#define otbStreamingResampleImageFilter_hxx
 
 #include "otbStreamingResampleImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index 972c2efe6c..73bc7e7719 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -333,7 +333,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingShrinkImageFilter.txx"
+#include "otbStreamingShrinkImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
index 124f20e116..903dba1f18 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingShrinkImageFilter_txx
-#define otbStreamingShrinkImageFilter_txx
+#ifndef otbStreamingShrinkImageFilter_hxx
+#define otbStreamingShrinkImageFilter_hxx
 
 #include "otbStreamingShrinkImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
index 886e9bb811..19aea6ea50 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -134,7 +134,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbThresholdVectorImageFilter.txx"
+#include "otbThresholdVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
index e15671051c..5de3d80004 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbThresholdVectorImageFilter_txx
-#define otbThresholdVectorImageFilter_txx
+#ifndef otbThresholdVectorImageFilter_hxx
+#define otbThresholdVectorImageFilter_hxx
 
 #include "otbThresholdVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
index 5cd29f76ab..df01fbdbb1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -125,7 +125,7 @@ RegionType InputRegionToOutputRegion(unsigned int tileIndex, const RegionType &
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileImageFilter.txx"
+#include "otbTileImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
index 3a67aa469e..cb93986d56 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileImageFilter_txx
-#define otbTileImageFilter_txx
+#ifndef otbTileImageFilter_hxx
+#define otbTileImageFilter_hxx
 
 #include "otbTileImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
index 67a727f2aa..0d1b365925 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
@@ -90,7 +90,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTwoNRIBandsImageToNComplexBandsImage.txx"
+#include "otbTwoNRIBandsImageToNComplexBandsImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
index 032074b135..41422675eb 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTwoNRIBandsImageToNComplexBandsImage_txx
-#define otbTwoNRIBandsImageToNComplexBandsImage_txx
+#ifndef otbTwoNRIBandsImageToNComplexBandsImage_hxx
+#define otbTwoNRIBandsImageToNComplexBandsImage_hxx
 
 #include "otbTwoNRIBandsImageToNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index 811362868c..d54b63bb33 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -153,7 +153,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
index 872b89801d..0f5ab33e28 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodImageFilter_txx
-#define otbUnaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index c46e4ed2bc..03bb9e77cb 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -169,7 +169,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
index 52e9091042..bdd8309470 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
-#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index a6c5562dde..063b56ad00 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -140,7 +140,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorWithIndexImageFilter.txx"
+#include "otbUnaryFunctorWithIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
index 468da5f854..6dbe19ef5b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorWithIndexImageFilter_txx
-#define otbUnaryFunctorWithIndexImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexImageFilter_hxx
+#define otbUnaryFunctorWithIndexImageFilter_hxx
 
 #include "otbUnaryFunctorWithIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index f2519e2a59..803dba3832 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryImageFunctorWithVectorImageFilter.txx"
+#include "otbUnaryImageFunctorWithVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
index 2da18d31ef..56319cf93f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryImageFunctorWithVectorImageFilter_txx
-#define otbUnaryImageFunctorWithVectorImageFilter_txx
+#ifndef otbUnaryImageFunctorWithVectorImageFilter_hxx
+#define otbUnaryImageFunctorWithVectorImageFilter_hxx
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index 5f2bcc51f4..923dcb2428 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -96,7 +96,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageTo3DScalarImageFilter.txx"
+#include "otbVectorImageTo3DScalarImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
index 835c69de35..f2f9519975 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageTo3DScalarImageFilter_txx
-#define otbVectorImageTo3DScalarImageFilter_txx
+#ifndef otbVectorImageTo3DScalarImageFilter_hxx
+#define otbVectorImageTo3DScalarImageFilter_hxx
 
 #include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
index a8ac2d4d55..aec014512d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
@@ -294,7 +294,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorRescaleIntensityImageFilter.txx"
+#include "otbVectorRescaleIntensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
index fd477b0404..2fde9765ce 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorRescaleIntensityImageFilter_txx
-#define otbVectorRescaleIntensityImageFilter_txx
+#ifndef otbVectorRescaleIntensityImageFilter_hxx
+#define otbVectorRescaleIntensityImageFilter_hxx
 
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkSampleToHistogramFilter.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
index f92b1995aa..b06261f813 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -129,7 +129,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFrostImageFilter.txx"
+#include "otbFrostImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
index a20e20bf7c..ba9be08cf6 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFrostImageFilter_txx
-#define otbFrostImageFilter_txx
+#ifndef otbFrostImageFilter_hxx
+#define otbFrostImageFilter_hxx
 
 #include "otbFrostImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
index a8ff3d28f8..da49c1ff77 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGammaMAPImageFilter.txx"
+#include "otbGammaMAPImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
index fe8f34ad4f..9020b330da 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGammaMAPImageFilter_txx
-#define otbGammaMAPImageFilter_txx
+#ifndef otbGammaMAPImageFilter_hxx
+#define otbGammaMAPImageFilter_hxx
 
 #include "otbGammaMAPImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
index a5d6cfb738..d4a2f48468 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKuanImageFilter.txx"
+#include "otbKuanImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
index 0e4a1a06db..986673d4ea 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKuanImageFilter_txx
-#define otbKuanImageFilter_txx
+#ifndef otbKuanImageFilter_hxx
+#define otbKuanImageFilter_hxx
 
 #include "otbKuanImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index f46d13da44..96cb6ebb0e 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLeeImageFilter.txx"
+#include "otbLeeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
index fd1b764df9..d04bcd1d16 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLeeImageFilter_txx
-#define otbLeeImageFilter_txx
+#ifndef otbLeeImageFilter_hxx
+#define otbLeeImageFilter_hxx
 
 #include "otbLeeImageFilter.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
index fdba89c8dd..570c69b89c 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
@@ -157,7 +157,7 @@ private :
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandMathImageFilter.txx"
+#include "otbBandMathImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
index 919894cc95..03e95cae40 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandMathImageFilter_txx
-#define otbBandMathImageFilter_txx
+#ifndef otbBandMathImageFilter_hxx
+#define otbBandMathImageFilter_hxx
 #include "otbBandMathImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
index e2c9256319..2a7646c8a0 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
@@ -142,7 +142,7 @@ private:
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskMuParserFilter.txx"
+#include "otbMaskMuParserFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
index e079cf3890..76016aa7b3 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaskMuParserFilter_txx
-#define otbMaskMuParserFilter_txx
+#ifndef otbMaskMuParserFilter_hxx
+#define otbMaskMuParserFilter_hxx
 
 #include "otbMaskMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
index 7a3d09a24d..53af2d4e6b 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
@@ -127,7 +127,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskMuParserFunctor.txx"
+#include "otbMaskMuParserFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
index 843ace100c..06493dd5a3 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaskMuParserFunctor_txx
-#define otbMaskMuParserFunctor_txx
+#ifndef otbMaskMuParserFunctor_hxx
+#define otbMaskMuParserFunctor_hxx
 
 #include "otbMaskMuParserFunctor.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
index 19d01c5b66..6f246ab623 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
@@ -119,7 +119,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbParserConditionDataNodeFeatureFunction.txx"
+#include "otbParserConditionDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
index f50287189b..43b045b971 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbParserConditionDataNodeFeatureFunction_txx
-#define otbParserConditionDataNodeFeatureFunction_txx
+#ifndef otbParserConditionDataNodeFeatureFunction_hxx
+#define otbParserConditionDataNodeFeatureFunction_hxx
 
 #include "otbParserConditionDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
index a0ff07fbc8..a167750575 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
@@ -195,7 +195,7 @@ private :
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandMathXImageFilter.txx"
+#include "otbBandMathXImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
index 11da024a2b..7ffd792316 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandMathXImageFilter_txx
-#define otbBandMathXImageFilter_txx
+#ifndef otbBandMathXImageFilter_hxx
+#define otbBandMathXImageFilter_hxx
 #include "otbBandMathXImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
index 5a72c260d4..999e100c87 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
@@ -135,7 +135,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidAnalysisFilter.txx"
+#include "otbMorphologicalPyramidAnalysisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
index 4aa682c6e0..d2c37353d4 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidAnalysisFilter_txx
-#define otbMorphologicalPyramidAnalysisFilter_txx
+#ifndef otbMorphologicalPyramidAnalysisFilter_hxx
+#define otbMorphologicalPyramidAnalysisFilter_hxx
 
 #include "otbMorphologicalPyramidAnalysisFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 6aa85ba70b..6edbe1cd54 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -167,7 +167,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidMRToMSConverter.txx"
+#include "otbMorphologicalPyramidMRToMSConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
index 6fa0e2b0f3..18a91c2717 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidMRToMSConverter_txx
-#define otbMorphologicalPyramidMRToMSConverter_txx
+#ifndef otbMorphologicalPyramidMRToMSConverter_hxx
+#define otbMorphologicalPyramidMRToMSConverter_hxx
 
 #include "otbMorphologicalPyramidMRToMSConverter.h"
 #include "otbMorphologicalPyramidResampler.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
index f28d291f72..63f25cc1a5 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
@@ -98,7 +98,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidResampler.txx"
+#include "otbMorphologicalPyramidResampler.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
index b1fad675a3..34b06a3efd 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidResampler_txx
-#define otbMorphologicalPyramidResampler_txx
+#ifndef otbMorphologicalPyramidResampler_hxx
+#define otbMorphologicalPyramidResampler_hxx
 #include "otbMorphologicalPyramidResampler.h"
 #include "itkResampleImageFilter.h"
 #include "itkScalableAffineTransform.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
index 5312f55b0a..ab2ed3d1e3 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
@@ -159,7 +159,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSegmentationFilter.txx"
+#include "otbMorphologicalPyramidSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
index 4ab21bbb82..f88df62614 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSegmentationFilter_txx
-#define otbMorphologicalPyramidSegmentationFilter_txx
+#ifndef otbMorphologicalPyramidSegmentationFilter_hxx
+#define otbMorphologicalPyramidSegmentationFilter_hxx
 
 #include "otbMorphologicalPyramidSegmentationFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
index 5fe12ac1f5..97e9da6e0f 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
@@ -153,7 +153,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSegmenter.txx"
+#include "otbMorphologicalPyramidSegmenter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
index b49ed4f71d..39fe80b75d 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSegmenter_txx
-#define otbMorphologicalPyramidSegmenter_txx
+#ifndef otbMorphologicalPyramidSegmenter_hxx
+#define otbMorphologicalPyramidSegmenter_hxx
 
 #include "otbMorphologicalPyramidSegmenter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
index 3b83773a44..d83839f98b 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
@@ -138,7 +138,7 @@ protected:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSynthesisFilter.txx"
+#include "otbMorphologicalPyramidSynthesisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
index cc30b52dd3..457bf87a59 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSynthesisFilter_txx
-#define otbMorphologicalPyramidSynthesisFilter_txx
+#ifndef otbMorphologicalPyramidSynthesisFilter_hxx
+#define otbMorphologicalPyramidSynthesisFilter_hxx
 
 #include "otbMorphologicalPyramidSynthesisFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
index ce29df46dc..1d53bba8a0 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.h
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
@@ -87,7 +87,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCompacityPathFunction.txx"
+#include "otbCompacityPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx b/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
index ed5ed93467..22509246b3 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCompacityPathFunction_txx
-#define otbCompacityPathFunction_txx
+#ifndef otbCompacityPathFunction_hxx
+#define otbCompacityPathFunction_hxx
 
 #include "otbCompacityPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
index 567da4af39..99abaf8204 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.h
@@ -105,7 +105,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawPathFilter.txx"
+#include "otbDrawPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.hxx b/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
index 3b89464200..5162886847 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbDrawPathFilter_txx
-#define otbDrawPathFilter_txx
+#ifndef otbDrawPathFilter_hxx
+#define otbDrawPathFilter_hxx
 
 #include "otbDrawPathFilter.h"
 #include "otbDrawPathListFilter.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
index 5851f388b8..bce7b8ffae 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawPathListFilter.txx"
+#include "otbDrawPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx b/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
index 364d284cc2..c649e57370 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbDrawPathListFilter_txx
-#define otbDrawPathListFilter_txx
+#ifndef otbDrawPathListFilter_hxx
+#define otbDrawPathListFilter_hxx
 
 #include "otbDrawPathListFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
index bc0f8c7306..18b31663c4 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
@@ -115,7 +115,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFittingPolygonListFilter.txx"
+#include "otbImageFittingPolygonListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
index 2b7fa336c2..3bb795ebb9 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFittingPolygonListFilter_txx
-#define otbImageFittingPolygonListFilter_txx
+#ifndef otbImageFittingPolygonListFilter_hxx
+#define otbImageFittingPolygonListFilter_hxx
 
 #include "otbImageFittingPolygonListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
index 2a69f0d20c..8047a632ad 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToEdgePathFilter.txx"
+#include "otbImageToEdgePathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
index 839ca6baaa..069e52454c 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToEdgePathFilter_txx
-#define otbImageToEdgePathFilter_txx
+#ifndef otbImageToEdgePathFilter_hxx
+#define otbImageToEdgePathFilter_hxx
 
 #include "otbImageToEdgePathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index 8e09616793..55b01e668f 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathFilter.txx"
+#include "otbImageToPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.hxx b/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
index 40bd6ab6dc..404e811ac4 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPathFilter_txx
-#define otbImageToPathFilter_txx
+#ifndef otbImageToPathFilter_hxx
+#define otbImageToPathFilter_hxx
 
 #include "otbImageToPathFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index b42a23f6fc..ab0585a988 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathListFilter.txx"
+#include "otbImageToPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx b/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
index 21d3cfd9d6..ed9172d39a 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageToPathListFilter_txx
-#define otbImageToPathListFilter_txx
+#ifndef otbImageToPathListFilter_hxx
+#define otbImageToPathListFilter_hxx
 
 #include "otbImageToPathListFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
index c83caf6441..c020aea989 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.h
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
@@ -83,7 +83,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOrientationPathFunction.txx"
+#include "otbOrientationPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx b/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
index 5d0edb2657..c3224044f0 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOrientationPathFunction_txx
-#define otbOrientationPathFunction_txx
+#ifndef otbOrientationPathFunction_hxx
+#define otbOrientationPathFunction_hxx
 
 #include "otbOrientationPathFunction.h"
 #include "otbPathFunction.h"
diff --git a/Modules/Filtering/Path/include/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
index 2d9adf7b23..76f5a8a078 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.h
+++ b/Modules/Filtering/Path/include/otbPathFunction.h
@@ -94,7 +94,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPathFunction.txx"
+#include "otbPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathFunction.hxx b/Modules/Filtering/Path/include/otbPathFunction.hxx
index 739e2809b0..36bfaf26eb 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPathFunction_txx
-#define otbPathFunction_txx
+#ifndef otbPathFunction_hxx
+#define otbPathFunction_hxx
 
 #include "otbPathFunction.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
index df9f28e9cb..36147e4ef5 100644
--- a/Modules/Filtering/Path/include/otbPathListSource.h
+++ b/Modules/Filtering/Path/include/otbPathListSource.h
@@ -183,7 +183,7 @@ private:
 } // end namespace otb
 
 // #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbPathListSource.txx"
+// #include "otbPathListSource.hxx"
 // #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index e5f99af968..02aa723b32 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -133,7 +133,7 @@ private:
 } // end of namespace OTB
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPathListToHistogramGenerator.txx"
+#include "otbPathListToHistogramGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
index 32f6f0ae8f..de57dabc20 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbPathListToHistogramGenerator_txx
-#define otbPathListToHistogramGenerator_txx
+#ifndef otbPathListToHistogramGenerator_hxx
+#define otbPathListToHistogramGenerator_hxx
 
 #include "otbPathListToHistogramGenerator.h"
 
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
index 80e443aeac..f2008129ec 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
@@ -119,7 +119,7 @@ protected: //made protected so other iterators can access
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolyLineImageConstIterator.txx"
+#include "otbPolyLineImageConstIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
index f450b79ca9..0beaac96e6 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolyLineImageConstIterator_txx
-#define otbPolyLineImageConstIterator_txx
+#ifndef otbPolyLineImageConstIterator_hxx
+#define otbPolyLineImageConstIterator_hxx
 
 #include "otbPolyLineImageConstIterator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
index df0444b81e..03151a5058 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRegionImageToRectangularPathListFilter.txx"
+#include "otbRegionImageToRectangularPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
index abb678bebe..2b80dd220f 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
@@ -19,10 +19,10 @@
  */
 
 
-// Adapted from otbImageToPathListAlignFilter.txx
+// Adapted from otbImageToPathListAlignFilter.hxx
 
-#ifndef otbRegionImageToRectangularPathListFilter_txx
-#define otbRegionImageToRectangularPathListFilter_txx
+#ifndef otbRegionImageToRectangularPathListFilter_hxx
+#define otbRegionImageToRectangularPathListFilter_hxx
 
 #include <iostream>
 #include <exception>
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 1a9c4f650a..07b613193b 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -144,7 +144,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorizationPathListFilter.txx"
+#include "otbVectorizationPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
index 37ea20dc86..c40876431c 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorizationPathListFilter_txx
-#define otbVectorizationPathListFilter_txx
+#ifndef otbVectorizationPathListFilter_hxx
+#define otbVectorizationPathListFilter_hxx
 
 #include "otbVectorizationPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index 1cdc209f18..b60bdad793 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -229,7 +229,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiChannelsPolarimetricSynthesisFilter.txx"
+#include "otbMultiChannelsPolarimetricSynthesisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
index 923a07fadb..cf21df1e13 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiChannelsPolarimetricSynthesisFilter_txx
-#define otbMultiChannelsPolarimetricSynthesisFilter_txx
+#ifndef otbMultiChannelsPolarimetricSynthesisFilter_hxx
+#define otbMultiChannelsPolarimetricSynthesisFilter_hxx
 
 #include <complex>
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
index 3747ec0617..b4a12784ea 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinclairImageFilter.txx"
+#include "otbSinclairImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
index 3c43f0dd63..201ef1c0f6 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSinclairImageFilter_txx
-#define otbSinclairImageFilter_txx
+#ifndef otbSinclairImageFilter_hxx
+#define otbSinclairImageFilter_hxx
 
 #include "otbSinclairImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
index bd914e2327..1ccee11854 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinclairReciprocalImageFilter.txx"
+#include "otbSinclairReciprocalImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
index 2b31f8c3ea..37549c9692 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSinclairReciprocalImageFilter_txx
-#define otbSinclairReciprocalImageFilter_txx
+#ifndef otbSinclairReciprocalImageFilter_hxx
+#define otbSinclairReciprocalImageFilter_hxx
 
 #include "otbSinclairReciprocalImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
index 06d7ec3966..5264162a1a 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
@@ -72,7 +72,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEckert4MapProjection.txx"
+#include "otbEckert4MapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx b/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
index d3b6dedc56..df670921e9 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbEckert4MapProjection_txx
-#define otbEckert4MapProjection_txx
+#ifndef otbEckert4MapProjection_hxx
+#define otbEckert4MapProjection_hxx
 
 #include "otbEckert4MapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index 5a8a8f1995..aaeae07cf0 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -225,7 +225,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGCPsToRPCSensorModelImageFilter.txx"
+#include "otbGCPsToRPCSensorModelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
index 0285686096..fe6cfd470a 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGCPsToRPCSensorModelImageFilter_txx
-#define otbGCPsToRPCSensorModelImageFilter_txx
+#ifndef otbGCPsToRPCSensorModelImageFilter_hxx
+#define otbGCPsToRPCSensorModelImageFilter_hxx
 
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index bce96de255..79527bd439 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -306,7 +306,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRSResampleImageFilter.txx"
+#include "otbGenericRSResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
index 1743cdb354..f6e7159683 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRSResampleImageFilter_txx
-#define otbGenericRSResampleImageFilter_txx
+#ifndef otbGenericRSResampleImageFilter_hxx
+#define otbGenericRSResampleImageFilter_hxx
 
 #include "otbGenericRSResampleImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
index 2b387814a2..4591cd8864 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.h
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
@@ -100,7 +100,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbGeographicalDistance.txx"
+# include "otbGeographicalDistance.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx b/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
index feed9d68dc..2539ab69a7 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeographicalDistance_txx
-#define otbGeographicalDistance_txx
+#ifndef otbGeographicalDistance_hxx
+#define otbGeographicalDistance_hxx
 
 #include "otbGeographicalDistance.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
index 4229ae3771..61c6391437 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
@@ -295,7 +295,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeometriesProjectionFilter.txx"
+#include "otbGeometriesProjectionFilter.hxx"
 #endif
 
 #endif // otbGeometriesProjectionFilter_h
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
index 6a492cacdb..ea4854ef1d 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeometriesProjectionFilter_txx
-#define otbGeometriesProjectionFilter_txx
+#ifndef otbGeometriesProjectionFilter_hxx
+#define otbGeometriesProjectionFilter_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
index 220b9a0c38..3da0bb60a0 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbGroundSpacingImageFunction.txx"
+# include "otbGroundSpacingImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
index acc92106b5..0c7a2d85c4 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbGroundSpacingImageFunction_txx
-#define otbGroundSpacingImageFunction_txx
+#ifndef otbGroundSpacingImageFunction_hxx
+#define otbGroundSpacingImageFunction_hxx
 
 #include "otbMath.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index bf37333abd..8096b4410d 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToEnvelopeVectorDataFilter.txx"
+#include "otbImageToEnvelopeVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
index bbacb2321b..a783a51041 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToEnvelopeVectorDataFilter_txx
-#define otbImageToEnvelopeVectorDataFilter_txx
+#ifndef otbImageToEnvelopeVectorDataFilter_hxx
+#define otbImageToEnvelopeVectorDataFilter_hxx
 
 #include "otbImageToEnvelopeVectorDataFilter.h"
 #include "otbDataNode.h"
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 99200364b8..992905dff7 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -102,7 +102,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportGeoInformationImageFilter.txx"
+#include "otbImportGeoInformationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
index 35e9ba8682..4ce28e2664 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportGeoInformationImageFilter_txx
-#define otbImportGeoInformationImageFilter_txx
+#ifndef otbImportGeoInformationImageFilter_hxx
+#define otbImportGeoInformationImageFilter_hxx
 
 #include "otbImportGeoInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
index 526b194ab0..bc5f878650 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
@@ -74,7 +74,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLambertConformalConicMapProjection.txx"
+#include "otbLambertConformalConicMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
index 49df994bfb..5a0b1f46c3 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLambertConformalConicMapProjection_txx
-#define otbLambertConformalConicMapProjection_txx
+#ifndef otbLambertConformalConicMapProjection_hxx
+#define otbLambertConformalConicMapProjection_hxx
 
 #include "otbLambertConformalConicMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
index dc5fe37c44..33c317f5f6 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
@@ -170,7 +170,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLeastSquareAffineTransformEstimator.txx"
+#include "otbLeastSquareAffineTransformEstimator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
index 674c571a1b..f3b661612a 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLeastSquareAffineTransformEstimator_txx
-#define otbLeastSquareAffineTransformEstimator_txx
+#ifndef otbLeastSquareAffineTransformEstimator_hxx
+#define otbLeastSquareAffineTransformEstimator_hxx
 
 #include <vnl/algo/vnl_lsqr.h>
 #include <vnl/vnl_sparse_matrix_linear_system.h>
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
index b063d0fb3b..55e5b41c1e 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
@@ -70,7 +70,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMollweidMapProjection.txx"
+#include "otbMollweidMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx b/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
index c9899a9f11..4906e2fbeb 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMollweidMapProjection_txx
-#define otbMollweidMapProjection_txx
+#ifndef otbMollweidMapProjection_hxx
+#define otbMollweidMapProjection_hxx
 
 #include "otbMollweidMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
index 1226e36c85..6bc0420c65 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
@@ -111,7 +111,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOrthoRectificationFilter.txx"
+#include "otbOrthoRectificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
index f085c66b2a..b9031a68ff 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOrthoRectificationFilter_txx
-#define otbOrthoRectificationFilter_txx
+#ifndef otbOrthoRectificationFilter_hxx
+#define otbOrthoRectificationFilter_hxx
 
 #include "otbOrthoRectificationFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
index d6576c37bb..6c08c46b35 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
@@ -138,7 +138,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPhysicalToRPCSensorModelImageFilter.txx"
+#include "otbPhysicalToRPCSensorModelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
index 01c10488d0..53804f59ac 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPhysicalToRPCSensorModelImageFilter_txx
-#define otbPhysicalToRPCSensorModelImageFilter_txx
+#ifndef otbPhysicalToRPCSensorModelImageFilter_hxx
+#define otbPhysicalToRPCSensorModelImageFilter_hxx
 
 #include "otbPhysicalToRPCSensorModelImageFilter.h"
 #include "otbDEMHandler.h"
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
index ad7659d922..e568eb5b76 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
@@ -177,7 +177,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProjectiveProjectionImageFilter.txx"
+#include "otbProjectiveProjectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
index 8fd20c52a6..8335e3342a 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProjectiveProjectionImageFilter_txx
-#define otbProjectiveProjectionImageFilter_txx
+#ifndef otbProjectiveProjectionImageFilter_hxx
+#define otbProjectiveProjectionImageFilter_hxx
 
 #include "otbProjectiveProjectionImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
index 1c74b75a40..9709067ad2 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.h
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.h
@@ -100,7 +100,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbROIdataConversion.txx"
+#include "otbROIdataConversion.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.hxx b/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
index 5844bf660f..e6faf09306 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbROIdataConversion_txx
-#define otbROIdataConversion_txx
+#ifndef otbROIdataConversion_hxx
+#define otbROIdataConversion_hxx
 
 #include "itkVector.h"
 
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
index 8092cf1d36..d7173b1cf0 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
@@ -73,7 +73,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinusoidalMapProjection.txx"
+#include "otbSinusoidalMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
index 2f68bcae26..7115c1378d 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSinusoidalMapProjection_txx
-#define otbSinusoidalMapProjection_txx
+#ifndef otbSinusoidalMapProjection_hxx
+#define otbSinusoidalMapProjection_hxx
 
 #include "otbSinusoidalMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
index 0d4e8cc560..64748717b3 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.h
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.h
@@ -97,7 +97,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileMapTransform.txx"
+#include "otbTileMapTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.hxx b/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
index 19b241f64b..30f3a4ff05 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileMapTransform_txx
-#define otbTileMapTransform_txx
+#ifndef otbTileMapTransform_hxx
+#define otbTileMapTransform_hxx
 
 #include "otbTileMapTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
index b5b34be4a3..f5e1e5b1be 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
@@ -75,7 +75,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTransMercatorMapProjection.txx"
+#include "otbTransMercatorMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
index 3f46b6e51f..5dc92d2bc0 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTransMercatorMapProjection_txx
-#define otbTransMercatorMapProjection_txx
+#ifndef otbTransMercatorMapProjection_hxx
+#define otbTransMercatorMapProjection_hxx
 
 #include "otbTransMercatorMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
index c121faeb1f..25ed0b2d22 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
@@ -73,7 +73,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUtmMapProjection.txx"
+#include "otbUtmMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx b/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
index 46e20e6b88..f74d30b705 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbUtmMapProjection_txx
-#define otbUtmMapProjection_txx
+#ifndef otbUtmMapProjection_hxx
+#define otbUtmMapProjection_hxx
 
 #include "otbUtmMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index c36c1c0911..66806cf4ca 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -134,7 +134,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataIntoImageProjectionFilter.txx"
+#include "otbVectorDataIntoImageProjectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
index ccf2dc45ec..067342ec3c 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataIntoImageProjectionFilter_txx
-#define otbVectorDataIntoImageProjectionFilter_txx
+#ifndef otbVectorDataIntoImageProjectionFilter_hxx
+#define otbVectorDataIntoImageProjectionFilter_hxx
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
 #include "otb_boost_string_header.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
index 40efd1202d..3594ee5f3e 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
@@ -207,7 +207,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataProjectionFilter.txx"
+#include "otbVectorDataProjectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
index 1cc7ddc936..8af72d15f2 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataProjectionFilter_txx
-#define otbVectorDataProjectionFilter_txx
+#ifndef otbVectorDataProjectionFilter_hxx
+#define otbVectorDataProjectionFilter_hxx
 
 #include "otbVectorDataProjectionFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
index a82bed669a..02cd97b440 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbVectorDataTransformFilter.txx"
+#include "otbVectorDataTransformFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
index a134de82df..963def0c05 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataTransformFilter_txx
-#define otbVectorDataTransformFilter_txx
+#ifndef otbVectorDataTransformFilter_hxx
+#define otbVectorDataTransformFilter_hxx
 
 #include "otbVectorDataTransformFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
index 6dc0cfe79a..4ef154a0e4 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
@@ -682,7 +682,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftSmoothingImageFilter.txx"
+#include "otbMeanShiftSmoothingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
index efdf17c433..79078aaff2 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMeanShiftSmoothingImageFilter_txx
-#define otbMeanShiftSmoothingImageFilter_txx
+#ifndef otbMeanShiftSmoothingImageFilter_hxx
+#define otbMeanShiftSmoothingImageFilter_hxx
 
 #include "otbMeanShiftSmoothingImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
index 615ccc13f5..93ad5b31bf 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
@@ -82,7 +82,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateSampleListFilter.txx"
+#include "otbConcatenateSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
index f7c0d34da9..5228687806 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateSampleListFilter_txx
-#define otbConcatenateSampleListFilter_txx
+#ifndef otbConcatenateSampleListFilter_hxx
+#define otbConcatenateSampleListFilter_hxx
 
 #include "otbConcatenateSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
index d452a1318c..dccb083d44 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
@@ -162,7 +162,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbContinuousMinimumMaximumImageCalculator.txx"
+#include "otbContinuousMinimumMaximumImageCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
index 6a733e25c4..f613b02529 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbContinuousMinimumMaximumImageCalculator_txx
-#define otbContinuousMinimumMaximumImageCalculator_txx
+#ifndef otbContinuousMinimumMaximumImageCalculator_hxx
+#define otbContinuousMinimumMaximumImageCalculator_hxx
 
 #include "otbContinuousMinimumMaximumImageCalculator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
index cf6211bd95..ce61d1fdb7 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
@@ -115,7 +115,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaussianAdditiveNoiseSampleListFilter.txx"
+#include "otbGaussianAdditiveNoiseSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
index 0cfe7acd11..218db23713 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaussianAdditiveNoiseSampleListFilter_txx
-#define otbGaussianAdditiveNoiseSampleListFilter_txx
+#ifndef otbGaussianAdditiveNoiseSampleListFilter_hxx
+#define otbGaussianAdditiveNoiseSampleListFilter_hxx
 
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
index c2c04c9ea5..92c12d1b63 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
@@ -123,7 +123,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramStatisticsFunction.txx"
+#include "otbHistogramStatisticsFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
index f9af415242..d3cd3b3766 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbHistogramStatisticsFunction_txx
-#define otbHistogramStatisticsFunction_txx
+#ifndef otbHistogramStatisticsFunction_hxx
+#define otbHistogramStatisticsFunction_hxx
 
 #include "otbHistogramStatisticsFunction.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index f2542f3be5..bb3d0355dc 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -207,7 +207,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleGenerator.txx"
+#include "otbListSampleGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
index 7f17e073b1..1aa680e18e 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleGenerator_txx
-#define otbListSampleGenerator_txx
+#ifndef otbListSampleGenerator_hxx
+#define otbListSampleGenerator_hxx
 
 #include "otbListSampleGenerator.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
index 8beb507cf5..f11922a151 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.h
@@ -90,7 +90,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleSource.txx"
+#include "otbListSampleSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.hxx b/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
index e3b0e0a0bc..2f64f9d162 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleSource_txx
-#define otbListSampleSource_txx
+#ifndef otbListSampleSource_hxx
+#define otbListSampleSource_hxx
 
 #include "otbListSampleSource.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
index 42f9655894..e4bafc3b82 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
@@ -150,7 +150,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToBalancedListSampleFilter.txx"
+#include "otbListSampleToBalancedListSampleFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
index 19dc683975..099f7eb663 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToBalancedListSampleFilter_txx
-#define otbListSampleToBalancedListSampleFilter_txx
+#ifndef otbListSampleToBalancedListSampleFilter_hxx
+#define otbListSampleToBalancedListSampleFilter_hxx
 
 #include "otbListSampleToBalancedListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index f524aee705..e77ce05478 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -172,7 +172,7 @@ private:
 } // end of namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToHistogramListGenerator.txx"
+#include "otbListSampleToHistogramListGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
index 3d147197c0..66803564a2 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToHistogramListGenerator_txx
-#define otbListSampleToHistogramListGenerator_txx
+#ifndef otbListSampleToHistogramListGenerator_hxx
+#define otbListSampleToHistogramListGenerator_hxx
 
 #include "otbListSampleToHistogramListGenerator.h"
 #include "itkArray.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index e092656945..08b0358000 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -101,7 +101,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToListSampleFilter.txx"
+#include "otbListSampleToListSampleFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
index be6f811e3d..71f19ccc57 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToListSample_txx
-#define otbListSampleToListSample_txx
+#ifndef otbListSampleToListSample_hxx
+#define otbListSampleToListSample_hxx
 
 #include "otbListSampleToListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index 01bdb85060..6e5e6c7a39 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -129,7 +129,7 @@ private:
 } // end of namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToVariableDimensionHistogramGenerator.txx"
+#include "otbListSampleToVariableDimensionHistogramGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
index f7b5de355a..7a38bf846b 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToVariableDimensionHistogramGenerator_txx
-#define otbListSampleToVariableDimensionHistogramGenerator_txx
+#ifndef otbListSampleToVariableDimensionHistogramGenerator_hxx
+#define otbListSampleToVariableDimensionHistogramGenerator_hxx
 
 #include "otbListSampleToVariableDimensionHistogramGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
index 5348890e2e..a4be329775 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
@@ -145,7 +145,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHistogramImageFunction.txx"
+#include "otbLocalHistogramImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
index aedd9974d9..cdef25d6e0 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHistogramImageFunction_txx
-#define otbLocalHistogramImageFunction_txx
+#ifndef otbLocalHistogramImageFunction_hxx
+#define otbLocalHistogramImageFunction_hxx
 
 #include "otbLocalHistogramImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
index f75d244c61..462b80d70f 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
@@ -218,7 +218,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeVectorImageFilter.txx"
+#include "otbNormalizeVectorImageFilter.hxx"
 #endif
 
 #endif // otbNormalizeVectorImageFilter_h
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
index 858d26d299..f2534c4e22 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeVectorImageFilter_txx
-#define otbNormalizeVectorImageFilter_txx
+#ifndef otbNormalizeVectorImageFilter_hxx
+#define otbNormalizeVectorImageFilter_hxx
 #include "otbNormalizeVectorImageFilter.h"
 
 namespace otb
@@ -86,4 +86,4 @@ NormalizeVectorImageFilter< TInputImage, TOutputImage >
 
 } // end of namespace otb
 
-#endif // otbNormalizeVectorImageFilter_txx
+#endif // otbNormalizeVectorImageFilter_hxx
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
index 0770189120..3db7987dd7 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
@@ -109,7 +109,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShiftScaleSampleListFilter.txx"
+#include "otbShiftScaleSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
index 5a9f0bdc3a..0d25a6510b 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShiftScaleSampleListFilter_txx
-#define otbShiftScaleSampleListFilter_txx
+#ifndef otbShiftScaleSampleListFilter_hxx
+#define otbShiftScaleSampleListFilter_hxx
 
 #include "otbShiftScaleSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
index 42b72c1afa..6d42edd763 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
@@ -329,7 +329,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingCompareImageFilter.txx"
+#include "otbStreamingCompareImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
index 242e2d62fc..b67233a619 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingCompareImageFilter_txx
-#define otbStreamingCompareImageFilter_txx
+#ifndef otbStreamingCompareImageFilter_hxx
+#define otbStreamingCompareImageFilter_hxx
 #include "otbStreamingCompareImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index a258628abe..afc84acc3e 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingHistogramVectorImageFilter.txx"
+#include "otbStreamingHistogramVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
index 6068616df3..c0f8cfa3e8 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingHistogramVectorImageFilter_txx
-#define otbStreamingHistogramVectorImageFilter_txx
+#ifndef otbStreamingHistogramVectorImageFilter_hxx
+#define otbStreamingHistogramVectorImageFilter_hxx
 #include "otbStreamingHistogramVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index 7058c1911c..c1e82d30bf 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -290,7 +290,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMinMaxImageFilter.txx"
+#include "otbStreamingMinMaxImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
index 0dbabd3c0c..295fe273d3 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMinMaxImageFilter_txx
-#define otbStreamingMinMaxImageFilter_txx
+#ifndef otbStreamingMinMaxImageFilter_hxx
+#define otbStreamingMinMaxImageFilter_hxx
 #include "otbStreamingMinMaxImageFilter.h"
 
 #include <algorithm>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index d9c5c97b91..1019bfcccd 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMinMaxVectorImageFilter.txx"
+#include "otbStreamingMinMaxVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
index 5ea28dc66c..155a5e20b6 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMinMaxVectorImageFilter_txx
-#define otbStreamingMinMaxVectorImageFilter_txx
+#ifndef otbStreamingMinMaxVectorImageFilter_hxx
+#define otbStreamingMinMaxVectorImageFilter_hxx
 #include "otbStreamingMinMaxVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index 69a4d83d93..e73d6a68c3 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -368,7 +368,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsImageFilter.txx"
+#include "otbStreamingStatisticsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
index 0c6e758c9c..b6018ac992 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsImageFilter_txx
-#define otbStreamingStatisticsImageFilter_txx
+#ifndef otbStreamingStatisticsImageFilter_hxx
+#define otbStreamingStatisticsImageFilter_hxx
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index 6ce9ed2be7..94ccf482b4 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -268,7 +268,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsMapFromLabelImageFilter.txx"
+#include "otbStreamingStatisticsMapFromLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
index dcff0ee176..97865c94f9 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsMapFromLabelImageFilter_txx
-#define otbStreamingStatisticsMapFromLabelImageFilter_txx
+#ifndef otbStreamingStatisticsMapFromLabelImageFilter_hxx
+#define otbStreamingStatisticsMapFromLabelImageFilter_hxx
 #include "otbStreamingStatisticsMapFromLabelImageFilter.h"
 
 #include "itkInputDataObjectIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index 7ba64bbcbf..0543969cac 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -504,7 +504,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsVectorImageFilter.txx"
+#include "otbStreamingStatisticsVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
index c721aa0a9b..a4ec6ff0f9 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsVectorImageFilter_txx
-#define otbStreamingStatisticsVectorImageFilter_txx
+#ifndef otbStreamingStatisticsVectorImageFilter_hxx
+#define otbStreamingStatisticsVectorImageFilter_hxx
 #include "otbStreamingStatisticsVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
index fcf638c2d6..b3efc4a92f 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVarianceImageFilter.txx"
+#include "otbVarianceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
index bb357ccf9e..df639aa378 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVarianceImageFilter_txx
-#define otbVarianceImageFilter_txx
+#ifndef otbVarianceImageFilter_hxx
+#define otbVarianceImageFilter_hxx
 
 #include "otbVarianceImageFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
index ac89d754c3..9b01d0efc2 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -102,7 +102,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToIntensityImageFilter.txx"
+#include "otbVectorImageToIntensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
index 4ae2791572..d60596cdf7 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToIntensityImageFilter_txx
-#define otbVectorImageToIntensityImageFilter_txx
+#ifndef otbVectorImageToIntensityImageFilter_hxx
+#define otbVectorImageToIntensityImageFilter_hxx
 
 #include "otbVectorImageToIntensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index 939a8bced6..d6a72a52d7 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -207,7 +207,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToMatrixImageFilter.txx"
+#include "otbVectorImageToMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
index 0bd8d0e466..c62146286a 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToMatrixFilter_txx
-#define otbVectorImageToMatrixFilter_txx
+#ifndef otbVectorImageToMatrixFilter_hxx
+#define otbVectorImageToMatrixFilter_hxx
 #include "otbVectorImageToMatrixImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index 0f073805ed..ed710abd82 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateVectorDataFilter.txx"
+#include "otbConcatenateVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
index 54c87548ad..80b5372ffb 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateVectorDataFilter_txx
-#define otbConcatenateVectorDataFilter_txx
+#ifndef otbConcatenateVectorDataFilter_hxx
+#define otbConcatenateVectorDataFilter_hxx
 
 #include "otbConcatenateVectorDataFilter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
index 7266d7efcc..95593c9010 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
@@ -100,7 +100,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDBOverlapDataNodeFeatureFunction.txx"
+#include "otbDBOverlapDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
index 7bef4449b5..424f50a3da 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDBOverlapDataNodeFeatureFunction_txx
-#define otbDBOverlapDataNodeFeatureFunction_txx
+#ifndef otbDBOverlapDataNodeFeatureFunction_hxx
+#define otbDBOverlapDataNodeFeatureFunction_hxx
 
 #include "otbDBOverlapDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index 95f95e3f42..9f4ab226b0 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -158,7 +158,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx"
+#include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
index 11a0b1c4c2..ea5bae9245 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
-#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
+#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_hxx
+#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_hxx
 
 #include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
index 08a8a4a520..155fa0ea7a 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
@@ -129,7 +129,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralAngleDataNodeFeatureFunction.txx"
+#include "otbSpectralAngleDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
index 3b5e219258..a155f52b63 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralAngleDataNodeFeatureFunction_txx
-#define otbSpectralAngleDataNodeFeatureFunction_txx
+#ifndef otbSpectralAngleDataNodeFeatureFunction_hxx
+#define otbSpectralAngleDataNodeFeatureFunction_hxx
 
 #include "otbSpectralAngleDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
index 6e403dcd7c..4819475cf2 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
@@ -94,7 +94,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataAdapter.txx"
+#include "otbVectorDataAdapter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
index afa9e25677..b939a4bfd4 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataAdapterFilter_txx
-#define otbVectorDataAdapterFilter_txx
+#ifndef otbVectorDataAdapterFilter_hxx
+#define otbVectorDataAdapterFilter_hxx
 
 #include "otbVectorDataAdapter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 390c08fe7a..6dc61e0fa9 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -150,7 +150,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataExtractROI.txx"
+#include "otbVectorDataExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
index 4a807233d9..e7f98fb8ef 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataExtractROI_txx
-#define otbVectorDataExtractROI_txx
+#ifndef otbVectorDataExtractROI_hxx
+#define otbVectorDataExtractROI_hxx
 
 #include "otbVectorDataExtractROI.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index ad9baa500a..ec346bbbc5 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRandomLineGenerator.txx"
+#include "otbVectorDataToRandomLineGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
index d7e5bea878..dba6c8300f 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRandomLineGenerator_txx
-#define otbVectorDataToRandomLineGenerator_txx
+#ifndef otbVectorDataToRandomLineGenerator_hxx
+#define otbVectorDataToRandomLineGenerator_hxx
 
 #include "otbVectorDataToRandomLineGenerator.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
index a360d58fdc..2adfd3e610 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToSpecificDescriptionFilterBase.txx"
+#include "otbVectorDataToSpecificDescriptionFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
index 08fc1bdae0..e8f38cb490 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToSpecificDescriptionFilterBase_txx
-#define otbVectorDataToSpecificDescriptionFilterBase_txx
+#ifndef otbVectorDataToSpecificDescriptionFilterBase_hxx
+#define otbVectorDataToSpecificDescriptionFilterBase_hxx
 
 #include "otbVectorDataToSpecificDescriptionFilterBase.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 43c68b43d2..8719233422 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -131,7 +131,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToVectorDataFilter.txx"
+#include "otbVectorDataToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
index 8d8f881e1a..57edc6e307 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToVectorDataFilter_txx
-#define otbVectorDataToVectorDataFilter_txx
+#ifndef otbVectorDataToVectorDataFilter_hxx
+#define otbVectorDataToVectorDataFilter_hxx
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index ff523bfd70..e2633ffecd 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -260,7 +260,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToMapFilter.txx"
+#include "otbVectorDataToMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
index 24e660e535..f6a9274ece 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataToMapFilter_txx
-#define otbVectorDataToMapFilter_txx
+#ifndef otbVectorDataToMapFilter_hxx
+#define otbVectorDataToMapFilter_hxx
 
 #include <sstream>
 #include "otbVectorDataToMapFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index 3dfb27421a..1e91d331e6 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -142,7 +142,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubsampleImageFilter.txx"
+#include "otbSubsampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
index 57a9bfa971..07c4c9d4e7 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSubsampleImageFilter_txx
-#define otbSubsampleImageFilter_txx
+#ifndef otbSubsampleImageFilter_hxx
+#define otbSubsampleImageFilter_hxx
 #include "otbSubsampleImageFilter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
index cb0d78d25a..2cad91ac0e 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -492,7 +492,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletFilterBank.txx"
+#include "otbWaveletFilterBank.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
index 5dcf3cfb46..974a4c4dbd 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletFilterBank_txx
-#define otbWaveletFilterBank_txx
+#ifndef otbWaveletFilterBank_hxx
+#define otbWaveletFilterBank_hxx
 #include "otbWaveletFilterBank.h"
 
 #include "otbSubsampleImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
index d2efb9a66b..8ece032e86 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
@@ -110,7 +110,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletImageFilter.txx"
+#include "otbWaveletImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
index 4f932121aa..d3f4178a7d 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbWaveletImageFilter_txx
-#define otbWaveletImageFilter_txx
+#ifndef otbWaveletImageFilter_hxx
+#define otbWaveletImageFilter_hxx
 
 #include "otbWaveletImageFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
index fe16b95e83..92195efd51 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
@@ -111,7 +111,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletInverseImageFilter.txx"
+#include "otbWaveletInverseImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
index 1bdc41c280..a604de01ba 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __otbWaveletInverseImageFilter_txx
-#define __otbWaveletInverseImageFilter_txx
+#ifndef __otbWaveletInverseImageFilter_hxx
+#define __otbWaveletInverseImageFilter_hxx
 
 #include "otbWaveletInverseImageFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
index c8e1d21ede..9c682d8577 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
@@ -276,7 +276,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletOperatorBase.txx"
+#include "otbWaveletOperatorBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
index 171f06f89a..0b6887527f 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletOperatorBase_txx
-#define otbWaveletOperatorBase_txx
+#ifndef otbWaveletOperatorBase_hxx
+#define otbWaveletOperatorBase_hxx
 
 #include "otbWaveletOperatorBase.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
index 4efc0a1286..1ef0fbaa64 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
@@ -369,7 +369,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletPacketTransform.txx"
+#include "otbWaveletPacketTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
index 168b76b5c6..d23c3edfa3 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletPacketTransform_txx
-#define otbWaveletPacketTransform_txx
+#ifndef otbWaveletPacketTransform_hxx
+#define otbWaveletPacketTransform_hxx
 #include "otbWaveletPacketTransform.h"
 #include "otbMacro.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
index 4a0a43f8d5..414aaa7cb9 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
@@ -343,7 +343,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletTransform.txx"
+#include "otbWaveletTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx b/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
index 73a09bc585..91ca10fe62 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletTransform_txx
-#define otbWaveletTransform_txx
+#ifndef otbWaveletTransform_hxx
+#define otbWaveletTransform_hxx
 #include "otbWaveletTransform.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index 6dd659a202..4a7434b2c4 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
@@ -100,7 +100,7 @@ private:
 };
 }// End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.txx"
+#include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
index 8cf40c2176..65b7072c3f 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWaveletsBandsListToWaveletsSynopsisImageFilter_txx
-#define otbWaveletsBandsListToWaveletsSynopsisImageFilter_txx
+#ifndef otbWaveletsBandsListToWaveletsSynopsisImageFilter_hxx
+#define otbWaveletsBandsListToWaveletsSynopsisImageFilter_hxx
 
 #include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
index 2fbd4143c4..b4be523431 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
@@ -119,7 +119,7 @@ private:
 };
 }// End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.txx"
+#include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
index b74d69e611..5089f4964a 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWaveletsSynopsisImageToWaveletsBandsListFilter_txx
-#define otbWaveletsSynopsisImageToWaveletsBandsListFilter_txx
+#ifndef otbWaveletsSynopsisImageToWaveletsBandsListFilter_hxx
+#define otbWaveletsSynopsisImageToWaveletsBandsListFilter_hxx
 
 #include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
index 47b35814cc..4d817eda57 100644
--- a/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
+++ b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
@@ -62,7 +62,7 @@ WaveletGenerator<TMotherWaveletOperator>
 {
   std::ostringstream msg;
   msg << "The mother wavelet ID " << TMotherWaveletOperator;
-  msg << " is unknown or has to be implemented (check the txx file)...\n";
+  msg << " is unknown or has to be implemented (check the hxx file)...\n";
   throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
 }
 
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
index 8ff9ae486c..2aebe3b07b 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFuzzyVariable.txx"
+#include "otbFuzzyVariable.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
index e54d8ccbfb..baac16cbc0 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFuzzyVariable_txx
-#define otbFuzzyVariable_txx
+#ifndef otbFuzzyVariable_hxx
+#define otbFuzzyVariable_hxx
 
 
 #include "otbFuzzyVariable.h"
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index fb885033c5..ce195333fb 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -220,7 +220,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbNeighborhoodMajorityVotingImageFilter.txx"
+#include "otbNeighborhoodMajorityVotingImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
index 3428d360e2..992174a5a3 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeighborhoodMajorityVotingImageFilter_txx
-#define otbNeighborhoodMajorityVotingImageFilter_txx
+#ifndef otbNeighborhoodMajorityVotingImageFilter_hxx
+#define otbNeighborhoodMajorityVotingImageFilter_hxx
 
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
index c57b46d568..eb0b4a6389 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
@@ -326,7 +326,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBayesianFusionFilter.txx"
+#include "otbBayesianFusionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
index 242e30afd1..e87c8d8223 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBayesianFusionFilter_txx
-#define otbBayesianFusionFilter_txx
+#ifndef otbBayesianFusionFilter_hxx
+#define otbBayesianFusionFilter_hxx
 
 #include "otbBayesianFusionFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index df34eeadeb..02b5f0a548 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -265,7 +265,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLmvmPanSharpeningFusionImageFilter.txx"
+#include "otbLmvmPanSharpeningFusionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
index 11aadef45a..eb3e63c1ca 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLmvmPanSharpeningFusionImageFilter_txx
-#define otbLmvmPanSharpeningFusionImageFilter_txx
+#ifndef otbLmvmPanSharpeningFusionImageFilter_hxx
+#define otbLmvmPanSharpeningFusionImageFilter_hxx
 
 #include "otbLmvmPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 2808c721eb..7256c1e689 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -272,7 +272,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSimpleRcsPanSharpeningFusionImageFilter.txx"
+#include "otbSimpleRcsPanSharpeningFusionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
index 6218dd0d3a..e8a5c642fe 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_txx
-#define otbSimpleRcsPanSharpeningFusionImageFilter_txx
+#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_hxx
+#define otbSimpleRcsPanSharpeningFusionImageFilter_hxx
 
 #include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
index 119d46ae5a..7e12e957f7 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalRxDetectorFilter.txx"
+#include "otbLocalRxDetectorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
index 2e7aec6ae4..6ee6f07d17 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLocalRxDetectorFilter_txx
-#define otbLocalRxDetectorFilter_txx
+#ifndef otbLocalRxDetectorFilter_hxx
+#define otbLocalRxDetectorFilter_hxx
 
 #include "otbLocalRxDetectorFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
index fb7ca0da7e..6e01dec46b 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalRxDetectorNonThreadFilter.txx"
+#include "otbLocalRxDetectorNonThreadFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
index 8f306108d1..876cfe2cd2 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLocalRxDetectorNonThreadFilter_txx
-#define otbLocalRxDetectorNonThreadFilter_txx
+#ifndef otbLocalRxDetectorNonThreadFilter_hxx
+#define otbLocalRxDetectorNonThreadFilter_hxx
 
 #include "otbLocalRxDetectorNonThreadFilter.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
index 4165c416de..7da8b60d10 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
@@ -124,7 +124,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEigenvalueLikelihoodMaximisation.txx"
+#include "otbEigenvalueLikelihoodMaximisation.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
index a07479154e..205f99aa3f 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEigenvalueLikelihoodMaximisation_txx
-#define otbEigenvalueLikelihoodMaximisation_txx
+#ifndef otbEigenvalueLikelihoodMaximisation_hxx
+#define otbEigenvalueLikelihoodMaximisation_hxx
 
 #include "otbEigenvalueLikelihoodMaximisation.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index c64de134eb..b67a2ddc16 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -135,6 +135,6 @@ private:
 
 } // end namesapce otb
 
-#include "otbVcaImageFilter.txx"
+#include "otbVcaImageFilter.hxx"
 
 #endif /* otbVCAImageFilter_h */
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
index 014ff8e7ee..6ff8dad735 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVCAImageFilter_txx
-#define otbVCAImageFilter_txx
+#ifndef otbVCAImageFilter_hxx
+#define otbVCAImageFilter_hxx
 
 #include "otbVcaImageFilter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
index 410c093a66..0b5ee0d8ca 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
@@ -137,7 +137,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVirtualDimensionality.txx"
+#include "otbVirtualDimensionality.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
index 60735b5b2f..2f8fefab89 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVirtualDimensionality_txx
-#define otbVirtualDimensionality_txx
+#ifndef otbVirtualDimensionality_hxx
+#define otbVirtualDimensionality_hxx
 
 #include "otbVirtualDimensionality.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
index 1b8801a8b4..42b353b63d 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
@@ -184,7 +184,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbISRAUnmixingImageFilter.txx"
+#include "otbISRAUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
index e49c9f32c1..58286f5525 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbISRAUnmixingImageFilter_txx
-#define otbISRAUnmixingImageFilter_txx
+#ifndef otbISRAUnmixingImageFilter_hxx
+#define otbISRAUnmixingImageFilter_hxx
 
 #include "otbISRAUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
index 2c84a4164a..64fdd0bbbe 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMDMDNMFImageFilter.txx"
+#include "otbMDMDNMFImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
index 3b8f50266f..600400947c 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMDMDNMFImageFilter_txx
-#define otbMDMDNMFImageFilter_txx
+#ifndef otbMDMDNMFImageFilter_hxx
+#define otbMDMDNMFImageFilter_hxx
 
 #include "otbMDMDNMFImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
index 8121661932..0ee01c7e60 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
@@ -187,7 +187,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCLSUnmixingImageFilter.txx"
+#include "otbNCLSUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
index 9dc135b225..434985e751 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCLSUnmixingImageFilter_txx
-#define otbNCLSUnmixingImageFilter_txx
+#ifndef otbNCLSUnmixingImageFilter_hxx
+#define otbNCLSUnmixingImageFilter_hxx
 
 #include "otbNCLSUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
index 848641c3e0..752c248b71 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
@@ -183,7 +183,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSparseUnmixingImageFilter.txx"
+#include "otbSparseUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
index 150725421e..1f854e11ab 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSparseUnmixingImageFilter_txx
-#define otbSparseUnmixingImageFilter_txx
+#ifndef otbSparseUnmixingImageFilter_hxx
+#define otbSparseUnmixingImageFilter_hxx
 
 #include "otbSparseUnmixingImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
index d25c5c4fb9..1e5efd0c03 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
@@ -188,7 +188,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnConstrainedLeastSquareImageFilter.txx"
+#include "otbUnConstrainedLeastSquareImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
index 1833ec2537..1d309139a3 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnConstrainedLeastSquareImageFilter_txx
-#define otbUnConstrainedLeastSquareImageFilter_txx
+#ifndef otbUnConstrainedLeastSquareImageFilter_hxx
+#define otbUnConstrainedLeastSquareImageFilter_hxx
 
 #include "otbUnConstrainedLeastSquareImageFilter.h"
 
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index 99bf42ad87..5b4de355d0 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -100,7 +100,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToOSMVectorDataGenerator.txx"
+#include "otbImageToOSMVectorDataGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
index 69952eedc8..280af84ccc 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToOSMVectorDataGenerator_txx
-#define otbImageToOSMVectorDataGenerator_txx
+#ifndef otbImageToOSMVectorDataGenerator_hxx
+#define otbImageToOSMVectorDataGenerator_hxx
 
 #include "otbImageToOSMVectorDataGenerator.h"
 #include "otbGeoInformationConversion.h"
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index a2e2d7e0d1..c4458de059 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -240,7 +240,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMapFileProductWriter.txx"
+#include "otbMapFileProductWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
index 8bc2c3c942..ffe3b65e4a 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMapFileProductWriter_txx
-#define otbMapFileProductWriter_txx
+#ifndef otbMapFileProductWriter_hxx
+#define otbMapFileProductWriter_hxx
 
 #include "otbMapFileProductWriter.h"
 #include "itksys/SystemTools.hxx"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
index 3dede58828..dc518668fa 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
@@ -112,7 +112,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsXMLFileReader.txx"
+#include "otbStatisticsXMLFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
index 186ab47bd1..147b838568 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsXMLFileReader_txx
-#define otbStatisticsXMLFileReader_txx
+#ifndef otbStatisticsXMLFileReader_hxx
+#define otbStatisticsXMLFileReader_hxx
 
 #include "otbStatisticsXMLFileReader.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
index 594f55283b..596dd41e17 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
@@ -108,7 +108,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsXMLFileWriter.txx"
+#include "otbStatisticsXMLFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
index 0d6e659374..332bf2fe57 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsXMLFileWriter_txx
-#define otbStatisticsXMLFileWriter_txx
+#ifndef otbStatisticsXMLFileWriter_hxx
+#define otbStatisticsXMLFileWriter_hxx
 
 #include "otbStatisticsXMLFileWriter.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index f136a6bec8..b3414c0895 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -212,7 +212,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFileReader.txx"
+#include "otbImageFileReader.hxx"
 #endif
 
 #endif // otbImageFileReader_h
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
index 5ed852539b..da9350ff6e 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFileReader_txx
-#define otbImageFileReader_txx
+#ifndef otbImageFileReader_hxx
+#define otbImageFileReader_hxx
 
 #include "otbImageFileReader.h"
 #include "otbConfigure.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index 7313b074b6..2828234eda 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -287,7 +287,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFileWriter.txx"
+#include "otbImageFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
index 2a2a325555..c3cb72d50a 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFileWriter_txx
-#define otbImageFileWriter_txx
+#ifndef otbImageFileWriter_hxx
+#define otbImageFileWriter_hxx
 
 #include "otbImageFileWriter.h"
 #include "itkImageFileWriter.h"
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
index d31a890d68..e5fcbbead2 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
@@ -470,7 +470,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSeriesFileReader.txx"
+#include "otbImageSeriesFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
index 03c153a2d2..2fb1d0fc5b 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbImageSeriesFileReader_txx
-#define otbImageSeriesFileReader_txx
+#ifndef otbImageSeriesFileReader_hxx
+#define otbImageSeriesFileReader_hxx
 #include "otbImageSeriesFileReader.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index 58b071957e..6493c9597a 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -200,7 +200,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSeriesFileReaderBase.txx"
+#include "otbImageSeriesFileReaderBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
index a9eea80e24..3dbdec0a90 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbImageSeriesFileReaderBase_txx
-#define otbImageSeriesFileReaderBase_txx
+#ifndef otbImageSeriesFileReaderBase_hxx
+#define otbImageSeriesFileReaderBase_hxx
 #include "otbImageSeriesFileReaderBase.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
index 6b01674b52..3137fa7bc0 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
@@ -290,7 +290,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiImageFileWriter.txx"
+#include "otbMultiImageFileWriter.hxx"
 #endif
 
 #endif // otbMultiImageFileWriter_h
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
index 5e6d6304dc..849eea28a6 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiImageFileWriter_txx
-#define otbMultiImageFileWriter_txx
+#ifndef otbMultiImageFileWriter_hxx
+#define otbMultiImageFileWriter_hxx
 
 #include "otbMultiImageFileWriter.h"
 #include "otbImageIOFactory.h"
@@ -86,4 +86,4 @@ MultiImageFileWriter::Sink<TImage>
 
 } // end of namespace otb
 
-#endif // otbMultiImageFileWriter_txx
+#endif // otbMultiImageFileWriter_hxx
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
index 86d7c3faa1..cdf0beeaf9 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbScalarBufferToImageFileWriter.txx"
+#include "otbScalarBufferToImageFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
index e18329a002..f60f87e7d1 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarBufferToImageFileWriter_txx
-#define otbScalarBufferToImageFileWriter_txx
+#ifndef otbScalarBufferToImageFileWriter_hxx
+#define otbScalarBufferToImageFileWriter_hxx
 
 #include "otbMacro.h"
 
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 9acdf7eddc..bb19e43453 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -320,7 +320,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKmzProductWriter.txx"
+#include "otbKmzProductWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
index 5e54d1e86d..caa8e518b8 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKmzProductWriter_txx
-#define otbKmzProductWriter_txx
+#ifndef otbKmzProductWriter_hxx
+#define otbKmzProductWriter_hxx
 
 #include <string>
 
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
index 1730092353..0bfc1313cd 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDifferenceImageFilter.txx"
+#include "otbDifferenceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
index 1074686bdc..a74038f926 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDifferenceImageFilter_txx
-#define otbDifferenceImageFilter_txx
+#ifndef otbDifferenceImageFilter_hxx
+#define otbDifferenceImageFilter_hxx
 
 #include "otbDifferenceImageFilter.h"
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
index 4df9b28092..3538352e03 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataFileReader.txx"
+#include "otbVectorDataFileReader.hxx"
 #endif
 
 #endif // otbVectorDataFileReader_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
index 222c813c57..397c96751f 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataFileReader_txx
-#define otbVectorDataFileReader_txx
+#ifndef otbVectorDataFileReader_hxx
+#define otbVectorDataFileReader_hxx
 
 #include <fstream>
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index bd285d54b6..157c941c5f 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataFileWriter.txx"
+#include "otbVectorDataFileWriter.hxx"
 #endif
 
 #endif // otbVectorDataFileWriter_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
index d0d66eed74..d960743ec9 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataFileWriter_txx
-#define otbVectorDataFileWriter_txx
+#ifndef otbVectorDataFileWriter_hxx
+#define otbVectorDataFileWriter_hxx
 
 #include "otbMacro.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
index 49ae13d3bf..b11ab143d6 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
@@ -164,7 +164,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixToMassOfBelief.txx"
+#include "otbConfusionMatrixToMassOfBelief.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
index d5bfae3d12..3f8a4202bb 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixToMassOfBelief_txx
-#define otbConfusionMatrixToMassOfBelief_txx
+#ifndef otbConfusionMatrixToMassOfBelief_hxx
+#define otbConfusionMatrixToMassOfBelief_hxx
 
 #include "otbConfusionMatrixToMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index 18afb8e0f8..d7baae4973 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -170,7 +170,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDSFusionOfClassifiersImageFilter.txx"
+#include "otbDSFusionOfClassifiersImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
index cf618e75c2..889ee00d28 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDSFusionOfClassifiersImageFilter_txx
-#define otbDSFusionOfClassifiersImageFilter_txx
+#ifndef otbDSFusionOfClassifiersImageFilter_hxx
+#define otbDSFusionOfClassifiersImageFilter_hxx
 
 #include "otbDSFusionOfClassifiersImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
index 4a08d78764..f3be3d920c 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
@@ -107,7 +107,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbJointMassOfBeliefFilter.txx"
+#include "otbJointMassOfBeliefFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
index 35b893df34..15df8a2ce1 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbJointMassOfBeliefFilter_txx
-#define otbJointMassOfBeliefFilter_txx
+#ifndef otbJointMassOfBeliefFilter_hxx
+#define otbJointMassOfBeliefFilter_hxx
 
 #include "otbJointMassOfBeliefFilter.h"
 
@@ -211,7 +211,7 @@ JointMassOfBeliefFilter<TMassFunction>
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbJointMassOfBeliefFilter.txx"
+#include "otbJointMassOfBeliefFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
index 6f99177e87..58e265ce27 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
@@ -197,7 +197,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMassOfBelief.txx"
+#include "otbMassOfBelief.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
index 7bf2289e49..7d52776ee6 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMassOfBelief_txx
-#define otbMassOfBelief_txx
+#ifndef otbMassOfBelief_hxx
+#define otbMassOfBelief_hxx
 
 #include "otbMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
index 98b1bc803f..5e0e6464f5 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
@@ -177,7 +177,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStandardDSCostFunction.txx"
+#include "otbStandardDSCostFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
index fab661ea24..4829d1b557 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStandardDSCostFunction_txx
-#define otbStandardDSCostFunction_txx
+#ifndef otbStandardDSCostFunction_hxx
+#define otbStandardDSCostFunction_hxx
 
 #include "otbStandardDSCostFunction.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
index ca77284e9a..b72d4b0dda 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToDSValidatedVectorDataFilter.txx"
+#include "otbVectorDataToDSValidatedVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
index 7e5237c097..91063119a8 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToDSValidatedVectorDataFilter_txx
-#define otbVectorDataToDSValidatedVectorDataFilter_txx
+#ifndef otbVectorDataToDSValidatedVectorDataFilter_hxx
+#define otbVectorDataToDSValidatedVectorDataFilter_hxx
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
 #include <iostream>
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 69446f002b..0dd8a31402 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -186,7 +186,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAutoencoderModel.txx"
+#include "otbAutoencoderModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
index e5a26e9ee3..636f62cfd2 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbAutoencoderModel_txx
-#define otbAutoencoderModel_txx
+#ifndef otbAutoencoderModel_hxx
+#define otbAutoencoderModel_hxx
 
 #include "otbAutoencoderModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
index 5110fc6137..7f71fdedbd 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
@@ -72,7 +72,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAutoencoderModelFactory.txx"
+#include "otbAutoencoderModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
index c55f718a62..50146f20ba 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbAutoencoderModelFactory_txx
-#define otbAutoencoderModelFactory_txx
+#ifndef otbAutoencoderModelFactory_hxx
+#define otbAutoencoderModelFactory_hxx
 
 #include "otbAutoencoderModelFactory.h"
 #include "otbAutoencoderModel.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
index c92d7d63d3..7ddeeda009 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
@@ -78,7 +78,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDimensionalityReductionModelFactory.txx"
+#include "otbDimensionalityReductionModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
index 0760e15142..8f56fe58ee 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionModelFactory_txx
-#define otbDimensionalityReductionModelFactory_txx
+#ifndef otbDimensionalityReductionModelFactory_hxx
+#define otbDimensionalityReductionModelFactory_hxx
 
 #include "otbDimensionalityReductionModelFactory.h"
 #include "otbConfigure.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index d48d400cc2..5ef0689a89 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -140,7 +140,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageDimensionalityReductionFilter.txx"
+#include "otbImageDimensionalityReductionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
index b48a264a36..85a8142e0b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbImageDimensionalityReductionFilter_txx
-#define otbImageDimensionalityReductionFilter_txx
+#ifndef otbImageDimensionalityReductionFilter_hxx
+#define otbImageDimensionalityReductionFilter_hxx
 
 #include "otbImageDimensionalityReductionFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index 501a4618d4..3752382c36 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -114,7 +114,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAModel.txx"
+#include "otbPCAModel.hxx"
 #endif
 
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
index a387852fec..8560166272 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbPCAModel_txx
-#define otbPCAModel_txx
+#ifndef otbPCAModel_hxx
+#define otbPCAModel_hxx
 
 #include "otbPCAModel.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
index 2fa07f5e99..74fb5ef4fe 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
@@ -71,7 +71,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAModelFactory.txx"
+#include "otbPCAModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
index ab31accbe0..c309e601da 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbPCAFactory_txx
-#define otbPCAFactory_txx
+#ifndef otbPCAFactory_hxx
+#define otbPCAFactory_hxx
 
 #include "otbPCAModelFactory.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index d1f2ec37ce..11c5fe592a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -149,7 +149,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMModel.txx"
+#include "otbSOMModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
index e1d7dc3fc6..2c2abca261 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSOMModel_txx
-#define otbSOMModel_txx
+#ifndef otbSOMModel_hxx
+#define otbSOMModel_hxx
 
 #include "otbSOMModel.h"
 #include "otbSOM.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
index 2cbc78e2d0..d0a420cbc0 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
@@ -72,7 +72,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMModelFactory.txx"
+#include "otbSOMModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
index 5799660768..755e0a86b9 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSOMFactory_txx
-#define otbSOMFactory_txx
+#ifndef otbSOMFactory_hxx
+#define otbSOMFactory_hxx
 
 #include "otbSOMModelFactory.h"
 
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
index 7c71c01ba1..34b56ded33 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTree.txx"
+#include "otbDecisionTree.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.hxx b/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
index e2430982d7..aa2559531b 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTree_txx
-#define otbDecisionTree_txx
+#ifndef otbDecisionTree_hxx
+#define otbDecisionTree_hxx
 
 #include "otbDecisionTree.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 77b4078467..a28c91fcbe 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -113,7 +113,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaussianModelComponent.txx"
+#include "otbGaussianModelComponent.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
index ada1f2d3c5..eb3d71cafb 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaussianModelComponent_txx
-#define otbGaussianModelComponent_txx
+#ifndef otbGaussianModelComponent_hxx
+#define otbGaussianModelComponent_hxx
 
 #include <iostream>
 
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
index a7a30cd5f8..4609ce047d 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
@@ -138,7 +138,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageClassificationFilter.txx"
+#include "otbImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
index 3306f71872..fda4ab0034 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageClassificationFilter_txx
-#define otbImageClassificationFilter_txx
+#ifndef otbImageClassificationFilter_hxx
+#define otbImageClassificationFilter_hxx
 
 #include "otbImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index 3de3c8a3a2..7b52de4dbd 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -128,7 +128,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKMeansImageClassificationFilter.txx"
+#include "otbKMeansImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
index 98a1b9ae80..1dc15df5ae 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKMeansImageClassificationFilter_txx
-#define otbKMeansImageClassificationFilter_txx
+#ifndef otbKMeansImageClassificationFilter_hxx
+#define otbKMeansImageClassificationFilter_hxx
 
 #include "otbKMeansImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
index 38632d5f4e..01f522a4fe 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
@@ -246,7 +246,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMachineLearningModel.txx"
+#include "otbMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
index 46b7f60016..a2c353a89a 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMachineLearningModel_txx
-#define otbMachineLearningModel_txx
+#ifndef otbMachineLearningModel_hxx
+#define otbMachineLearningModel_hxx
 
 #ifdef _OPENMP
  # include <omp.h>
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
index 0b598f44b5..0a0af75660 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.h
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
@@ -226,7 +226,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSEMClassifier.txx"
+#include "otbSEMClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx b/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
index 5e926710ea..dc68749418 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSEMClassifier_txx
-#define otbSEMClassifier_txx
+#ifndef otbSEMClassifier_hxx
+#define otbSEMClassifier_hxx
 
 #include <cstdlib>
 
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
index daced60f44..b9ab131bfc 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
@@ -390,7 +390,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMarkovRandomFieldFilter.txx"
+#include "otbMarkovRandomFieldFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
index 0e7833f4ce..3473e2f423 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMarkovRandomFieldFilter_txx
-#define otbMarkovRandomFieldFilter_txx
+#ifndef otbMarkovRandomFieldFilter_hxx
+#define otbMarkovRandomFieldFilter_hxx
 #include "otbMarkovRandomFieldFilter.h"
 
 namespace otb
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
index ae33ebe576..a565b39ca5 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
@@ -136,7 +136,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPeriodicSOM.txx"
+#include "otbPeriodicSOM.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.hxx b/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
index 711748ca66..6a267f5aa8 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbPeriodicSOM_txx
-#define otbPeriodicSOM_txx
+#ifndef otbPeriodicSOM_hxx
+#define otbPeriodicSOM_hxx
 
 #include "itkNumericTraits.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
index f506f086dc..4c002cf657 100644
--- a/Modules/Learning/SOM/include/otbSOM.h
+++ b/Modules/Learning/SOM/include/otbSOM.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOM.txx"
+#include "otbSOM.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOM.hxx b/Modules/Learning/SOM/include/otbSOM.hxx
index e8a1c15268..cf044b0cd1 100644
--- a/Modules/Learning/SOM/include/otbSOM.hxx
+++ b/Modules/Learning/SOM/include/otbSOM.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOM_txx
-#define otbSOM_txx
+#ifndef otbSOM_hxx
+#define otbSOM_hxx
 
 #include "otbSOM.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
index 4bbdc898cf..2b9163aa4b 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMActivationBuilder.txx"
+#include "otbSOMActivationBuilder.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx b/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
index 4cf475df2e..09730e1e8a 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMActivationBuilder_txx
-#define otbSOMActivationBuilder_txx
+#ifndef otbSOMActivationBuilder_hxx
+#define otbSOMActivationBuilder_hxx
 
 #include "otbSOMActivationBuilder.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
index 55027d4435..b291250039 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.h
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.h
@@ -102,7 +102,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMClassifier.txx"
+#include "otbSOMClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.hxx b/Modules/Learning/SOM/include/otbSOMClassifier.hxx
index 5401e4bc5d..c789e45c7c 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.hxx
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMClassifier_txx
-#define otbSOMClassifier_txx
+#ifndef otbSOMClassifier_hxx
+#define otbSOMClassifier_hxx
 
 #include "otbSOMClassifier.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index 3b913d2dae..6ad8984858 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -125,7 +125,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMImageClassificationFilter.txx"
+#include "otbSOMImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
index b5942d37a4..78f7969b89 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMImageClassificationFilter_txx
-#define otbSOMImageClassificationFilter_txx
+#ifndef otbSOMImageClassificationFilter_hxx
+#define otbSOMImageClassificationFilter_hxx
 
 #include "otbSOMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
index fdaa7aba74..6177034f7d 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.h
+++ b/Modules/Learning/SOM/include/otbSOMMap.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMMap.txx"
+#include "otbSOMMap.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMMap.hxx b/Modules/Learning/SOM/include/otbSOMMap.hxx
index 7edb2c9257..2ff52aa71f 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.hxx
+++ b/Modules/Learning/SOM/include/otbSOMMap.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMMap_txx
-#define otbSOMMap_txx
+#ifndef otbSOMMap_hxx
+#define otbSOMMap_hxx
 
 #include "otbSOMMap.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
index 1d32719dab..403404907f 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
@@ -120,7 +120,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMWithMissingValue.txx"
+#include "otbSOMWithMissingValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx b/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
index 9378b147e1..e5794e507f 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMWithMissingValue_txx
-#define otbSOMWithMissingValue_txx
+#ifndef otbSOMWithMissingValue_hxx
+#define otbSOMWithMissingValue_hxx
 
 #include "otbSOMWithMissingValue.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
index 78b169646f..18b3be2d3a 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
@@ -160,7 +160,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMbasedImageFilter.txx"
+#include "otbSOMbasedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
index 914df9a6dc..ebc249d661 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMbasedImageFilter_txx
-#define otbSOMbasedImageFilter_txx
+#ifndef otbSOMbasedImageFilter_hxx
+#define otbSOMbasedImageFilter_hxx
 
 #include "otbSOMbasedImageFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
index af80118a95..36d5f63804 100644
--- a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
+++ b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
@@ -188,7 +188,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSampleExtractorFilter.txx"
+#include "otbImageSampleExtractorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
index d5faa1064c..5676411f7d 100644
--- a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageSampleExtractorFilter_txx
-#define otbImageSampleExtractorFilter_txx
+#ifndef otbImageSampleExtractorFilter_hxx
+#define otbImageSampleExtractorFilter_hxx
 
 #include "otbImageSampleExtractorFilter.h"
 #include "itkDefaultConvertPixelTraits.h"
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
index 39230855b0..0bed151c83 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
@@ -193,7 +193,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataToClassStatisticsFilter.txx"
+#include "otbOGRDataToClassStatisticsFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
index 9aeb389a01..6e6c1f07ea 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataToClassStatisticsFilter_txx
-#define otbOGRDataToClassStatisticsFilter_txx
+#ifndef otbOGRDataToClassStatisticsFilter_hxx
+#define otbOGRDataToClassStatisticsFilter_hxx
 
 #include "otbOGRDataToClassStatisticsFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
index e1b9dfd608..d04721d372 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
@@ -269,7 +269,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataToSamplePositionFilter.txx"
+#include "otbOGRDataToSamplePositionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
index 949b4d45f5..59aae1e31f 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataToSamplePositionFilter_txx
-#define otbOGRDataToSamplePositionFilter_txx
+#ifndef otbOGRDataToSamplePositionFilter_hxx
+#define otbOGRDataToSamplePositionFilter_hxx
 
 #include "otbOGRDataToSamplePositionFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
index 89d21483fb..3789fb816a 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
@@ -237,7 +237,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentSamplingFilterBase.txx"
+#include "otbPersistentSamplingFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
index 15b54b5bbb..51bcd66d08 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentSamplingFilterBase_txx
-#define otbPersistentSamplingFilterBase_txx
+#ifndef otbPersistentSamplingFilterBase_hxx
+#define otbPersistentSamplingFilterBase_hxx
 
 #include "otbPersistentSamplingFilterBase.h"
 #include "otbMaskedIteratorDecorator.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
index 2fc2bf82f9..6b61f1f032 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoostMachineLearningModel.txx"
+#include "otbBoostMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
index b022e0c240..a07cbd0890 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoostMachineLearningModel_txx
-#define otbBoostMachineLearningModel_txx
+#ifndef otbBoostMachineLearningModel_hxx
+#define otbBoostMachineLearningModel_hxx
 
 #include "otbBoostMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
index 53812f30a7..82dac7f3f4 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoostMachineLearningModelFactory.txx"
+#include "otbBoostMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
index 1d132473eb..1148fbe4cd 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoostMachineLearningModelFactory_txx
-#define otbBoostMachineLearningModelFactory_txx
+#ifndef otbBoostMachineLearningModelFactory_hxx
+#define otbBoostMachineLearningModelFactory_hxx
 
 #include "otbBoostMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
index ab5d2c737f..ad44207cc4 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
@@ -182,7 +182,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixCalculator.txx"
+#include "otbConfusionMatrixCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
index f88c779b86..11c9e0af65 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixCalculator_txx
-#define otbConfusionMatrixCalculator_txx
+#ifndef otbConfusionMatrixCalculator_hxx
+#define otbConfusionMatrixCalculator_hxx
 
 #include "otbConfusionMatrixCalculator.h"
 
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
index f1219fe1d0..c788eb448c 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
@@ -184,7 +184,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixMeasurements.txx"
+#include "otbConfusionMatrixMeasurements.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
index 32a6bc5e52..257cff8ab3 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixMeasurements_txx
-#define otbConfusionMatrixMeasurements_txx
+#ifndef otbConfusionMatrixMeasurements_hxx
+#define otbConfusionMatrixMeasurements_hxx
 
 #include "otbConfusionMatrixMeasurements.h"
 
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
index 360912511e..b0940ce737 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
@@ -208,7 +208,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTreeMachineLearningModel.txx"
+#include "otbDecisionTreeMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
index 055839026b..b465a76d19 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTreeMachineLearningModel_txx
-#define otbDecisionTreeMachineLearningModel_txx
+#ifndef otbDecisionTreeMachineLearningModel_hxx
+#define otbDecisionTreeMachineLearningModel_hxx
 
 #include "otbDecisionTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
index e19064b0b7..414a4f36cd 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTreeMachineLearningModelFactory.txx"
+#include "otbDecisionTreeMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
index 97d1f1b51e..3c86c8228a 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTreeMachineLearningModelFactory_txx
-#define otbDecisionTreeMachineLearningModelFactory_txx
+#ifndef otbDecisionTreeMachineLearningModelFactory_hxx
+#define otbDecisionTreeMachineLearningModelFactory_hxx
 
 #include "otbDecisionTreeMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
index 1f8eeb0726..3249ef81a9 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGradientBoostedTreeMachineLearningModel.txx"
+#include "otbGradientBoostedTreeMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
index 12a82d9ee2..6553874a50 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGradientBoostedTreeMachineLearningModel_txx
-#define otbGradientBoostedTreeMachineLearningModel_txx
+#ifndef otbGradientBoostedTreeMachineLearningModel_hxx
+#define otbGradientBoostedTreeMachineLearningModel_hxx
 
 #include "otbGradientBoostedTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
index a608dc92f1..c68f843f7b 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
@@ -75,7 +75,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGradientBoostedTreeMachineLearningModelFactory.txx"
+#include "otbGradientBoostedTreeMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
index 81fb5aab08..150db96e9d 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGradientBoostedTreeMachineLearningModelFactory_txx
-#define otbGradientBoostedTreeMachineLearningModelFactory_txx
+#ifndef otbGradientBoostedTreeMachineLearningModelFactory_hxx
+#define otbGradientBoostedTreeMachineLearningModelFactory_hxx
 
 #include "otbGradientBoostedTreeMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
index 7e0a9cf0f2..fff1dd2256 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKNearestNeighborsMachineLearningModel.txx"
+#include "otbKNearestNeighborsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
index 53b33424d5..e67d0fd19f 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKNearestNeighborsMachineLearningModel_txx
-#define otbKNearestNeighborsMachineLearningModel_txx
+#ifndef otbKNearestNeighborsMachineLearningModel_hxx
+#define otbKNearestNeighborsMachineLearningModel_hxx
 
 #include <boost/lexical_cast.hpp>
 #include "otbKNearestNeighborsMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
index 148589d22a..badcb3edbf 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKNearestNeighborsMachineLearningModelFactory.txx"
+#include "otbKNearestNeighborsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
index e36dc894a9..0ad49c886d 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKNearestNeighborsMachineLearningModelFactory_txx
-#define otbKNearestNeighborsMachineLearningModelFactory_txx
+#ifndef otbKNearestNeighborsMachineLearningModelFactory_hxx
+#define otbKNearestNeighborsMachineLearningModelFactory_hxx
 
 #include "otbKNearestNeighborsMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
index 035dc6a7ec..8a1020e73f 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
@@ -111,7 +111,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapClassifier.txx"
+#include "otbLabelMapClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
index b7a6141b5a..45a08ff44e 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapClassifier_txx
-#define otbLabelMapClassifier_txx
+#ifndef otbLabelMapClassifier_hxx
+#define otbLabelMapClassifier_hxx
 
 #include "otbLabelMapClassifier.h"
 
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
index 621c1e5b7f..6e89b68653 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
@@ -328,7 +328,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLibSVMMachineLearningModel.txx"
+#include "otbLibSVMMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
index 762aa0cb7a..aeace69db3 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLibSVMMachineLearningModel_txx
-#define otbLibSVMMachineLearningModel_txx
+#ifndef otbLibSVMMachineLearningModel_hxx
+#define otbLibSVMMachineLearningModel_hxx
 
 #include <fstream>
 #include "otbLibSVMMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
index b07b98855d..65609170e4 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLibSVMMachineLearningModelFactory.txx"
+#include "otbLibSVMMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
index da060b8df9..2ac79bb49b 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLibSVMMachineLearningModelFactory_txx
-#define otbLibSVMMachineLearningModelFactory_txx
+#ifndef otbLibSVMMachineLearningModelFactory_hxx
+#define otbLibSVMMachineLearningModelFactory_hxx
 
 #include "otbLibSVMMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
index a059b1b6d8..470f9f9b50 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
@@ -78,7 +78,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMachineLearningModelFactory.txx"
+#include "otbMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
index 31cb1a288e..5e9d3762e7 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMachineLearningModelFactory_txx
-#define otbMachineLearningModelFactory_txx
+#ifndef otbMachineLearningModelFactory_hxx
+#define otbMachineLearningModelFactory_hxx
 
 #include "otbMachineLearningModelFactory.h"
 #include "otbConfigure.h"
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
index 2861b105fc..283b5ce015 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
@@ -217,7 +217,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeuralNetworkMachineLearningModel.txx"
+#include "otbNeuralNetworkMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
index 644e2b35bd..e18d3fd285 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeuralNetworkMachineLearningModel_txx
-#define otbNeuralNetworkMachineLearningModel_txx
+#ifndef otbNeuralNetworkMachineLearningModel_hxx
+#define otbNeuralNetworkMachineLearningModel_hxx
 
 #include <fstream>
 #include "otbNeuralNetworkMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
index ef266b2975..a2fae40c6a 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeuralNetworkMachineLearningModelFactory.txx"
+#include "otbNeuralNetworkMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
index f0713c6df5..8fe08f1da3 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeuralNetworkMachineLearningModelFactory_txx
-#define otbNeuralNetworkMachineLearningModelFactory_txx
+#ifndef otbNeuralNetworkMachineLearningModelFactory_hxx
+#define otbNeuralNetworkMachineLearningModelFactory_hxx
 
 #include "otbNeuralNetworkMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
index 10aa5645f6..cb3da6e302 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
@@ -102,7 +102,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalBayesMachineLearningModel.txx"
+#include "otbNormalBayesMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
index 1a47e4cf43..b376625c60 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalBayesMachineLearningModel_txx
-#define otbNormalBayesMachineLearningModel_txx
+#ifndef otbNormalBayesMachineLearningModel_hxx
+#define otbNormalBayesMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
index 09fa60ceeb..4455a26942 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalBayesMachineLearningModelFactory.txx"
+#include "otbNormalBayesMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
index 72e1df37b8..ebc68869c6 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalBayesMachineLearningModelFactory_txx
-#define otbNormalBayesMachineLearningModelFactory_txx
+#ifndef otbNormalBayesMachineLearningModelFactory_hxx
+#define otbNormalBayesMachineLearningModelFactory_hxx
 
 #include "otbNormalBayesMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
index 80d61e95f0..e04c7fd19e 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
@@ -226,7 +226,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomForestsMachineLearningModel.txx"
+#include "otbRandomForestsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
index 0e046cc76a..e364d6c34b 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRandomForestsMachineLearningModel_txx
-#define otbRandomForestsMachineLearningModel_txx
+#ifndef otbRandomForestsMachineLearningModel_hxx
+#define otbRandomForestsMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
index 271e94d807..698919b98b 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomForestsMachineLearningModelFactory.txx"
+#include "otbRandomForestsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
index 466f672a6e..162c0594d6 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRandomForestsMachineLearningModelFactory_txx
-#define otbRandomForestsMachineLearningModelFactory_txx
+#ifndef otbRandomForestsMachineLearningModelFactory_hxx
+#define otbRandomForestsMachineLearningModelFactory_hxx
 
 #include "otbRandomForestsMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
index 47efa923e2..7e183cd2aa 100644
--- a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
+++ b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
@@ -115,7 +115,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMCrossValidationCostFunction.txx"
+#include "otbSVMCrossValidationCostFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
index 25da162a45..899e862a20 100644
--- a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMCrossValidationCostFunction_txx
-#define otbSVMCrossValidationCostFunction_txx
+#ifndef otbSVMCrossValidationCostFunction_hxx
+#define otbSVMCrossValidationCostFunction_hxx
 
 #include "otbSVMCrossValidationCostFunction.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
index 9d47adc457..dca029a2c8 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMachineLearningModel.txx"
+#include "otbSVMMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
index b2cb6d2626..8649a4a06d 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMachineLearningModel_txx
-#define otbSVMMachineLearningModel_txx
+#ifndef otbSVMMachineLearningModel_hxx
+#define otbSVMMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
index 6eec6503af..4a2bb999d8 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMachineLearningModelFactory.txx"
+#include "otbSVMMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
index af94f0e315..22c820d0c8 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMachineLearningModelFactory_txx
-#define otbSVMMachineLearningModelFactory_txx
+#ifndef otbSVMMachineLearningModelFactory_hxx
+#define otbSVMMachineLearningModelFactory_hxx
 
 #include "otbSVMMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
index ab02a0f7b5..d4e8ddd1f9 100644
--- a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
+++ b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
@@ -108,7 +108,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMarginSampler.txx"
+#include "otbSVMMarginSampler.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx b/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
index b5ca257fad..f7d28484bc 100644
--- a/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMarginSampler_txx
-#define otbSVMMarginSampler_txx
+#ifndef otbSVMMarginSampler_hxx
+#define otbSVMMarginSampler_hxx
 
 #include "otbSVMMarginSampler.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 914d9aed65..4fe28c4213 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -180,7 +180,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkRandomForestsMachineLearningModel.txx"
+#include "otbSharkRandomForestsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
index 10c3a5630f..248a715ea4 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSharkRandomForestsMachineLearningModel_txx
-#define otbSharkRandomForestsMachineLearningModel_txx
+#ifndef otbSharkRandomForestsMachineLearningModel_hxx
+#define otbSharkRandomForestsMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
index 53b4adcb5e..dc35613147 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkRandomForestsMachineLearningModelFactory.txx"
+#include "otbSharkRandomForestsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
index 38fe3f023b..17b75e3c8d 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSharkRandomForestsMachineLearningModelFactory_txx
-#define otbSharkRandomForestsMachineLearningModelFactory_txx
+#ifndef otbSharkRandomForestsMachineLearningModelFactory_hxx
+#define otbSharkRandomForestsMachineLearningModelFactory_hxx
 
 
 #include "otbSharkRandomForestsMachineLearningModelFactory.h"
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
index e9b365d3e5..ce4ff665cd 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
@@ -98,7 +98,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbContingencyTableCalculator.txx"
+#include "otbContingencyTableCalculator.hxx"
 #endif
 
 #endif //otbContingencyTableCalculator_h
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
index a5bb6761fb..4725c24642 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbContingencyTableCalculator_txx
-#define otbContingencyTableCalculator_txx
+#ifndef otbContingencyTableCalculator_hxx
+#define otbContingencyTableCalculator_hxx
 
 #include "otbContingencyTableCalculator.h"
 #include "itkMacro.h"
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index 8a06adb8e5..0c8b1502de 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -165,7 +165,7 @@ private:
 
 #ifndef OTB_MANUAL_INSTANTIATION
 
-#include "otbSharkKMeansMachineLearningModel.txx"
+#include "otbSharkKMeansMachineLearningModel.hxx"
 
 #endif
 
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
index f3b9310c7b..f7318cdaaa 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSharkKMeansMachineLearningModel_txx
-#define otbSharkKMeansMachineLearningModel_txx
+#ifndef otbSharkKMeansMachineLearningModel_hxx
+#define otbSharkKMeansMachineLearningModel_hxx
 
 #include <fstream>
 #include "boost/make_shared.hpp"
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
index 69e22afe39..9d253c47d8 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
@@ -70,7 +70,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkKMeansMachineLearningModelFactory.txx"
+#include "otbSharkKMeansMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
index a4fe5584e0..40c11d2979 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSharkKMeansMachineLearningModelFactory_txx
-#define otbSharkKMeansMachineLearningModelFactory_txx
+#ifndef otbSharkKMeansMachineLearningModelFactory_hxx
+#define otbSharkKMeansMachineLearningModelFactory_hxx
 
 #include "otbSharkKMeansMachineLearningModelFactory.h"
 
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
index 959ffd45dc..d3cbdf13b3 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
@@ -342,7 +342,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSimpleParallelTiffWriter.txx"
+#include "otbSimpleParallelTiffWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
index 4292ad0f84..1c6aa5033f 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSimpleParallelTiffWriter_txx
-#define otbSimpleParallelTiffWriter_txx
+#ifndef otbSimpleParallelTiffWriter_hxx
+#define otbSimpleParallelTiffWriter_hxx
 
 #include "otbSimpleParallelTiffWriter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
index 1800dc62ae..dfb2af2d81 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
@@ -142,7 +142,7 @@ template <typename TImage> void WriteMPI(TImage *img, const std::string &output,
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMPIVrtWriter.txx"
+#include "otbMPIVrtWriter.hxx"
 #endif
 
 #endif //__otbMPIVrtWriter_h
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
index b57518ed73..33e8253c0a 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMPIVrtWriter_txx
-#define otbMPIVrtWriter_txx
+#ifndef otbMPIVrtWriter_hxx
+#define otbMPIVrtWriter_hxx
 
 #include "otbMPIVrtWriter.h"
 #include "otbMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index 2baa1fce09..5c24b93f3a 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -83,7 +83,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToRCC8GraphFilter.txx"
+#include "otbImageListToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
index 5f98249b27..8e75de80ca 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToRCC8GraphFilter_txx
-#define otbImageListToRCC8GraphFilter_txx
+#ifndef otbImageListToRCC8GraphFilter_hxx
+#define otbImageListToRCC8GraphFilter_hxx
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
index 16e7b21960..61d2f8c092 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -106,7 +106,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageMultiSegmentationToRCC8GraphFilter.txx"
+#include "otbImageMultiSegmentationToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
index e4a653076e..1af4027e88 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageMultiSegmentationToRCC8GraphFilter_txx
-#define otbImageMultiSegmentationToRCC8GraphFilter_txx
+#ifndef otbImageMultiSegmentationToRCC8GraphFilter_hxx
+#define otbImageMultiSegmentationToRCC8GraphFilter_hxx
 
 #include "otbImageMultiSegmentationToRCC8GraphFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
index 7e074277a8..2b79599f75 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToImageRCC8Calculator.txx"
+#include "otbImageToImageRCC8Calculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
index 265c3b34fb..9d2771e050 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToImageRCC8Calculator_txx
-#define otbImageToImageRCC8Calculator_txx
+#ifndef otbImageToImageRCC8Calculator_hxx
+#define otbImageToImageRCC8Calculator_hxx
 
 #include "otbImageToImageRCC8Calculator.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index 2dd119d946..149828819f 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -176,7 +176,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygonListToRCC8GraphFilter.txx"
+#include "otbPolygonListToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
index 2b1d81da48..b42cd634ab 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygonListToRCC8GraphFilter_txx
-#define otbPolygonListToRCC8GraphFilter_txx
+#ifndef otbPolygonListToRCC8GraphFilter_hxx
+#define otbPolygonListToRCC8GraphFilter_hxx
 
 #include "otbPolygonListToRCC8GraphFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
index 4f81008a08..6980d80fda 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
@@ -131,7 +131,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygonToPolygonRCC8Calculator.txx"
+#include "otbPolygonToPolygonRCC8Calculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
index 0c730ca7fe..1f3e6dfc19 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygonToPolygonRCC8Calculator_txx
-#define otbPolygonToPolygonRCC8Calculator_txx
+#ifndef otbPolygonToPolygonRCC8Calculator_hxx
+#define otbPolygonToPolygonRCC8Calculator_hxx
 
 #include "otbPolygonToPolygonRCC8Calculator.h"
 #include "otbMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
index fa91c811ba..be04398650 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
@@ -132,7 +132,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8EdgeIterator.txx"
+#include "otbRCC8EdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
index 753f2609c1..377360083c 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8EdgeIterator_txx
-#define otbRCC8EdgeIterator_txx
+#ifndef otbRCC8EdgeIterator_hxx
+#define otbRCC8EdgeIterator_hxx
 
 #include "otbRCC8EdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
index fc1f7f965f..5267efa560 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
@@ -146,7 +146,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8Graph.txx"
+#include "otbRCC8Graph.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx b/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
index 9a45b51709..576724e375 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8Graph_txx
-#define otbRCC8Graph_txx
+#ifndef otbRCC8Graph_hxx
+#define otbRCC8Graph_hxx
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
index 31879d4809..dca598e5db 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
@@ -115,7 +115,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphFileReader.txx"
+#include "otbRCC8GraphFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
index 2aa1dcb2f2..7f6efbba21 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphFileReader_txx
-#define otbRCC8GraphFileReader_txx
+#ifndef otbRCC8GraphFileReader_hxx
+#define otbRCC8GraphFileReader_hxx
 
 #include "otbRCC8GraphFileReader.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index f9c893cb51..a3f27a55c7 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -152,7 +152,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphFileWriter.txx"
+#include "otbRCC8GraphFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
index 7d780f7447..c120000cb0 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphFileWriter_txx
-#define otbRCC8GraphFileWriter_txx
+#ifndef otbRCC8GraphFileWriter_hxx
+#define otbRCC8GraphFileWriter_hxx
 
 #include "otbRCC8GraphFileWriter.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
index 817ddb4330..8fa69081e8 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
@@ -68,6 +68,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphSource.txx"
+#include "otbRCC8GraphSource.hxx"
 #endif
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
index 6b1287bfb6..02ed91f9a5 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphSource_txx
-#define otbRCC8GraphSource_txx
+#ifndef otbRCC8GraphSource_hxx
+#define otbRCC8GraphSource_hxx
 
 #include "otbRCC8GraphSource.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
index f4e76dbaa8..459310e3a9 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
@@ -123,7 +123,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8InEdgeIterator.txx"
+#include "otbRCC8InEdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
index 20d6c83fe9..21ef336b90 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8InEdgeIterator_txx
-#define otbRCC8InEdgeIterator_txx
+#ifndef otbRCC8InEdgeIterator_hxx
+#define otbRCC8InEdgeIterator_hxx
 
 #include "otbRCC8InEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
index eeb088d6f3..b76e3b1644 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
@@ -123,7 +123,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8OutEdgeIterator.txx"
+#include "otbRCC8OutEdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
index 3abc28e269..c18aadf563 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8OutEdgeIterator_txx
-#define otbRCC8OutEdgeIterator_txx
+#ifndef otbRCC8OutEdgeIterator_hxx
+#define otbRCC8OutEdgeIterator_hxx
 
 #include "otbRCC8OutEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
index b432ded549..21a3afad36 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
@@ -96,7 +96,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexBase.txx"
+#include "otbRCC8VertexBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
index 1a0a82a416..72c66ffd1b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexBase_txx
-#define otbRCC8VertexBase_txx
+#ifndef otbRCC8VertexBase_hxx
+#define otbRCC8VertexBase_hxx
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
index 03b8d559ab..444611ed61 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
@@ -118,7 +118,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexIterator.txx"
+#include "otbRCC8VertexIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
index 297d7fa3f9..de39d935b1 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexIterator_txx
-#define otbRCC8VertexIterator_txx
+#ifndef otbRCC8VertexIterator_hxx
+#define otbRCC8VertexIterator_hxx
 
 #include "otbRCC8VertexIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
index c9695fb2e3..1f8ae05ca2 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
@@ -82,7 +82,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexWithCompacity.txx"
+#include "otbRCC8VertexWithCompacity.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
index 3feea52dd0..f6fc5ed676 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexWithCompacity_txx
-#define otbRCC8VertexWithCompacity_txx
+#ifndef otbRCC8VertexWithCompacity_hxx
+#define otbRCC8VertexWithCompacity_hxx
 
 #include "otbRCC8VertexWithCompacity.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
index 09387ec7fe..4734b10a09 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
@@ -84,7 +84,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexWithRegionCenter.txx"
+#include "otbRCC8VertexWithRegionCenter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
index 5461bcca5e..113118460d 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexWithRegionCenter_txx
-#define otbRCC8VertexWithRegionCenter_txx
+#ifndef otbRCC8VertexWithRegionCenter_hxx
+#define otbRCC8VertexWithRegionCenter_hxx
 
 #include "otbRCC8VertexWithRegionCenter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
index 511ce50752..8ef524ae03 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGAndRIndexImageFilter.txx"
+#include "otbGAndRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
index 00133a5505..40282aed49 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGAndRIndexImageFilter_txx
-#define otbGAndRIndexImageFilter_txx
+#ifndef otbGAndRIndexImageFilter_hxx
+#define otbGAndRIndexImageFilter_hxx
 
 #include "otbGAndRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
index 84993a0180..98c532e854 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
@@ -131,7 +131,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNDVIDataNodeFeatureFunction.txx"
+#include "otbNDVIDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
index 6838d441a1..78775e308b 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNDVIDataNodeFeatureFunction_txx
-#define otbNDVIDataNodeFeatureFunction_txx
+#ifndef otbNDVIDataNodeFeatureFunction_hxx
+#define otbNDVIDataNodeFeatureFunction_hxx
 
 #include "otbNDVIDataNodeFeatureFunction.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
index d042eed158..402885c6ba 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndBAndNIRIndexImageFilter.txx"
+#include "otbRAndBAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
index cf6a3d29a2..93901951f7 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndBAndNIRIndexImageFilter_txx
-#define otbRAndBAndNIRIndexImageFilter_txx
+#ifndef otbRAndBAndNIRIndexImageFilter_hxx
+#define otbRAndBAndNIRIndexImageFilter_hxx
 
 #include "otbRAndBAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
index 9f9f60b865..e4ea4f49c8 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndGAndNIRIndexImageFilter.txx"
+#include "otbRAndGAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
index e8e29123d7..59295bfe35 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndGAndNIRIndexImageFilter_txx
-#define otbRAndGAndNIRIndexImageFilter_txx
+#ifndef otbRAndGAndNIRIndexImageFilter_hxx
+#define otbRAndGAndNIRIndexImageFilter_hxx
 
 #include "otbRAndGAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
index 075384e25a..2d775710ea 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndNIRIndexImageFilter.txx"
+#include "otbRAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
index 2b1bbcbe75..774eceb993 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndNIRIndexImageFilter_txx
-#define otbRAndNIRIndexImageFilter_txx
+#ifndef otbRAndNIRIndexImageFilter_hxx
+#define otbRAndNIRIndexImageFilter_hxx
 
 #include "otbRAndNIRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index df71735c0f..6bb9c50601 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -277,7 +277,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReflectanceToSurfaceReflectanceImageFilter.txx"
+#include "otbReflectanceToSurfaceReflectanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
index 9494c2ebc3..4c3623cdc7 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReflectanceToSurfaceReflectanceImageFilter_txx
-#define otbReflectanceToSurfaceReflectanceImageFilter_txx
+#ifndef otbReflectanceToSurfaceReflectanceImageFilter_hxx
+#define otbReflectanceToSurfaceReflectanceImageFilter_hxx
 
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 8b1290f976..4e94c05537 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -308,7 +308,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx"
+#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
index 18a1831622..ba1559b26c 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
-#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
+#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_hxx
+#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_hxx
 
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
index a5d5188b1c..c4bfc132b5 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
@@ -158,7 +158,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbSarBrightnessFunction.txx"
+# include "otbSarBrightnessFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
index 571f0ba97a..1bae60c77c 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarBrightnessFunction_txx
-#define otbSarBrightnessFunction_txx
+#ifndef otbSarBrightnessFunction_hxx
+#define otbSarBrightnessFunction_hxx
 
 #include "otbSarBrightnessFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
index 1d23c658b5..ad8b991968 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarBrightnessToImageFilter.txx"
+#include "otbSarBrightnessToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
index e01c24d797..2dfd3f59b9 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarBrightnessToImageFilter_txx
-#define otbSarBrightnessToImageFilter_txx
+#ifndef otbSarBrightnessToImageFilter_hxx
+#define otbSarBrightnessToImageFilter_hxx
 
 #include "otbSarBrightnessToImageFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
index f90161345c..6b771c9dbf 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
@@ -95,7 +95,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarDeburstImageFilter.txx"
+#include "otbSarDeburstImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
index 372bc8affd..f460f0eab6 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarDeburstImageFilter_txx
-#define otbSarDeburstImageFilter_txx
+#ifndef otbSarDeburstImageFilter_hxx
+#define otbSarDeburstImageFilter_hxx
 
 #include "otbSarDeburstImageFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
index 4c3466cc55..640ff66473 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
@@ -146,7 +146,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarParametricMapFunction.txx"
+#include "otbSarParametricMapFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
index a1b4698f8e..d196cf0255 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarParametricMapFunction_txx
-#define otbSarParametricMapFunction_txx
+#ifndef otbSarParametricMapFunction_hxx
+#define otbSarParametricMapFunction_hxx
 
 #include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
index 2bb43aabb9..3e7346ceaa 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
@@ -204,7 +204,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbSarRadiometricCalibrationFunction.txx"
+# include "otbSarRadiometricCalibrationFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
index 8d90feda2d..1b863819ff 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarRadiometricCalibrationFunction_txx
-#define otbSarRadiometricCalibrationFunction_txx
+#ifndef otbSarRadiometricCalibrationFunction_hxx
+#define otbSarRadiometricCalibrationFunction_hxx
 
 #include "otbSarRadiometricCalibrationFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
index a9f427c3f7..a41fd0acc1 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarRadiometricCalibrationToImageFilter.txx"
+#include "otbSarRadiometricCalibrationToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
index f58b1cb0af..d08ab5315c 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarRadiometricCalibrationToImageFilter_txx
-#define otbSarRadiometricCalibrationToImageFilter_txx
+#ifndef otbSarRadiometricCalibrationToImageFilter_hxx
+#define otbSarRadiometricCalibrationToImageFilter_hxx
 
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
index 58ce56d755..f082fa57e4 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
@@ -110,7 +110,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTerraSarBrightnessFunctor.txx"
+#include "otbTerraSarBrightnessFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
index 350497a8bb..709735a3e6 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTerraSarBrightnessFunctor_txx
-#define otbTerraSarBrightnessFunctor_txx
+#ifndef otbTerraSarBrightnessFunctor_hxx
+#define otbTerraSarBrightnessFunctor_hxx
 
 #include "otbTerraSarBrightnessFunctor.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
index 220e2b3a58..51e50cb0dd 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTerraSarBrightnessImageFilter.txx"
+#include "otbTerraSarBrightnessImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
index bdf5af1fca..84b8012d60 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTerraSarBrightnessImageFilter_txx
-#define otbTerraSarBrightnessImageFilter_txx
+#ifndef otbTerraSarBrightnessImageFilter_hxx
+#define otbTerraSarBrightnessImageFilter_hxx
 
 #include "otbTerraSarBrightnessImageFilter.h"
 #include "otbTerraSarImageMetadataInterface.h"
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
index 59f5b80431..3788b051e9 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
@@ -117,7 +117,7 @@ class AtmosphericEffects
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAtmosphericEffects.txx"
+#include "otbAtmosphericEffects.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
index ae3d853390..238d19f2be 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAtmosphericEffects_txx
-#define otbAtmosphericEffects_txx
+#ifndef otbAtmosphericEffects_hxx
+#define otbAtmosphericEffects_hxx
 
 #include "otbAtmosphericEffects.h"
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
index bb5ce34108..b1bbfde9a0 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
@@ -203,7 +203,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSimulationMethod.txx"
+#include "otbImageSimulationMethod.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
index 60a23d17ef..97c60d8c98 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageSimulationMethod_txx
-#define otbImageSimulationMethod_txx
+#ifndef otbImageSimulationMethod_hxx
+#define otbImageSimulationMethod_hxx
 
 #include "otbImageSimulationMethod.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
index e268f8341f..01716e4a71 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
@@ -146,7 +146,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToSimulatedImageFilter.txx"
+#include "otbLabelMapToSimulatedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
index 583e2ad8ff..b7b627fb2a 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToSimulatedImageFilter_txx
-#define otbLabelMapToSimulatedImageFilter_txx
+#ifndef otbLabelMapToSimulatedImageFilter_hxx
+#define otbLabelMapToSimulatedImageFilter_hxx
 
 #include "otbLabelMapToSimulatedImageFilter.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
index a51ef87a3f..ccde580e32 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelToProSailParameters.txx"
+#include "otbLabelToProSailParameters.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
index 464576bda2..4457364868 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelToProSailParameters_txx
-#define otbLabelToProSailParameters_txx
+#ifndef otbLabelToProSailParameters_hxx
+#define otbLabelToProSailParameters_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index 93996e8397..afc2663bc1 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -162,7 +162,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReduceSpectralResponse.txx"
+#include "otbReduceSpectralResponse.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
index 95c3b4de2a..279075d8bc 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReduceSpectralResponse_txx
-#define otbReduceSpectralResponse_txx
+#ifndef otbReduceSpectralResponse_hxx
+#define otbReduceSpectralResponse_hxx
 
 #include <algorithm>
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
index 8e89bfddbc..d80b981ca6 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -149,7 +149,7 @@ namespace otb
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReduceSpectralResponseClassifierRAndNIR.txx"
+#include "otbReduceSpectralResponseClassifierRAndNIR.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
index 30ffa2061e..f3c3718d04 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReduceSpectralResponseClassifierRAndNIR_txx
-#define otbReduceSpectralResponseClassifierRAndNIR_txx
+#ifndef otbReduceSpectralResponseClassifierRAndNIR_hxx
+#define otbReduceSpectralResponseClassifierRAndNIR_hxx
 
 #include "otbReduceSpectralResponseClassifierRAndNIR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
index 5ca29341b8..d820d9c6d9 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
@@ -171,7 +171,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSatelliteRSR.txx"
+#include "otbSatelliteRSR.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
index 2f955ec20b..3edaee4d7a 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSatelliteRSR_txx
-#define otbSatelliteRSR_txx
+#ifndef otbSatelliteRSR_hxx
+#define otbSatelliteRSR_hxx
 
 #include "otbSatelliteRSR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
index 303eb9267c..dc1934354d 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
@@ -140,7 +140,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialisationFilter.txx"
+#include "otbSpatialisationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
index e96f98153c..192a3e234e 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialisationFilter_txx
-#define otbSpatialisationFilter_txx
+#ifndef otbSpatialisationFilter_hxx
+#define otbSpatialisationFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
index 5039e4359f..8c0284a33e 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
@@ -191,7 +191,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralResponse.txx"
+#include "otbSpectralResponse.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx b/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
index 2363a6417d..5a72ef4bb8 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralResponse_txx
-#define otbSpectralResponse_txx
+#ifndef otbSpectralResponse_hxx
+#define otbSpectralResponse_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index 840f880dbe..daf37852b6 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -296,7 +296,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSurfaceReflectanceToReflectanceFilter.txx"
+#include "otbSurfaceReflectanceToReflectanceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
index 9364b328c4..216676d801 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSurfaceReflectanceToReflectanceFilter_txx
-#define otbSurfaceReflectanceToReflectanceFilter_txx
+#ifndef otbSurfaceReflectanceToReflectanceFilter_hxx
+#define otbSurfaceReflectanceToReflectanceFilter_hxx
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index 1c5e118fe9..95ba5b5514 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -228,7 +228,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapEstimationMethod.txx"
+#include "otbDisparityMapEstimationMethod.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
index c40c36221c..5a13f97a0d 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapEstimationMethod_txx
-#define otbDisparityMapEstimationMethod_txx
+#ifndef otbDisparityMapEstimationMethod_hxx
+#define otbDisparityMapEstimationMethod_hxx
 
 #include "otbDisparityMapEstimationMethod.h"
 #include "itkImageRegistrationMethod.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
index 8a58f4d2f2..7ace7fdb8d 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapMedianFilter.txx"
+#include "otbDisparityMapMedianFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
index f876cfe9ed..6fd7b3b93a 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapMedianFilter_txx
-#define otbDisparityMapMedianFilter_txx
+#ifndef otbDisparityMapMedianFilter_hxx
+#define otbDisparityMapMedianFilter_hxx
 
 #ifdef ITK_USE_CONSOLIDATED_MORPHOLOGY
 #else
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
index ab1eb7d37e..b139e844c4 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -185,7 +185,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapTo3DFilter.txx"
+#include "otbDisparityMapTo3DFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
index 737e9d3937..48e3df23b6 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapTo3DFilter_txx
-#define otbDisparityMapTo3DFilter_txx
+#ifndef otbDisparityMapTo3DFilter_hxx
+#define otbDisparityMapTo3DFilter_hxx
 
 #include "otbDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
index 163d54dc1f..396f7bde25 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -206,7 +206,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapToDEMFilter.txx"
+#include "otbDisparityMapToDEMFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
index fdbbcbaaab..86a9ac5e47 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapToDEMFilter_txx
-#define otbDisparityMapToDEMFilter_txx
+#ifndef otbDisparityMapToDEMFilter_hxx
+#define otbDisparityMapToDEMFilter_hxx
 
 #include "otbDisparityMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
index aa7d1c8ac1..fb7b510276 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityTranslateFilter.txx"
+#include "otbDisparityTranslateFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
index 1d4129959a..2ecbc873e2 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityTranslateFilter_txx
-#define otbDisparityTranslateFilter_txx
+#ifndef otbDisparityTranslateFilter_hxx
+#define otbDisparityTranslateFilter_hxx
 
 #include "otbDisparityTranslateFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
index a300e02bb8..0f1d0c1957 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
@@ -253,7 +253,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFineRegistrationImageFilter.txx"
+#include "otbFineRegistrationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
index 33b4cf4ccf..47b7928081 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFineRegistrationImageFilter_txx
-#define otbFineRegistrationImageFilter_txx
+#ifndef otbFineRegistrationImageFilter_hxx
+#define otbFineRegistrationImageFilter_hxx
 
 #include "otbFineRegistrationImageFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index 085da5cfad..ad2de0bc83 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -190,7 +190,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiDisparityMapTo3DFilter.txx"
+#include "otbMultiDisparityMapTo3DFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
index 5fcab94822..6acf57d3ca 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiDisparityMapTo3DFilter_txx
-#define otbMultiDisparityMapTo3DFilter_txx
+#ifndef otbMultiDisparityMapTo3DFilter_hxx
+#define otbMultiDisparityMapTo3DFilter_hxx
 
 #include "otbMultiDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
index 4ee49f4aec..400c3268d6 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
@@ -159,7 +159,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCCRegistrationFilter.txx"
+#include "otbNCCRegistrationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
index a5518d4cc9..a42ccd3f38 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCCRegistrationFilter_txx
-#define otbNCCRegistrationFilter_txx
+#ifndef otbNCCRegistrationFilter_hxx
+#define otbNCCRegistrationFilter_hxx
 #include "otbNCCRegistrationFilter.h"
 
 namespace otb
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
index 0dd35eae8b..4cda2ec715 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
@@ -193,7 +193,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCCRegistrationFunction.txx"
+#include "otbNCCRegistrationFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
index 1b9687b618..b104a7d9e9 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCCRegistrationFunction_txx
-#define otbNCCRegistrationFunction_txx
+#ifndef otbNCCRegistrationFunction_hxx
+#define otbNCCRegistrationFunction_hxx
 
 #include "vnl/vnl_math.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
index 466b493f6f..bc48ccc2b8 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
@@ -509,7 +509,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPixelWiseBlockMatchingImageFilter.txx"
+#include "otbPixelWiseBlockMatchingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
index c8499025d9..2a61711187 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPixelWiseBlockMatchingImageFilter_txx
-#define otbPixelWiseBlockMatchingImageFilter_txx
+#ifndef otbPixelWiseBlockMatchingImageFilter_hxx
+#define otbPixelWiseBlockMatchingImageFilter_hxx
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index e01d3f6652..4d46b9fccc 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -284,7 +284,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubPixelDisparityImageFilter.txx"
+#include "otbSubPixelDisparityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
index 3250075e4c..32e1baf576 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSubPixelDisparityImageFilter_txx
-#define otbSubPixelDisparityImageFilter_txx
+#ifndef otbSubPixelDisparityImageFilter_hxx
+#define otbSubPixelDisparityImageFilter_hxx
 
 #include "otbSubPixelDisparityImageFilter.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
index 0b9b93e7ff..286b9fc7e5 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
@@ -78,7 +78,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplinesInterpolateDisplacementFieldGenerator.txx"
+#include "otbBSplinesInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
index afc2eb4d61..f5bf50acc4 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_txx
-#define otbBSplinesInterpolateDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_hxx
+#define otbBSplinesInterpolateDisplacementFieldGenerator_hxx
 
 #include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
 // Disabling deprecation warning if on visual
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index 02bedae933..21d1c0d26c 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -132,7 +132,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx"
+#include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
index 39e64ba41b..7a86cebee0 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
-#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_hxx
+#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_hxx
 
 #include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.h"
 #include "itkLandmarkDisplacementFieldSource.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
index 1b701aa480..dea75c6cfe 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
@@ -81,7 +81,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx"
+#include "otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
index 5e1f12d243..5192a8cb66 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
-#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_hxx
+#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_hxx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
index 3ee3175124..63b981a3ee 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
@@ -88,7 +88,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx"
+#include "otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
index 5f8c2a15e5..e66e1a0198 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
-#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_hxx
+#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_hxx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
index 8ae789e0f9..a5d41ae734 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
@@ -76,7 +76,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNearestPointDisplacementFieldGenerator.txx"
+#include "otbNearestPointDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
index e7e29e8b91..19730624b4 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNearestPointDisplacementFieldGenerator_txx
-#define otbNearestPointDisplacementFieldGenerator_txx
+#ifndef otbNearestPointDisplacementFieldGenerator_hxx
+#define otbNearestPointDisplacementFieldGenerator_hxx
 
 #include "otbNearestPointDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
index 393b66ac68..19ebf116fb 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
@@ -79,7 +79,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNearestTransformDisplacementFieldGenerator.txx"
+#include "otbNearestTransformDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
index 4e8000b62c..266f491651 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNearestTransformDisplacementFieldGenerator_txx
-#define otbNearestTransformDisplacementFieldGenerator_txx
+#ifndef otbNearestTransformDisplacementFieldGenerator_hxx
+#define otbNearestTransformDisplacementFieldGenerator_hxx
 
 #include "otbNearestTransformDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
index c3b8d1312e..879d51a6d6 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
@@ -160,7 +160,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToDisplacementFieldGenerator.txx"
+#include "otbPointSetToDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
index 66009e3ff6..28e73fb6f7 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToDisplacementFieldGenerator_txx
-#define otbPointSetToDisplacementFieldGenerator_txx
+#ifndef otbPointSetToDisplacementFieldGenerator_hxx
+#define otbPointSetToDisplacementFieldGenerator_hxx
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
index e399698d79..e411b139aa 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
@@ -100,7 +100,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetWithTransformToDisplacementFieldGenerator.txx"
+#include "otbPointSetWithTransformToDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
index 0fbebc3f2b..d0bdb0d50e 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_txx
-#define otbPointSetWithTransformToDisplacementFieldGenerator_txx
+#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_hxx
+#define otbPointSetWithTransformToDisplacementFieldGenerator_hxx
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
index c283d48473..52128fc0fc 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
@@ -184,7 +184,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAdhesionCorrectionFilter.txx"
+#include "otbAdhesionCorrectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
index 831ddbbd0b..5397853bb2 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAdhesionCorrectionFilter_txx
-#define otbAdhesionCorrectionFilter_txx
+#ifndef otbAdhesionCorrectionFilter_hxx
+#define otbAdhesionCorrectionFilter_hxx
 
 #include "otbAdhesionCorrectionFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
index 1f376f666d..0d86483ba5 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBijectionCoherencyFilter.txx"
+#include "otbBijectionCoherencyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
index 7bef0a97de..201273cfe2 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBijectionCoherencyFilter_txx
-#define otbBijectionCoherencyFilter_txx
+#ifndef otbBijectionCoherencyFilter_hxx
+#define otbBijectionCoherencyFilter_hxx
 
 #include "otbBijectionCoherencyFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
index 0f18ecb306..3e9cfd5d04 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
@@ -109,7 +109,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineOfSightOptimizer.txx"
+#include "otbLineOfSightOptimizer.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
index 83674d6984..bf20e358db 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineOfSightOptimizer_txx
-#define otbLineOfSightOptimizer_txx
+#ifndef otbLineOfSightOptimizer_hxx
+#define otbLineOfSightOptimizer_hxx
 
 #include "otbLineOfSightOptimizer.h"
 
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index 9818ce81aa..643350c2ef 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -318,7 +318,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMulti3DMapToDEMFilter.txx"
+#include "otbMulti3DMapToDEMFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
index a1f8d45ea3..fd58e1a132 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMulti3DMapToDEMFilter_txx
-#define otbMulti3DMapToDEMFilter_txx
+#ifndef otbMulti3DMapToDEMFilter_hxx
+#define otbMulti3DMapToDEMFilter_hxx
 
 #include "otbMulti3DMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index c5dcde360c..078af7edb4 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -251,7 +251,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStereoSensorModelToElevationMapFilter.txx"
+#include "otbStereoSensorModelToElevationMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
index 9ea41b6efb..b847999ea8 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStereoSensorModelToElevationMapFilter_txx
-#define otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_hxx
+#define otbStereoSensorModelToElevationMapFilter_hxx
 
 #include "otbStereoSensorModelToElevationMapFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
index 37eb7ad7bc..8d60cc2d61 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
@@ -229,7 +229,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStereorectificationDisplacementFieldSource.txx"
+#include "otbStereorectificationDisplacementFieldSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
index 8e4c179c83..a3fedbf970 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStereoSensorModelToElevationMapFilter_txx
-#define otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_hxx
+#define otbStereoSensorModelToElevationMapFilter_hxx
 
 #include "otbStereorectificationDisplacementFieldSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
index a45b596142..dfc2d58be5 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
@@ -136,7 +136,7 @@ private:
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelObjectOpeningMuParserFilter.txx"
+#include "otbLabelObjectOpeningMuParserFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
index f6f2bd605f..94964df858 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelObjectOpeningMuParserFilter_txx
-#define otbLabelObjectOpeningMuParserFilter_txx
+#ifndef otbLabelObjectOpeningMuParserFilter_hxx
+#define otbLabelObjectOpeningMuParserFilter_hxx
 
 #include "otbLabelObjectOpeningMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index a81aabc5cb..fe78b20de9 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -254,7 +254,7 @@ public:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx"
+#include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
index 08dff3c3dd..d0ee081daf 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
-#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
+#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_hxx
+#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_hxx
 
 #include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h"
 #include "otbVectorDataTransformFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
index df55b8a0dd..0d334e79c0 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageRegionMergingFilter.txx"
+#include "otbLabelImageRegionMergingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
index 34b7e59684..23180bc798 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelImageRegionMergingFilter_txx
-#define otbLabelImageRegionMergingFilter_txx
+#ifndef otbLabelImageRegionMergingFilter_hxx
+#define otbLabelImageRegionMergingFilter_hxx
 
 #include "otbLabelImageRegionMergingFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
index 37a02d6111..0438c12fc2 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageRegionPruningFilter.txx"
+#include "otbLabelImageRegionPruningFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
index 498e3dab05..06af2e415b 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelImageRegionPruningFilter_txx
-#define otbLabelImageRegionPruningFilter_txx
+#ifndef otbLabelImageRegionPruningFilter_hxx
+#define otbLabelImageRegionPruningFilter_hxx
 
 #include "otbLabelImageRegionPruningFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index 6132caa2ed..805f091d74 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -141,7 +141,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToOGRDataSourceFilter.txx"
+#include "otbLabelImageToOGRDataSourceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
index 8f714630c7..9b55a9e377 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToOGRDataSourceFilter_txx
-#define otbLabelImageToOGRDataSourceFilter_txx
+#ifndef otbLabelImageToOGRDataSourceFilter_hxx
+#define otbLabelImageToOGRDataSourceFilter_hxx
 
 #include "otbLabelImageToOGRDataSourceFilter.h"
 #include "otbGdalDataTypeBridge.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index 6114156920..f58ea8951f 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToVectorDataFilter.txx"
+#include "otbLabelImageToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
index fdc11febda..de890899e7 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToVectorDataFilter_txx
-#define otbLabelImageToVectorDataFilter_txx
+#ifndef otbLabelImageToVectorDataFilter_hxx
+#define otbLabelImageToVectorDataFilter_hxx
 
 #include "otbLabelImageToVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index d73495a274..28de41fcec 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -129,7 +129,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToVectorDataFilter.txx"
+#include "otbLabelMapToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
index 6cf464cd98..dd8e36087a 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToVectorDataFilter_txx
-#define otbLabelMapToVectorDataFilter_txx
+#ifndef otbLabelMapToVectorDataFilter_hxx
+#define otbLabelMapToVectorDataFilter_hxx
 
 #include "otbLabelMapToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
index 39e612bb81..1f60b2d453 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
@@ -174,7 +174,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataSourceToLabelImageFilter.txx"
+#include "otbOGRDataSourceToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
index 71b45b9026..30c3e9fba8 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataSourceToLabelImageFilter_txx
-#define otbOGRDataSourceToLabelImageFilter_txx
+#ifndef otbOGRDataSourceToLabelImageFilter_hxx
+#define otbOGRDataSourceToLabelImageFilter_hxx
 
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
index 032dd2405b..3119c50d5a 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
@@ -161,7 +161,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToOGRDataFilter.txx"
+#include "otbPersistentImageToOGRDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
index 598033e147..2a668c3ada 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToOGRDataFilter_txx
-#define otbPersistentImageToOGRDataFilter_txx
+#ifndef otbPersistentImageToOGRDataFilter_hxx
+#define otbPersistentImageToOGRDataFilter_hxx
 
 #include "otbPersistentImageToOGRDataFilter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
index ff28b5449c..f2b580dbd4 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToOGRLayerFilter.txx"
+#include "otbPersistentImageToOGRLayerFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
index 29cfa84a63..f059b884ae 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToOGRLayerFilter_txx
-#define otbPersistentImageToOGRLayerFilter_txx
+#ifndef otbPersistentImageToOGRLayerFilter_hxx
+#define otbPersistentImageToOGRLayerFilter_hxx
 
 #include "otbPersistentImageToOGRLayerFilter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
index e5df82c614..288f2fd242 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToVectorDataFilter.txx"
+#include "otbPersistentImageToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
index 3f3191312f..46d7ce8927 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToVectorDataFilter_txx
-#define otbPersistentImageToVectorDataFilter_txx
+#ifndef otbPersistentImageToVectorDataFilter_hxx
+#define otbPersistentImageToVectorDataFilter_hxx
 
 #include "otbPersistentImageToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index d7d5fcc14a..d708f1d995 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -170,7 +170,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbRasterizeVectorDataFilter.txx"
+#include "otbRasterizeVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
index b3c2d3fd16..c140348c04 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRasterizeVectorDataFilter_txx
-#define otbRasterizeVectorDataFilter_txx
+#ifndef otbRasterizeVectorDataFilter_hxx
+#define otbRasterizeVectorDataFilter_hxx
 
 #include "otbRasterizeVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index 1d71405438..cede7a2f5a 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -187,7 +187,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelImageFilter.txx"
+#include "otbVectorDataToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
index 549b9612a5..49afc91079 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelImageFilter_txx
-#define otbVectorDataToLabelImageFilter_txx
+#ifndef otbVectorDataToLabelImageFilter_hxx
+#define otbVectorDataToLabelImageFilter_hxx
 
 #include "gdal_alg.h"
 #include "ogr_srs_api.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 405e850eaa..d7dc68971b 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -208,7 +208,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelMapFilter.txx"
+#include "otbVectorDataToLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
index fa29f1bb96..3d6f6b6161 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelMapFilter_txx
-#define otbVectorDataToLabelMapFilter_txx
+#ifndef otbVectorDataToLabelMapFilter_hxx
+#define otbVectorDataToLabelMapFilter_hxx
 
 #include "otbVectorDataToLabelMapFilter.h"
 #include "itkBinaryImageToLabelMapFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index da4e68fa9d..72c9f1b455 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -242,7 +242,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelMapWithAttributesFilter.txx"
+#include "otbVectorDataToLabelMapWithAttributesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
index 1d81abe61e..8aa57fe51e 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelMapWithAttributesFilter_txx
-#define otbVectorDataToLabelMapWithAttributesFilter_txx
+#ifndef otbVectorDataToLabelMapWithAttributesFilter_hxx
+#define otbVectorDataToLabelMapWithAttributesFilter_hxx
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "itkBinaryImageToLabelMapFilter.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
index f283f54ba2..6c02a525f5 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeConfidenceConnectedImageFilter.txx"
+#include "otbLabelizeConfidenceConnectedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
index f4425c4a89..75be6b89f7 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeConfidenceConnectedImageFilter_txx
-#define otbLabelizeConfidenceConnectedImageFilter_txx
+#ifndef otbLabelizeConfidenceConnectedImageFilter_hxx
+#define otbLabelizeConfidenceConnectedImageFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
index 7adcf822b4..ccef3babdd 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
@@ -106,7 +106,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeConnectedThresholdImageFilter.txx"
+#include "otbLabelizeConnectedThresholdImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
index 0caed06cb5..70cc8bd1d1 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeConnectedThresholdImageFilter_txx
-#define otbLabelizeConnectedThresholdImageFilter_txx
+#ifndef otbLabelizeConnectedThresholdImageFilter_hxx
+#define otbLabelizeConnectedThresholdImageFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
index 8ea03f494e..2af1d767b4 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeImageFilterBase.txx"
+#include "otbLabelizeImageFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
index 05aa8497bb..67a6d301b6 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeImageFilterBase_txx
-#define otbLabelizeImageFilterBase_txx
+#ifndef otbLabelizeImageFilterBase_hxx
+#define otbLabelizeImageFilterBase_hxx
 
 #include "otbLabelizeImageFilterBase.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
index 8bd2f766d8..8e00721e69 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeNeighborhoodConnectedImageFilter.txx"
+#include "otbLabelizeNeighborhoodConnectedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
index f639d18be2..f004e6c917 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeNeighborhoodConnectedImageFilter_txx
-#define otbLabelizeNeighborhoodConnectedImageFilter_txx
+#ifndef otbLabelizeNeighborhoodConnectedImageFilter_hxx
+#define otbLabelizeNeighborhoodConnectedImageFilter_hxx
 
 #include "otbLabelizeNeighborhoodConnectedImageFilter.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
index 9b01f4b315..6f395e8a3c 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbRelabelComponentImageFilter.txx"
+#include "otbRelabelComponentImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
index 7cb9b1c938..0f969ceaad 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRelabelComponentImageFilter_txx
-#define otbRelabelComponentImageFilter_txx
+#ifndef otbRelabelComponentImageFilter_hxx
+#define otbRelabelComponentImageFilter_hxx
 
 #include "otbRelabelComponentImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
index b065125bc7..b4bb5dae13 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
@@ -151,7 +151,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftConnectedComponentSegmentationFilter.txx"
+#include "otbMeanShiftConnectedComponentSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
index d2729b2a7f..ba8d6b07f0 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMeanShiftConnectedComponentSegmentationFilter_txx
-#define otbMeanShiftConnectedComponentSegmentationFilter_txx
+#ifndef otbMeanShiftConnectedComponentSegmentationFilter_hxx
+#define otbMeanShiftConnectedComponentSegmentationFilter_hxx
 
 #include "otbMeanShiftConnectedComponentSegmentationFilter.h"
 #include "itkExtractImageFilter.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
index 992e777297..99d7ab975a 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
@@ -191,7 +191,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftSegmentationFilter.txx"
+#include "otbMeanShiftSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
index 4ab8355cd9..2cbf159b6a 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMeanShiftSegmentationFilter_txx
-#define otbMeanShiftSegmentationFilter_txx
+#ifndef otbMeanShiftSegmentationFilter_hxx
+#define otbMeanShiftSegmentationFilter_hxx
 
 #include "otbMeanShiftSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
index cae56e1625..5edef4f6d7 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
@@ -281,7 +281,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHooverInstanceFilter.txx"
+#include "otbHooverInstanceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
index 26e2e80ce7..7c72d89d9e 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHooverInstanceFilter_txx
-#define otbHooverInstanceFilter_txx
+#ifndef otbHooverInstanceFilter_hxx
+#define otbHooverInstanceFilter_hxx
 
 #include "otbHooverInstanceFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
index efedebd57f..40bcd6ee95 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
@@ -119,7 +119,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHooverMatrixFilter.txx"
+#include "otbHooverMatrixFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
index 1acca78879..d4863c6cfc 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHooverMatrixFilter_txx
-#define otbHooverMatrixFilter_txx
+#ifndef otbHooverMatrixFilter_hxx
+#define otbHooverMatrixFilter_hxx
 
 #include "otbHooverMatrixFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
index 3805d42514..1dd484e53d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
@@ -98,6 +98,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClosingOpeningMorphologicalFilter.txx"
+#include "otbClosingOpeningMorphologicalFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
index ac7fa0c080..9624d10ad7 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbClosingOpeningMorphologicalFilter_txx
-#define otbClosingOpeningMorphologicalFilter_txx
+#ifndef otbClosingOpeningMorphologicalFilter_hxx
+#define otbClosingOpeningMorphologicalFilter_hxx
 
 #include "otbClosingOpeningMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index e06bc3c886..4b2ef4d9bd 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -183,7 +183,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeodesicMorphologyDecompositionImageFilter.txx"
+#include "otbGeodesicMorphologyDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
index 5c56cbb992..514b4e0e56 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeodesicMorphologyDecompositionImageFilter_txx
-#define otbGeodesicMorphologyDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyDecompositionImageFilter_hxx
+#define otbGeodesicMorphologyDecompositionImageFilter_hxx
 
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index 91d51758e8..3658cd4cd9 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -156,7 +156,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.txx"
+#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
index de79d9ee78..3c6425a009 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
-#define otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_hxx
+#define otbGeodesicMorphologyIterativeDecompositionImageFilter_hxx
 
 #include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
index d8c0718291..061859b87b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
@@ -121,7 +121,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToProfileFilter.txx"
+#include "otbImageToProfileFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
index ac6ec11d87..f29d085429 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToProfileFilter_txx
-#define otbImageToProfileFilter_txx
+#ifndef otbImageToProfileFilter_hxx
+#define otbImageToProfileFilter_hxx
 
 #include "otbImageToProfileFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
index f61f87fc82..f2fb9c8fc7 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
@@ -130,7 +130,7 @@ double       m_Sigma;
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalProfilesSegmentationFilter.txx"
+#include "otbMorphologicalProfilesSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
index 864dac1cc6..11a772035d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalProfilesSegmentationFilter_txx
-#define otbMorphologicalProfilesSegmentationFilter_txx
+#ifndef otbMorphologicalProfilesSegmentationFilter_hxx
+#define otbMorphologicalProfilesSegmentationFilter_hxx
 
 #include "otbMorphologicalProfilesSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
index 7cd8ef6b6e..584362aebc 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
@@ -98,6 +98,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOpeningClosingMorphologicalFilter.txx"
+#include "otbOpeningClosingMorphologicalFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
index 7d6d011d29..fc3f05561c 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOpeningClosingMorphologicalFilter_txx
-#define otbOpeningClosingMorphologicalFilter_txx
+#ifndef otbOpeningClosingMorphologicalFilter_hxx
+#define otbOpeningClosingMorphologicalFilter_hxx
 
 #include "otbOpeningClosingMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 489773f83a..f68a4e0272 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -118,7 +118,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx"
+#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
index 5b112476fb..f95cd23a37 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
-#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_hxx
+#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_hxx
 
 #include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index 6d292404b1..80230dff77 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -104,7 +104,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProfileToProfileDerivativeFilter.txx"
+#include "otbProfileToProfileDerivativeFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
index faedadd07c..e404d4a27a 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProfileToProfileDerivativeFilter_txx
-#define otbProfileToProfileDerivativeFilter_txx
+#ifndef otbProfileToProfileDerivativeFilter_hxx
+#define otbProfileToProfileDerivativeFilter_hxx
 
 #include "otbProfileToProfileDerivativeFilter.h"
 
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index e1b35d1d12..b3702ad155 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRLayerStreamStitchingFilter.txx"
+#include "otbOGRLayerStreamStitchingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
index 7ca556f7b9..5359e967bf 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRLayerStreamStitchingFilter_txx
-#define otbOGRLayerStreamStitchingFilter_txx
+#ifndef otbOGRLayerStreamStitchingFilter_hxx
+#define otbOGRLayerStreamStitchingFilter_hxx
 
 #include "otbOGRLayerStreamStitchingFilter.h"
 #include "itkContinuousIndex.h"
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index 0a908dd9d2..4ca6087be8 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -360,7 +360,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingImageToOGRLayerSegmentationFilter.txx"
+#include "otbStreamingImageToOGRLayerSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
index 86e702cb13..26b08df09e 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingImageToOGRLayerSegmentationFilter_txx
-#define otbStreamingImageToOGRLayerSegmentationFilter_txx
+#ifndef otbStreamingImageToOGRLayerSegmentationFilter_hxx
+#define otbStreamingImageToOGRLayerSegmentationFilter_hxx
 
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index 32239f115a..5e7a124a3f 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -97,7 +97,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWatershedSegmentationFilter.txx"
+#include "otbWatershedSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
index b439f141e8..078dc954f1 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWatershedSegmentationFilter_txx
-#define otbWatershedSegmentationFilter_txx
+#ifndef otbWatershedSegmentationFilter_hxx
+#define otbWatershedSegmentationFilter_hxx
 
 #include "otbWatershedSegmentationFilter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
index 0894f663e6..be80a2386d 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
@@ -1150,7 +1150,7 @@ private:
 
 
 //#ifndef OTB_MANUAL_INSTANTIATION
-//#include "otbWrapperApplication.txx"
+//#include "otbWrapperApplication.hxx"
 //#endif
 
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
index 79b714a22b..e98fe963ac 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
@@ -143,7 +143,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWrapperComplexInputImageParameter.txx"
+#include "otbWrapperComplexInputImageParameter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
index 86dd38fdc9..d4488055ab 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperComplexInputImageParameter_txx
-#define otbWrapperComplexInputImageParameter_txx
+#ifndef otbWrapperComplexInputImageParameter_hxx
+#define otbWrapperComplexInputImageParameter_hxx
 
 #include "otbWrapperComplexInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index eb64c66a8a..19b88d40ce 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -171,7 +171,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWrapperInputImageParameter.txx"
+#include "otbWrapperInputImageParameter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
index 72a3794cdd..634193bee1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperInputImageParameter_txx
-#define otbWrapperInputImageParameter_txx
+#ifndef otbWrapperInputImageParameter_hxx
+#define otbWrapperInputImageParameter_hxx
 
 #include "otbWrapperInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
index 90665af66b..07169d9ad1 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
@@ -199,7 +199,7 @@ protected:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbWrapperParameterList.txx"
+# include "otbWrapperParameterList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
index da857bcbf8..c5d48e5aba 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperParameterList_txx
-#define otbWrapperParameterList_txx
+#ifndef otbWrapperParameterList_hxx
+#define otbWrapperParameterList_hxx
 
 
 #include <algorithm>
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
index 0cb7482973..37dbd86621 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
@@ -90,7 +90,7 @@ private:
 }
 
 //#ifndef OTB_MANUAL_INSTANTIATION
-//#include "otbWrapperProxyParameter.txx"
+//#include "otbWrapperProxyParameter.hxx"
 //#endif
 
 #endif
diff --git a/Utilities/Doxygen/doxygen.config.in b/Utilities/Doxygen/doxygen.config.in
index c77823e62a..e140ef2bcd 100644
--- a/Utilities/Doxygen/doxygen.config.in
+++ b/Utilities/Doxygen/doxygen.config.in
@@ -773,7 +773,7 @@ INPUT_ENCODING         = UTF-8
 
 FILE_PATTERNS          = *.cxx \
                          *.h \
-                         *.txx \
+                         *.hxx \
                          *.hxx \
                          *.dox
 
diff --git a/Utilities/Maintenance/BuildHeaderTest.py b/Utilities/Maintenance/BuildHeaderTest.py
index 8b4403b07b..b1c116f4e1 100644
--- a/Utilities/Maintenance/BuildHeaderTest.py
+++ b/Utilities/Maintenance/BuildHeaderTest.py
@@ -108,9 +108,9 @@ def main():
         else:
             max_idx = added_header_idx + maximum_number_of_headers
         for i in range(added_header_idx, max_idx):
-            # Use the .hxx or .txx if possible.
+            # Use the .hxx or .hxx if possible.
+            hxx_file = h_files[i][:-1] + 'hxx'
             hxx_file = h_files[i][:-1] + 'hxx'
-            txx_file = h_files[i][:-1] + 'txx'
             # Files that include VTK headers need to link to VTK.
             if h_files[i] in BANNED_HEADERS or h_files[i].lower().find('vtk') != -1:
                 to_include = '// #include "' + h_files[i] + '" // Banned in BuildHeaderTest.py\n'
@@ -118,8 +118,8 @@ def main():
                 hxx_file)):
                 to_include = '#include "' + hxx_file + '"\n'
             elif os.path.exists(os.path.join(module_source_path, 'include',
-                txx_file)):
-                to_include = '#include "' + txx_file + '"\n'
+                hxx_file)):
+                to_include = '#include "' + hxx_file + '"\n'
             else:
                 to_include = '#include "' + h_files[i] + '"\n'
 
-- 
GitLab