From 8ec2fd2b4736e968fff36fb6911483644e137c14 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Mon, 1 Sep 2008 16:20:52 +0000
Subject: [PATCH] STYLE: double __ in ifdef

---
 Code/BasicFilters/otbBSplineDecompositionImageFilter.txx      | 4 ++--
 Code/BasicFilters/otbBSplineInterpolateImageFunction.txx      | 4 ++--
 .../otbBinaryImageMinimalBoundingRegionCalculator.h           | 4 ++--
 .../otbBinaryImageMinimalBoundingRegionCalculator.txx         | 4 ++--
 Code/BasicFilters/otbChangeLabelImageFilter.h                 | 4 ++--
 Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h      | 4 ++--
 Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx    | 4 ++--
 Code/BasicFilters/otbConvolutionImageFilter.txx               | 4 ++--
 Code/BasicFilters/otbFunctionToImageFilter.txx                | 4 ++--
 Code/BasicFilters/otbImageListToImageListApplyFilter.h        | 4 ++--
 Code/BasicFilters/otbImageListToImageListApplyFilter.txx      | 4 ++--
 Code/BasicFilters/otbImageListToVectorImageFilter.h           | 4 ++--
 Code/BasicFilters/otbImageListToVectorImageFilter.txx         | 4 ++--
 Code/BasicFilters/otbImageToPointSetFilter.txx                | 4 ++--
 Code/BasicFilters/otbImportGeoInformationImageFilter.h        | 4 ++--
 Code/BasicFilters/otbImportGeoInformationImageFilter.txx      | 4 ++--
 Code/BasicFilters/otbImportImageFilter.txx                    | 4 ++--
 Code/BasicFilters/otbImportVectorImageFilter.txx              | 4 ++--
 Code/BasicFilters/otbInverseLogPolarTransform.h               | 4 ++--
 Code/BasicFilters/otbInverseLogPolarTransform.txx             | 4 ++--
 Code/BasicFilters/otbLogPolarTransform.h                      | 4 ++--
 Code/BasicFilters/otbLogPolarTransform.txx                    | 4 ++--
 Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h      | 4 ++--
 Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx    | 4 ++--
 Code/BasicFilters/otbPerBandVectorImageFilter.h               | 4 ++--
 Code/BasicFilters/otbPerBandVectorImageFilter.txx             | 4 ++--
 Code/BasicFilters/otbProlateInterpolateImageFunction.h        | 4 ++--
 Code/BasicFilters/otbProlateInterpolateImageFunction.txx      | 4 ++--
 Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx         | 4 ++--
 Code/BasicFilters/otbRationalQuotientResampleImageFilter.h    | 4 ++--
 Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx    | 4 ++--
 Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h       | 4 ++--
 Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx     | 4 ++--
 .../otbStreamingMatrixTransposeMatrixImageFilter.txx          | 4 ++--
 Code/BasicFilters/otbStreamingResampleImageFilter.txx         | 4 ++--
 Code/BasicFilters/otbStreamingShrinkImageFilter.h             | 4 ++--
 Code/BasicFilters/otbStreamingShrinkImageFilter.txx           | 4 ++--
 Code/BasicFilters/otbStreamingStatisticsImageFilter.txx       | 4 ++--
 Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx | 4 ++--
 Code/BasicFilters/otbVarianceImageFilter.txx                  | 4 ++--
 Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h       | 4 ++--
 Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx     | 4 ++--
 Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h      | 4 ++--
 Code/BasicFilters/otbVectorImageToImageListFilter.h           | 4 ++--
 Code/BasicFilters/otbVectorImageToImageListFilter.txx         | 4 ++--
 Code/BasicFilters/otbVectorImageToIntensityImageFilter.h      | 4 ++--
 Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx    | 4 ++--
 Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx    | 4 ++--
 .../otbWindowedSincInterpolateImageBlackmanFunction.h         | 4 ++--
 .../otbWindowedSincInterpolateImageCosineFunction.h           | 4 ++--
 .../otbWindowedSincInterpolateImageFunctionBase.h             | 4 ++--
 .../otbWindowedSincInterpolateImageFunctionBase.txx           | 4 ++--
 .../otbWindowedSincInterpolateImageGaussianFunction.h         | 4 ++--
 .../otbWindowedSincInterpolateImageHammingFunction.h          | 4 ++--
 .../otbWindowedSincInterpolateImageLanczosFunction.h          | 4 ++--
 .../otbWindowedSincInterpolateImageWelchFunction.h            | 4 ++--
 .../otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx  | 4 ++--
 Code/Common/otbArcSpatialObject.h                             | 4 ++--
 Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx       | 4 ++--
 Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx | 4 ++--
 Code/Common/otbDataNode.h                                     | 4 ++--
 Code/Common/otbDataNode.txx                                   | 4 ++--
 Code/Common/otbDifferenceImageFilter.txx                      | 4 ++--
 Code/Common/otbExtractROI.txx                                 | 4 ++--
 Code/Common/otbExtractROIBase.txx                             | 4 ++--
 Code/Common/otbGenericInterpolateImageFunction.h              | 4 ++--
 Code/Common/otbGenericInterpolateImageFunction.txx            | 4 ++--
 Code/Common/otbHistogramStatisticsFunction.txx                | 4 ++--
 Code/Common/otbImageList.h                                    | 4 ++--
 Code/Common/otbImageList.txx                                  | 4 ++--
 Code/Common/otbImageListSource.h                              | 4 ++--
 Code/Common/otbImageListSource.txx                            | 4 ++--
 Code/Common/otbImageListToImageFilter.h                       | 4 ++--
 Code/Common/otbImageListToImageFilter.txx                     | 4 ++--
 Code/Common/otbImageListToImageListFilter.h                   | 4 ++--
 Code/Common/otbImageListToImageListFilter.txx                 | 4 ++--
 .../otbImageRegionNonUniformMultidimensionalSplitter.txx      | 4 ++--
 Code/Common/otbImageRegionTileMapSplitter.txx                 | 4 ++--
 Code/Common/otbImageToImageListFilter.h                       | 4 ++--
 Code/Common/otbImageToImageListFilter.txx                     | 4 ++--
 Code/Common/otbImageToLineSpatialObjectListFilter.h           | 4 ++--
 Code/Common/otbImageToLineSpatialObjectListFilter.txx         | 4 ++--
 Code/Common/otbLineSpatialObject.h                            | 4 ++--
 Code/Common/otbLineSpatialObjectList.h                        | 4 ++--
 Code/Common/otbList.h                                         | 4 ++--
 Code/Common/otbList.txx                                       | 4 ++--
 Code/Common/otbMultiChannelExtractROI.txx                     | 4 ++--
 Code/Common/otbMultiToMonoChannelExtractROI.txx               | 4 ++--
 Code/Common/otbObjectList.h                                   | 4 ++--
 Code/Common/otbObjectList.txx                                 | 4 ++--
 Code/Common/otbPathFunction.h                                 | 4 ++--
 Code/Common/otbPathFunction.txx                               | 4 ++--
 Code/Common/otbPathListSource.h                               | 4 ++--
 Code/Common/otbPathListSource.txx                             | 4 ++--
 Code/Common/otbPathListToHistogramGenerator.txx               | 2 +-
 Code/Common/otbPathListToPathListFilter.h                     | 4 ++--
 Code/Common/otbPathListToPathListFilter.txx                   | 4 ++--
 Code/Common/otbPersistentFilterStreamingDecorator.h           | 4 ++--
 Code/Common/otbPersistentFilterStreamingDecorator.txx         | 4 ++--
 Code/Common/otbPersistentImageFilter.h                        | 4 ++--
 Code/Common/otbPointSetAndValuesFunction.h                    | 4 ++--
 Code/Common/otbPointSetSource.h                               | 4 ++--
 Code/Common/otbPointSetSource.txx                             | 4 ++--
 Code/Common/otbPolyLineImageConstIterator.h                   | 4 ++--
 Code/Common/otbPolyLineImageConstIterator.txx                 | 4 ++--
 Code/Common/otbPolyLineImageIterator.h                        | 4 ++--
 Code/Common/otbPolyLineParametricPathWithValue.h              | 4 ++--
 Code/Common/otbPolygon.h                                      | 4 ++--
 Code/Common/otbPolygon.txx                                    | 4 ++--
 Code/Common/otbSpatialObjectSource.h                          | 4 ++--
 Code/Common/otbSpatialObjectSource.txx                        | 4 ++--
 Code/Common/otbStreamingTraits.h                              | 4 ++--
 Code/Common/otbStreamingTraits.txx                            | 4 ++--
 Code/Common/otbSystem.h                                       | 4 ++--
 Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx        | 4 ++--
 Code/Common/otbVectorData.h                                   | 4 ++--
 Code/Common/otbVectorData.txx                                 | 4 ++--
 .../otbBSplinesInterpolateDeformationFieldGenerator.h         | 4 ++--
 .../otbBSplinesInterpolateDeformationFieldGenerator.txx       | 4 ++--
 ...otbBSplinesInterpolateTransformDeformationFieldGenerator.h | 4 ++--
 ...bBSplinesInterpolateTransformDeformationFieldGenerator.txx | 4 ++--
 Code/DisparityMap/otbDisparityMapEstimationMethod.h           | 4 ++--
 Code/DisparityMap/otbDisparityMapEstimationMethod.txx         | 4 ++--
 ...NNearestPointsLinearInterpolateDeformationFieldGenerator.h | 4 ++--
 ...earestPointsLinearInterpolateDeformationFieldGenerator.txx | 4 ++--
 ...restTransformsLinearInterpolateDeformationFieldGenerator.h | 4 ++--
 ...stTransformsLinearInterpolateDeformationFieldGenerator.txx | 4 ++--
 Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h  | 4 ++--
 .../DisparityMap/otbNearestPointDeformationFieldGenerator.txx | 4 ++--
 .../otbNearestTransformDeformationFieldGenerator.h            | 4 ++--
 .../otbNearestTransformDeformationFieldGenerator.txx          | 4 ++--
 Code/DisparityMap/otbPointSetBasedResamplingFilter.h          | 4 ++--
 Code/DisparityMap/otbPointSetBasedResamplingFilter.txx        | 4 ++--
 Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h    | 4 ++--
 Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx  | 4 ++--
 .../otbPointSetWithTransformToDeformationFieldGenerator.h     | 4 ++--
 .../otbPointSetWithTransformToDeformationFieldGenerator.txx   | 4 ++--
 Code/FeatureExtraction/otbBreakAngularPathListFilter.h        | 4 ++--
 Code/FeatureExtraction/otbBreakAngularPathListFilter.txx      | 4 ++--
 Code/FeatureExtraction/otbCompacityPathFunction.h             | 4 ++--
 Code/FeatureExtraction/otbCompacityPathFunction.txx           | 4 ++--
 Code/FeatureExtraction/otbComplexMomentImageFunction.h        | 4 ++--
 Code/FeatureExtraction/otbComplexMomentImageFunction.txx      | 4 ++--
 Code/FeatureExtraction/otbComplexMomentPathFunction.h         | 4 ++--
 Code/FeatureExtraction/otbComplexMomentPathFunction.txx       | 4 ++--
 Code/FeatureExtraction/otbFlusserImageFunction.h              | 4 ++--
 Code/FeatureExtraction/otbFlusserImageFunction.txx            | 4 ++--
 Code/FeatureExtraction/otbFlusserPathFunction.h               | 4 ++--
 Code/FeatureExtraction/otbFlusserPathFunction.txx             | 4 ++--
 .../otbForwardFourierMellinTransformImageFilter.h             | 4 ++--
 .../otbForwardFourierMellinTransformImageFilter.txx           | 4 ++--
 Code/FeatureExtraction/otbGeometricMomentImageFunction.h      | 4 ++--
 Code/FeatureExtraction/otbGeometricMomentPathFunction.h       | 4 ++--
 Code/FeatureExtraction/otbHuImageFunction.h                   | 4 ++--
 Code/FeatureExtraction/otbHuImageFunction.txx                 | 4 ++--
 Code/FeatureExtraction/otbHuPathFunction.h                    | 4 ++--
 Code/FeatureExtraction/otbHuPathFunction.txx                  | 4 ++--
 Code/FeatureExtraction/otbImageToCarvingPathFilter.txx        | 4 ++--
 Code/FeatureExtraction/otbImageToEdgePathFilter.txx           | 4 ++--
 Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h      | 4 ++--
 Code/FeatureExtraction/otbLikehoodPathListFilter.h            | 4 ++--
 Code/FeatureExtraction/otbLikehoodPathListFilter.txx          | 4 ++--
 Code/FeatureExtraction/otbLinkPathListFilter.h                | 4 ++--
 Code/FeatureExtraction/otbLinkPathListFilter.txx              | 4 ++--
 Code/FeatureExtraction/otbLocalHoughFilter.h                  | 4 ++--
 Code/FeatureExtraction/otbLocalHoughFilter.txx                | 4 ++--
 Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h   | 4 ++--
 Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx | 4 ++--
 Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h    | 4 ++--
 Code/FeatureExtraction/otbOrientationPathFunction.h           | 4 ++--
 Code/FeatureExtraction/otbOrientationPathFunction.txx         | 4 ++--
 Code/FeatureExtraction/otbRealMomentImageFunction.h           | 4 ++--
 Code/FeatureExtraction/otbRealMomentPathFunction.h            | 4 ++--
 Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h   | 4 ++--
 Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h      | 4 ++--
 Code/FeatureExtraction/otbRemoveTortuousPathListFilter.txx    | 4 ++--
 Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h        | 4 ++--
 Code/FeatureExtraction/otbRoadExtractionFilter.h              | 4 ++--
 Code/FeatureExtraction/otbRoadExtractionFilter.txx            | 4 ++--
 Code/FeatureExtraction/otbSimplifyPathListFilter.h            | 4 ++--
 Code/FeatureExtraction/otbSimplifyPathListFilter.txx          | 4 ++--
 Code/FeatureExtraction/otbTreeSource.txx                      | 4 ++--
 Code/FeatureExtraction/otbVectorizationPathListFilter.h       | 4 ++--
 Code/FeatureExtraction/otbVectorizationPathListFilter.txx     | 4 ++--
 Code/IO/otbFileName.h                                         | 4 ++--
 Code/IO/otbImageFileReader.txx                                | 4 ++--
 Code/IO/otbImageFileWriter.txx                                | 4 ++--
 Code/IO/otbPrepareSRTMDirectory.h                             | 4 ++--
 Code/IO/otbPrepareSRTMDirectory.txx                           | 4 ++--
 Code/IO/otbSHPVectorDataIOFactory.txx                         | 4 ++--
 Code/IO/otbStreamingImageFileWriter.txx                       | 4 ++--
 Code/IO/otbStreamingImageVirtualWriter.txx                    | 4 ++--
 Code/IO/otbVectorDataIOBase.txx                               | 4 ++--
 Code/IO/otbVectorDataIOFactory.txx                            | 4 ++--
 Code/IO/otbVectorDataSource.txx                               | 4 ++--
 Code/Learning/otbChangeProfileKernelFunctor.h                 | 4 ++--
 Code/Learning/otbChangeProfileKernelFunctor.txx               | 4 ++--
 Code/Learning/otbKMeansImageClassificationFilter.h            | 4 ++--
 Code/Learning/otbKMeansImageClassificationFilter.txx          | 4 ++--
 Code/Learning/otbMixturePolyRBFKernelFunctor.h                | 4 ++--
 Code/Learning/otbMixturePolyRBFKernelFunctor.txx              | 4 ++--
 Code/Learning/otbNonGaussianRBFKernelFunctor.h                | 4 ++--
 Code/Learning/otbNonGaussianRBFKernelFunctor.txx              | 4 ++--
 Code/Learning/otbSOM.h                                        | 4 ++--
 Code/Learning/otbSOM.txx                                      | 4 ++--
 Code/Learning/otbSOMActivationBuilder.h                       | 4 ++--
 Code/Learning/otbSOMActivationBuilder.txx                     | 4 ++--
 Code/Learning/otbSOMImageClassificationFilter.h               | 4 ++--
 Code/Learning/otbSOMImageClassificationFilter.txx             | 4 ++--
 Code/Learning/otbSOMMap.h                                     | 4 ++--
 Code/Learning/otbSOMMap.txx                                   | 4 ++--
 Code/Learning/otbSVMImageClassificationFilter.h               | 4 ++--
 Code/Learning/otbSVMImageClassificationFilter.txx             | 4 ++--
 Code/Learning/otbSVMImageModelEstimator.h                     | 4 ++--
 Code/Learning/otbSVMImageModelEstimator.txx                   | 4 ++--
 Code/Learning/otbSVMKernels.h                                 | 4 ++--
 Code/Learning/otbSVMModel.h                                   | 4 ++--
 Code/Learning/otbSVMModelEstimator.h                          | 4 ++--
 Code/Learning/otbSVMModelEstimator.txx                        | 4 ++--
 Code/Learning/otbSVMPointSetModelEstimator.h                  | 4 ++--
 Code/Learning/otbSVMPointSetModelEstimator.txx                | 4 ++--
 Code/Learning/otbSVMSampleListModelEstimator.h                | 4 ++--
 Code/Learning/otbSVMSampleListModelEstimator.txx              | 4 ++--
 Code/Learning/otbSpectralAngleKernelFunctor.h                 | 4 ++--
 Code/Learning/otbSpectralAngleKernelFunctor.txx               | 4 ++--
 Code/Markov/otbMRFEnergy.h                                    | 4 ++--
 Code/Markov/otbMRFEnergyEdgeFidelity.h                        | 4 ++--
 Code/Markov/otbMRFEnergyGaussian.h                            | 4 ++--
 Code/Markov/otbMRFEnergyGaussianClassification.h              | 4 ++--
 Code/Markov/otbMRFEnergyPotts.h                               | 4 ++--
 Code/Markov/otbMarkovRandomFieldFilter.h                      | 4 ++--
 Code/Markov/otbMarkovRandomFieldFilter.txx                    | 4 ++--
 Code/MultiScale/otbConvexOrConcaveClassificationFilter.h      | 4 ++--
 .../otbGeodesicMorphologyDecompositionImageFilter.h           | 4 ++--
 .../otbGeodesicMorphologyDecompositionImageFilter.txx         | 4 ++--
 .../otbGeodesicMorphologyIterativeDecompositionImageFilter.h  | 4 ++--
 ...otbGeodesicMorphologyIterativeDecompositionImageFilter.txx | 4 ++--
 Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h         | 4 ++--
 Code/MultiScale/otbImageToProfileFilter.h                     | 4 ++--
 Code/MultiScale/otbImageToProfileFilter.txx                   | 4 ++--
 Code/MultiScale/otbMorphologicalClosingProfileFilter.h        | 4 ++--
 Code/MultiScale/otbMorphologicalOpeningProfileFilter.h        | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h       | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx     | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h      | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidResampler.h            | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h   | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSegmenter.h            | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSegmenter.txx          | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h      | 4 ++--
 Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx    | 4 ++--
 .../otbMultiScaleConvexOrConcaveClassificationFilter.h        | 4 ++--
 .../otbProfileDerivativeToMultiScaleCharacteristicsFilter.h   | 4 ++--
 .../otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx | 4 ++--
 Code/MultiScale/otbProfileToProfileDerivativeFilter.h         | 4 ++--
 Code/MultiScale/otbProfileToProfileDerivativeFilter.txx       | 4 ++--
 Code/Projections/otbOrthoRectificationFilter.txx              | 4 ++--
 Code/Projections/otbPlaceNameToLonLat.h                       | 4 ++--
 Code/Projections/otbPlaceNameToLonLat.txx                     | 4 ++--
 Code/Projections/otbPrepareSRTMDirectory.h                    | 4 ++--
 Code/Projections/otbPrepareSRTMDirectory.txx                  | 4 ++--
 Code/Radiometry/otbAtmosphericCorrectionParameters.h          | 4 ++--
 ...sphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h | 4 ++--
 Code/Radiometry/otbAtmosphericRadiativeTerms.h                | 4 ++--
 Code/Radiometry/otbSIXSTraits.h                               | 4 ++--
 .../otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx       | 4 ++--
 Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h         | 4 ++--
 Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx       | 4 ++--
 .../otbImageMultiSegmentationToRCC8GraphFilter.h              | 4 ++--
 .../otbImageMultiSegmentationToRCC8GraphFilter.txx            | 4 ++--
 Code/SpatialReasoning/otbImageToImageRCC8Calculator.h         | 4 ++--
 Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx       | 4 ++--
 Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h     | 4 ++--
 Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx   | 4 ++--
 Code/SpatialReasoning/otbRCC8Edge.h                           | 4 ++--
 Code/SpatialReasoning/otbRCC8EdgeIterator.h                   | 4 ++--
 Code/SpatialReasoning/otbRCC8EdgeIterator.txx                 | 4 ++--
 Code/SpatialReasoning/otbRCC8Graph.h                          | 4 ++--
 Code/SpatialReasoning/otbRCC8Graph.txx                        | 4 ++--
 Code/SpatialReasoning/otbRCC8GraphSource.h                    | 4 ++--
 Code/SpatialReasoning/otbRCC8GraphSource.txx                  | 4 ++--
 Code/SpatialReasoning/otbRCC8InEdgeIterator.h                 | 4 ++--
 Code/SpatialReasoning/otbRCC8InEdgeIterator.txx               | 4 ++--
 Code/SpatialReasoning/otbRCC8OutEdgeIterator.h                | 4 ++--
 Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx              | 4 ++--
 Code/SpatialReasoning/otbRCC8Value.h                          | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexBase.h                     | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexBase.txx                   | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexIterator.h                 | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexIterator.txx               | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexWithCompacity.h            | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx          | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h         | 4 ++--
 Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx       | 4 ++--
 Code/Visu/otbFixedSizeFullImageWidget.h                       | 4 ++--
 Code/Visu/otbFixedSizeFullImageWidget.txx                     | 4 ++--
 Code/Visu/otbFullResolutionImageWidget.h                      | 4 ++--
 Code/Visu/otbFullResolutionImageWidget.txx                    | 4 ++--
 Code/Visu/otbGluPolygonDrawingHelper.h                        | 4 ++--
 Code/Visu/otbHistogramAndTransferFunctionWidget.h             | 4 ++--
 Code/Visu/otbHistogramAndTransferFunctionWidget.txx           | 4 ++--
 Code/Visu/otbImageAlternateViewer.h                           | 4 ++--
 Code/Visu/otbImageAlternateViewer.txx                         | 4 ++--
 Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h            | 4 ++--
 Code/Visu/otbImageViewer.txx                                  | 4 ++--
 Code/Visu/otbImageViewerBase.txx                              | 4 ++--
 Code/Visu/otbImageViewerFullWidget.h                          | 4 ++--
 Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h  | 4 ++--
 Code/Visu/otbImageViewerScrollWidget.h                        | 4 ++--
 Code/Visu/otbImageViewerZoomWidget.h                          | 4 ++--
 Code/Visu/otbImageWidgetBase.h                                | 4 ++--
 Code/Visu/otbImageWidgetBase.txx                              | 4 ++--
 Code/Visu/otbImageWidgetBoxForm.h                             | 4 ++--
 Code/Visu/otbImageWidgetCircleForm.cxx                        | 4 ++--
 Code/Visu/otbImageWidgetCircleForm.h                          | 4 ++--
 Code/Visu/otbImageWidgetFormBase.h                            | 4 ++--
 Code/Visu/otbImageWidgetPointForm.h                           | 4 ++--
 Code/Visu/otbImageWidgetPolygonForm.h                         | 4 ++--
 Code/Visu/otbImageWidgetPolygonForm.txx                       | 4 ++--
 Code/Visu/otbImageWidgetPolylineForm.h                        | 4 ++--
 Code/Visu/otbImageWidgetPolylineForm.txx                      | 4 ++--
 Code/Visu/otbImageWidgetRectangleForm.h                       | 4 ++--
 Code/Visu/otbImageWidgetTransferFunction.h                    | 4 ++--
 Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h    | 4 ++--
 Code/Visu/otbZoomableImageWidget.h                            | 4 ++--
 Code/Visu/otbZoomableImageWidget.txx                          | 4 ++--
 327 files changed, 653 insertions(+), 653 deletions(-)

diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx b/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
index 5e0f9d81f1..8017c5f39f 100755
--- a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
+++ b/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplineDecompositionImageFilter_txx
-#define _otbBSplineDecompositionImageFilter_txx
+#ifndef __otbBSplineDecompositionImageFilter_txx
+#define __otbBSplineDecompositionImageFilter_txx
 #include "otbBSplineDecompositionImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx b/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
index 500efeae1e..a377371794 100755
--- a/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
+++ b/Code/BasicFilters/otbBSplineInterpolateImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplineInterpolateImageFunction_txx
-#define _otbBSplineInterpolateImageFunction_txx
+#ifndef __otbBSplineInterpolateImageFunction_txx
+#define __otbBSplineInterpolateImageFunction_txx
 #include "itkBSplineInterpolateImageFunction.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
index d4790c5824..1f19b00b1e 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBinaryImageMinimalBoundingRegionCalculator_h
-#define _otbBinaryImageMinimalBoundingRegionCalculator_h
+#ifndef __otbBinaryImageMinimalBoundingRegionCalculator_h
+#define __otbBinaryImageMinimalBoundingRegionCalculator_h
 
 #include "itkImageToImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
index 165667b6a0..946468ff7b 100644
--- a/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
+++ b/Code/BasicFilters/otbBinaryImageMinimalBoundingRegionCalculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBinaryImageMinimalBoundingRegionCalculator_txx
-#define _otbBinaryImageMinimalBoundingRegionCalculator_txx
+#ifndef __otbBinaryImageMinimalBoundingRegionCalculator_txx
+#define __otbBinaryImageMinimalBoundingRegionCalculator_txx
 
 #include "otbBinaryImageMinimalBoundingRegionCalculator.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
diff --git a/Code/BasicFilters/otbChangeLabelImageFilter.h b/Code/BasicFilters/otbChangeLabelImageFilter.h
index 13062c51c4..5658a5a717 100644
--- a/Code/BasicFilters/otbChangeLabelImageFilter.h
+++ b/Code/BasicFilters/otbChangeLabelImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbChangeLabelImageFilter_h
-#define _otbChangeLabelImageFilter_h
+#ifndef __otbChangeLabelImageFilter_h
+#define __otbChangeLabelImageFilter_h
 
 #include "itkChangeLabelImageFilter.h"
 
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
index dfcd043a93..32dfaf124b 100644
--- a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
+++ b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbClosingOpeningMorphologicalFilter_h
-#define _otbClosingOpeningMorphologicalFilter_h
+#ifndef __otbClosingOpeningMorphologicalFilter_h
+#define __otbClosingOpeningMorphologicalFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
index 41c51e34a3..0e33f6762f 100644
--- a/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
+++ b/Code/BasicFilters/otbClosingOpeningMorphologicalFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbClosingOpeningMorphologicalFilter_txx
-#define _otbClosingOpeningMorphologicalFilter_txx
+#ifndef __otbClosingOpeningMorphologicalFilter_txx
+#define __otbClosingOpeningMorphologicalFilter_txx
 
 #include "otbClosingOpeningMorphologicalFilter.h"
 
diff --git a/Code/BasicFilters/otbConvolutionImageFilter.txx b/Code/BasicFilters/otbConvolutionImageFilter.txx
index 62281ad666..95bd8133ce 100644
--- a/Code/BasicFilters/otbConvolutionImageFilter.txx
+++ b/Code/BasicFilters/otbConvolutionImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbConvolutionImageFilter_txx
-#define _otbConvolutionImageFilter_txx
+#ifndef __otbConvolutionImageFilter_txx
+#define __otbConvolutionImageFilter_txx
 #include "otbConvolutionImageFilter.h"
 
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Code/BasicFilters/otbFunctionToImageFilter.txx b/Code/BasicFilters/otbFunctionToImageFilter.txx
index 627a7b797a..889a38bd44 100755
--- a/Code/BasicFilters/otbFunctionToImageFilter.txx
+++ b/Code/BasicFilters/otbFunctionToImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFunctionToImageFilter_txx
-#define _otbFunctionToImageFilter_txx
+#ifndef __otbFunctionToImageFilter_txx
+#define __otbFunctionToImageFilter_txx
 
 #include "otbFunctionToImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.h b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
index 3ada81543a..6e5a9cc844 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.h
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageListApplyFilter_h
-#define _otbImageListToImageListApplyFilter_h
+#ifndef __otbImageListToImageListApplyFilter_h
+#define __otbImageListToImageListApplyFilter_h
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
index 7d87062744..16097705e7 100644
--- a/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
+++ b/Code/BasicFilters/otbImageListToImageListApplyFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageListApplyFilter_txx
-#define _otbImageListToImageListApplyFilter_txx
+#ifndef __otbImageListToImageListApplyFilter_txx
+#define __otbImageListToImageListApplyFilter_txx
 
 #include "otbImageListToImageListApplyFilter.h"
 
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.h b/Code/BasicFilters/otbImageListToVectorImageFilter.h
index ac6fdd71c0..529078d9f8 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.h
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToVectorImageFilter_h
-#define _otbImageListToVectorImageFilter_h
+#ifndef __otbImageListToVectorImageFilter_h
+#define __otbImageListToVectorImageFilter_h
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Code/BasicFilters/otbImageListToVectorImageFilter.txx b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
index 4ab358c2e9..20385a7a82 100644
--- a/Code/BasicFilters/otbImageListToVectorImageFilter.txx
+++ b/Code/BasicFilters/otbImageListToVectorImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToVectorImageFilter_txx
-#define _otbImageListToVectorImageFilter_txx
+#ifndef __otbImageListToVectorImageFilter_txx
+#define __otbImageListToVectorImageFilter_txx
 
 #include "otbImageListToVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbImageToPointSetFilter.txx b/Code/BasicFilters/otbImageToPointSetFilter.txx
index cd6f0e53af..81c5278846 100644
--- a/Code/BasicFilters/otbImageToPointSetFilter.txx
+++ b/Code/BasicFilters/otbImageToPointSetFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToPointSetFilter_txx
-#define _otbImageToPointSetFilter_txx
+#ifndef __otbImageToPointSetFilter_txx
+#define __otbImageToPointSetFilter_txx
 
 #include "otbImageToPointSetFilter.h"
 
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.h b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
index f629a543cb..459e8c652b 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.h
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImportGeoInformationImageFilter_h
-#define _otbImportGeoInformationImageFilter_h
+#ifndef __otbImportGeoInformationImageFilter_h
+#define __otbImportGeoInformationImageFilter_h
 
 #include "itkCastImageFilter.h"
 
diff --git a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
index 7c0f2ee692..c57aa35730 100644
--- a/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
+++ b/Code/BasicFilters/otbImportGeoInformationImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImportGeoInformationImageFilter_txx
-#define _otbImportGeoInformationImageFilter_txx
+#ifndef __otbImportGeoInformationImageFilter_txx
+#define __otbImportGeoInformationImageFilter_txx
 
 #include "itkDataObject.h"
 #include "otbImportGeoInformationImageFilter.h"
diff --git a/Code/BasicFilters/otbImportImageFilter.txx b/Code/BasicFilters/otbImportImageFilter.txx
index 434228306f..c0bc913629 100644
--- a/Code/BasicFilters/otbImportImageFilter.txx
+++ b/Code/BasicFilters/otbImportImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImportImageFilter_txx
-#define _otbImportImageFilter_txx
+#ifndef __otbImportImageFilter_txx
+#define __otbImportImageFilter_txx
 
 #include "otbImportImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Code/BasicFilters/otbImportVectorImageFilter.txx b/Code/BasicFilters/otbImportVectorImageFilter.txx
index 67a6528986..ffc268e213 100644
--- a/Code/BasicFilters/otbImportVectorImageFilter.txx
+++ b/Code/BasicFilters/otbImportVectorImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImportVectorImageFilter_txx
-#define _otbImportVectorImageFilter_txx
+#ifndef __otbImportVectorImageFilter_txx
+#define __otbImportVectorImageFilter_txx
 
 #include "otbImportVectorImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.h b/Code/BasicFilters/otbInverseLogPolarTransform.h
index ea88a362d8..d26ed34fd9 100644
--- a/Code/BasicFilters/otbInverseLogPolarTransform.h
+++ b/Code/BasicFilters/otbInverseLogPolarTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbInverseLogPolarTransform_h
-#define _otbInverseLogPolarTransform_h
+#ifndef __otbInverseLogPolarTransform_h
+#define __otbInverseLogPolarTransform_h
 
 #include "itkTransform.h"
 
diff --git a/Code/BasicFilters/otbInverseLogPolarTransform.txx b/Code/BasicFilters/otbInverseLogPolarTransform.txx
index b683207940..e9a947bbae 100644
--- a/Code/BasicFilters/otbInverseLogPolarTransform.txx
+++ b/Code/BasicFilters/otbInverseLogPolarTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbInverseLogPolarTransform_txx
-#define _otbInverseLogPolarTransform_txx
+#ifndef __otbInverseLogPolarTransform_txx
+#define __otbInverseLogPolarTransform_txx
 
 #include "otbInverseLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbLogPolarTransform.h b/Code/BasicFilters/otbLogPolarTransform.h
index 62f8e4cd90..90b8b93769 100644
--- a/Code/BasicFilters/otbLogPolarTransform.h
+++ b/Code/BasicFilters/otbLogPolarTransform.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLogPolarTransform_h
-#define _otbLogPolarTransform_h
+#ifndef __otbLogPolarTransform_h
+#define __otbLogPolarTransform_h
 
 #include "itkTransform.h"
 
diff --git a/Code/BasicFilters/otbLogPolarTransform.txx b/Code/BasicFilters/otbLogPolarTransform.txx
index a488072368..865ffcf522 100644
--- a/Code/BasicFilters/otbLogPolarTransform.txx
+++ b/Code/BasicFilters/otbLogPolarTransform.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLogPolarTransform_txx
-#define _otbLogPolarTransform_txx
+#ifndef __otbLogPolarTransform_txx
+#define __otbLogPolarTransform_txx
 
 #include "otbLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
index 8ac2fc7f4c..2ce8209357 100644
--- a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
+++ b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbOpeningClosingMorphologicalFilter_h
-#define _otbOpeningClosingMorphologicalFilter_h
+#ifndef __otbOpeningClosingMorphologicalFilter_h
+#define __otbOpeningClosingMorphologicalFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
index 3b2227c634..a4be11706d 100644
--- a/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
+++ b/Code/BasicFilters/otbOpeningClosingMorphologicalFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbOpeningClosingMorphologicalFilter_txx
-#define _otbOpeningClosingMorphologicalFilter_txx
+#ifndef __otbOpeningClosingMorphologicalFilter_txx
+#define __otbOpeningClosingMorphologicalFilter_txx
 
 #include "otbOpeningClosingMorphologicalFilter.h"
 
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.h b/Code/BasicFilters/otbPerBandVectorImageFilter.h
index 3661cdd281..5dd0c50b55 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.h
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPerBandVectorImageFilter_h
-#define _otbPerBandVectorImageFilter_h
+#ifndef __otbPerBandVectorImageFilter_h
+#define __otbPerBandVectorImageFilter_h
 
 #include "otbVectorImageToImageListFilter.h"
 #include "otbImageListToImageListApplyFilter.h"
diff --git a/Code/BasicFilters/otbPerBandVectorImageFilter.txx b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
index 963263a527..ebb852e8b4 100644
--- a/Code/BasicFilters/otbPerBandVectorImageFilter.txx
+++ b/Code/BasicFilters/otbPerBandVectorImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPerBandVectorImageFilter_txx
-#define _otbPerBandVectorImageFilter_txx
+#ifndef __otbPerBandVectorImageFilter_txx
+#define __otbPerBandVectorImageFilter_txx
 
 #include "otbPerBandVectorImageFilter.h"
 
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.h b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
index bdbcf3fd3e..cb7b750a49 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.h
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProlateInterpolateImageFunction_h
-#define _otbProlateInterpolateImageFunction_h
+#ifndef __otbProlateInterpolateImageFunction_h
+#define __otbProlateInterpolateImageFunction_h
 
 #include "otbGenericInterpolateImageFunction.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
index 3e9d108d37..3d824a06be 100644
--- a/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
+++ b/Code/BasicFilters/otbProlateInterpolateImageFunction.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProlateInterpolateImageFunction_txx
-#define _otbProlateInterpolateImageFunction_txx
+#ifndef __otbProlateInterpolateImageFunction_txx
+#define __otbProlateInterpolateImageFunction_txx
 
 #include "otbProlateInterpolateImageFunction.h"
 
diff --git a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
index cde1c4c275..bc7552f831 100755
--- a/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
+++ b/Code/BasicFilters/otbQuaternaryFunctorImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbQuaternaryFunctorImageFilter_txx
-#define _otbQuaternaryFunctorImageFilter_txx
+#ifndef __otbQuaternaryFunctorImageFilter_txx
+#define __otbQuaternaryFunctorImageFilter_txx
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbRationalQuotientResampleImageFilter.h b/Code/BasicFilters/otbRationalQuotientResampleImageFilter.h
index 153caf25cb..3ebd66c867 100644
--- a/Code/BasicFilters/otbRationalQuotientResampleImageFilter.h
+++ b/Code/BasicFilters/otbRationalQuotientResampleImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRationalQuotientResampleImageFilter_h
-#define _otbRationalQuotientResampleImageFilter_h
+#ifndef __otbRationalQuotientResampleImageFilter_h
+#define __otbRationalQuotientResampleImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkExpandImageFilter.h"
diff --git a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
index 8be1962323..f43e6b24a1 100644
--- a/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
+++ b/Code/BasicFilters/otbSpatialObjectToImageDrawingFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpatialObjectToImageDrawingFilter_txx
-#define _otbSpatialObjectToImageDrawingFilter_txx
+#ifndef __otbSpatialObjectToImageDrawingFilter_txx
+#define __otbSpatialObjectToImageDrawingFilter_txx
 
 #include "otbSpatialObjectToImageDrawingFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
index dd6a86899a..dc0aa9f9d1 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpectralAngleDistanceImageFilter_h
-#define _otbSpectralAngleDistanceImageFilter_h
+#ifndef __otbSpectralAngleDistanceImageFilter_h
+#define __otbSpectralAngleDistanceImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
index a0f82cfe6e..3eb0b245cc 100644
--- a/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
+++ b/Code/BasicFilters/otbSpectralAngleDistanceImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpectralAngleDistanceImageFilter_txx
-#define _otbSpectralAngleDistanceImageFilter_txx
+#ifndef __otbSpectralAngleDistanceImageFilter_txx
+#define __otbSpectralAngleDistanceImageFilter_txx
 
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
index 6da3b92abb..8e9299a950 100644
--- a/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingMatrixTransposeMatrixImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMatrixTransposeMatrixImageFilter_txx
-#define _otbMatrixTransposeMatrixImageFilter_txx
+#ifndef __otbMatrixTransposeMatrixImageFilter_txx
+#define __otbMatrixTransposeMatrixImageFilter_txx
 
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 
diff --git a/Code/BasicFilters/otbStreamingResampleImageFilter.txx b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
index bf937ec699..3cffa74290 100644
--- a/Code/BasicFilters/otbStreamingResampleImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingResampleImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingResampleImageFilter_txx
-#define _otbStreamingResampleImageFilter_txx
+#ifndef __otbStreamingResampleImageFilter_txx
+#define __otbStreamingResampleImageFilter_txx
 
 #include "otbStreamingResampleImageFilter.h"
 #include "otbStreamingTraits.h"
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.h b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
index c5d02de258..2cc32cccc6 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.h
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingShrinkImageFilter_h
-#define _otbStreamingShrinkImageFilter_h
+#ifndef __otbStreamingShrinkImageFilter_h
+#define __otbStreamingShrinkImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkDataObject.h"
diff --git a/Code/BasicFilters/otbStreamingShrinkImageFilter.txx b/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
index 37732ef4fc..833b50a734 100644
--- a/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingShrinkImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingShrinkImageFilter_txx
-#define _otbStreamingShrinkImageFilter_txx
+#ifndef __otbStreamingShrinkImageFilter_txx
+#define __otbStreamingShrinkImageFilter_txx
 
 #include "otbStreamingShrinkImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
index dcd94cd73e..3472051e91 100644
--- a/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsImageFilter.txx
@@ -18,8 +18,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingStatisticsImageFilter_txx
-#define _otbStreamingStatisticsImageFilter_txx
+#ifndef __otbStreamingStatisticsImageFilter_txx
+#define __otbStreamingStatisticsImageFilter_txx
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
index a04b6f37dd..a5eb349c8b 100644
--- a/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
+++ b/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.txx
@@ -18,8 +18,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingStatisticsVectorImageFilter_txx
-#define _otbStreamingStatisticsVectorImageFilter_txx
+#ifndef __otbStreamingStatisticsVectorImageFilter_txx
+#define __otbStreamingStatisticsVectorImageFilter_txx
 #include "otbStreamingStatisticsVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbVarianceImageFilter.txx b/Code/BasicFilters/otbVarianceImageFilter.txx
index 710f4f2754..1c70868d66 100644
--- a/Code/BasicFilters/otbVarianceImageFilter.txx
+++ b/Code/BasicFilters/otbVarianceImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVarianceImageFilter_txx
-#define _otbVarianceImageFilter_txx
+#ifndef __otbVarianceImageFilter_txx
+#define __otbVarianceImageFilter_txx
 
 #include "otbVarianceImageFilter.h"
 
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
index d197ac9d71..a4ae85dfd6 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageTo3DScalarImageFilter_h
-#define _otbVectorImageTo3DScalarImageFilter_h
+#ifndef __otbVectorImageTo3DScalarImageFilter_h
+#define __otbVectorImageTo3DScalarImageFilter_h
 
 #include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageToImageFilter.h"
diff --git a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
index 776c48bc53..0fe2c28131 100644
--- a/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageTo3DScalarImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageTo3DScalarImageFilter_txx
-#define _otbVectorImageTo3DScalarImageFilter_txx
+#ifndef __otbVectorImageTo3DScalarImageFilter_txx
+#define __otbVectorImageTo3DScalarImageFilter_txx
 
 #include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
index 5058104e9e..adab40781a 100644
--- a/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToAmplitudeImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToAmplitudeImageFilter_h
-#define _otbVectorImageToAmplitudeImageFilter_h
+#ifndef __otbVectorImageToAmplitudeImageFilter_h
+#define __otbVectorImageToAmplitudeImageFilter_h
 
 #include "itkUnaryFunctorImageFilter.h"
 #include "otbMath.h"
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.h b/Code/BasicFilters/otbVectorImageToImageListFilter.h
index 3bd7a7a7ab..b7495d7cf9 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.h
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToImageListFilter_h
-#define _otbVectorImageToImageListFilter_h
+#ifndef __otbVectorImageToImageListFilter_h
+#define __otbVectorImageToImageListFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Code/BasicFilters/otbVectorImageToImageListFilter.txx b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
index 2ea5055bbf..4d4e52705e 100644
--- a/Code/BasicFilters/otbVectorImageToImageListFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToImageListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToImageListFilter_txx
-#define _otbVectorImageToImageListFilter_txx
+#ifndef __otbVectorImageToImageListFilter_txx
+#define __otbVectorImageToImageListFilter_txx
 
 #include "otbVectorImageToImageListFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
index ffe212ae91..88c6b80bd8 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToIntensityImageFilter_h
-#define _otbVectorImageToIntensityImageFilter_h
+#ifndef __otbVectorImageToIntensityImageFilter_h
+#define __otbVectorImageToIntensityImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
index 57da278f25..063e623c4f 100644
--- a/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorImageToIntensityImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToIntensityImageFilter_txx
-#define _otbVectorImageToIntensityImageFilter_txx
+#ifndef __otbVectorImageToIntensityImageFilter_txx
+#define __otbVectorImageToIntensityImageFilter_txx
 
 #include "otbVectorImageToIntensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
index fba72910f3..0202aa7769 100644
--- a/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
+++ b/Code/BasicFilters/otbVectorRescaleIntensityImageFilter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorRescaleIntensityImageFilter_txx
-#define _otbVectorRescaleIntensityImageFilter_txx
+#ifndef __otbVectorRescaleIntensityImageFilter_txx
+#define __otbVectorRescaleIntensityImageFilter_txx
 
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkListSampleToHistogramGenerator.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
index 26c9af780d..6b9139be85 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageBlackmanFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageBlackmanFunction_h
-#define _otbWindowedSincInterpolateImageBlackmanFunction_h
+#ifndef __otbWindowedSincInterpolateImageBlackmanFunction_h
+#define __otbWindowedSincInterpolateImageBlackmanFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
index 5f4deaa7a9..06ed43f42b 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageCosineFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageCosineFunction_h
-#define _otbWindowedSincInterpolateImageCosineFunction_h
+#ifndef __otbWindowedSincInterpolateImageCosineFunction_h
+#define __otbWindowedSincInterpolateImageCosineFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
index 27c24260a0..a9109a4409 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageFunctionBase_h
-#define _otbWindowedSincInterpolateImageFunctionBase_h
+#ifndef __otbWindowedSincInterpolateImageFunctionBase_h
+#define __otbWindowedSincInterpolateImageFunctionBase_h
 
 #include "otbGenericInterpolateImageFunction.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
index 40b9d72a54..a7b5caf091 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageFunctionBase.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageFunctionBase_txx
-#define _otbWindowedSincInterpolateImageFunctionBase_txx
+#ifndef __otbWindowedSincInterpolateImageFunctionBase_txx
+#define __otbWindowedSincInterpolateImageFunctionBase_txx
 
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
index 9e03e1f000..24429c96bc 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageGaussianFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageGaussianFunction_h
-#define _otbWindowedSincInterpolateImageGaussianFunction_h
+#ifndef __otbWindowedSincInterpolateImageGaussianFunction_h
+#define __otbWindowedSincInterpolateImageGaussianFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
index e34c49ec30..36f7d89cf9 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageHammingFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageHammingFunction_h
-#define _otbWindowedSincInterpolateImageHammingFunction_h
+#ifndef __otbWindowedSincInterpolateImageHammingFunction_h
+#define __otbWindowedSincInterpolateImageHammingFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
index ff0c406d39..fb91ad109f 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageLanczosFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageLanczosFunction_h
-#define _otbWindowedSincInterpolateImageLanczosFunction_h
+#ifndef __otbWindowedSincInterpolateImageLanczosFunction_h
+#define __otbWindowedSincInterpolateImageLanczosFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
index bdbb73df34..7e47d88bb9 100644
--- a/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
+++ b/Code/BasicFilters/otbWindowedSincInterpolateImageWelchFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbWindowedSincInterpolateImageWelchFunction_h
-#define _otbWindowedSincInterpolateImageWelchFunction_h
+#ifndef __otbWindowedSincInterpolateImageWelchFunction_h
+#define __otbWindowedSincInterpolateImageWelchFunction_h
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 #include "itkSize.h"
diff --git a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
index dde5b20efd..f58ddf81c6 100755
--- a/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
+++ b/Code/ChangeDetection/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
-#define _otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#ifndef __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#define __otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbArcSpatialObject.h b/Code/Common/otbArcSpatialObject.h
index f6f354635c..cd6bd07c94 100644
--- a/Code/Common/otbArcSpatialObject.h
+++ b/Code/Common/otbArcSpatialObject.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbArcSpatialObject_h
-#define _otbArcSpatialObject_h
+#ifndef __otbArcSpatialObject_h
+#define __otbArcSpatialObject_h
 
 #include "itkSpatialObject.h"
 #include "itkAffineTransform.h"
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
index 176d3475fc..d2e0096027 100755
--- a/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBinaryFunctorNeighborhoodImageFilter_txx
-#define _otbBinaryFunctorNeighborhoodImageFilter_txx
+#ifndef __otbBinaryFunctorNeighborhoodImageFilter_txx
+#define __otbBinaryFunctorNeighborhoodImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
index 88aac8ad9b..66639bf318 100644
--- a/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
+++ b/Code/Common/otbBinaryFunctorNeighborhoodVectorImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBinaryFunctorNeighborhoodVectorImageFilter_txx
-#define _otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef __otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#define __otbBinaryFunctorNeighborhoodVectorImageFilter_txx
 
 #include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbDataNode.h b/Code/Common/otbDataNode.h
index 327159834c..d21077bc7e 100644
--- a/Code/Common/otbDataNode.h
+++ b/Code/Common/otbDataNode.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef  _otb_DataNode_h
-#define  _otb_DataNode_h
+#ifndef  __otb_DataNode_h
+#define  __otb_DataNode_h
 
 #include "itkPoint.h"
 #include "itkPolyLineParametricPath.h"
diff --git a/Code/Common/otbDataNode.txx b/Code/Common/otbDataNode.txx
index efaf159e8e..c698320afe 100644
--- a/Code/Common/otbDataNode.txx
+++ b/Code/Common/otbDataNode.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otb_DataNode_txx
-#define _otb_DataNode_txx
+#ifndef __otb_DataNode_txx
+#define __otb_DataNode_txx
 
 #include "otbDataNode.h"
 
diff --git a/Code/Common/otbDifferenceImageFilter.txx b/Code/Common/otbDifferenceImageFilter.txx
index 0cfa0a75ed..87b45941e6 100755
--- a/Code/Common/otbDifferenceImageFilter.txx
+++ b/Code/Common/otbDifferenceImageFilter.txx
@@ -1,6 +1,6 @@
 
-#ifndef _otbDifferenceImageFilter_txx
-#define _otbDifferenceImageFilter_txx
+#ifndef __otbDifferenceImageFilter_txx
+#define __otbDifferenceImageFilter_txx
 
 #include "itkDifferenceImageFilter.h"
 
diff --git a/Code/Common/otbExtractROI.txx b/Code/Common/otbExtractROI.txx
index 45f1452094..9202e62009 100755
--- a/Code/Common/otbExtractROI.txx
+++ b/Code/Common/otbExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbExtractROI_txx
-#define _otbExtractROI_txx
+#ifndef __otbExtractROI_txx
+#define __otbExtractROI_txx
 
 #include "otbExtractROI.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbExtractROIBase.txx b/Code/Common/otbExtractROIBase.txx
index 65b70dc58e..1ff8623532 100755
--- a/Code/Common/otbExtractROIBase.txx
+++ b/Code/Common/otbExtractROIBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbExtractROIBase_txx
-#define _otbExtractROIBase_txx
+#ifndef __otbExtractROIBase_txx
+#define __otbExtractROIBase_txx
 
 #include "otbExtractROIBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbGenericInterpolateImageFunction.h b/Code/Common/otbGenericInterpolateImageFunction.h
index d0d6c6382e..ff897c0333 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.h
+++ b/Code/Common/otbGenericInterpolateImageFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGenericInterpolateImageFunction_h
-#define _otbGenericInterpolateImageFunction_h
+#ifndef __otbGenericInterpolateImageFunction_h
+#define __otbGenericInterpolateImageFunction_h
 
 #include "itkInterpolateImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Code/Common/otbGenericInterpolateImageFunction.txx b/Code/Common/otbGenericInterpolateImageFunction.txx
index 1319f26381..8eb0d99b9a 100644
--- a/Code/Common/otbGenericInterpolateImageFunction.txx
+++ b/Code/Common/otbGenericInterpolateImageFunction.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGenericInterpolateImageFunction_txx
-#define _otbGenericInterpolateImageFunction_txx
+#ifndef __otbGenericInterpolateImageFunction_txx
+#define __otbGenericInterpolateImageFunction_txx
 #include "otbGenericInterpolateImageFunction.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Code/Common/otbHistogramStatisticsFunction.txx b/Code/Common/otbHistogramStatisticsFunction.txx
index 42d329a3d0..643b301f24 100644
--- a/Code/Common/otbHistogramStatisticsFunction.txx
+++ b/Code/Common/otbHistogramStatisticsFunction.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbHistogramStatisticsFunction_txx
-#define _otbHistogramStatisticsFunction_txx
+#ifndef __otbHistogramStatisticsFunction_txx
+#define __otbHistogramStatisticsFunction_txx
 
 #include "otbHistogramStatisticsFunction.h"
 
diff --git a/Code/Common/otbImageList.h b/Code/Common/otbImageList.h
index 9eeb37c11a..474adc8a1f 100644
--- a/Code/Common/otbImageList.h
+++ b/Code/Common/otbImageList.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageList_h
-#define _otbImageList_h
+#ifndef __otbImageList_h
+#define __otbImageList_h
 
 #include "otbObjectList.h"
 
diff --git a/Code/Common/otbImageList.txx b/Code/Common/otbImageList.txx
index ec07df23a2..687562f66e 100644
--- a/Code/Common/otbImageList.txx
+++ b/Code/Common/otbImageList.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageList_txx
-#define _otbImageList_txx
+#ifndef __otbImageList_txx
+#define __otbImageList_txx
 
 #include "otbMacro.h"
 
diff --git a/Code/Common/otbImageListSource.h b/Code/Common/otbImageListSource.h
index b8fc7fd39c..d409394673 100644
--- a/Code/Common/otbImageListSource.h
+++ b/Code/Common/otbImageListSource.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListSource_h
-#define _otbImageListSource_h
+#ifndef __otbImageListSource_h
+#define __otbImageListSource_h
 
 #include "itkProcessObject.h"
 #include "otbImageList.h"
diff --git a/Code/Common/otbImageListSource.txx b/Code/Common/otbImageListSource.txx
index 3df0f2f355..d793fd8563 100644
--- a/Code/Common/otbImageListSource.txx
+++ b/Code/Common/otbImageListSource.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListSource_txx
-#define _otbImageListSource_txx
+#ifndef __otbImageListSource_txx
+#define __otbImageListSource_txx
 
 #include "otbImageListSource.h"
 
diff --git a/Code/Common/otbImageListToImageFilter.h b/Code/Common/otbImageListToImageFilter.h
index d6eb697061..13827dfb19 100644
--- a/Code/Common/otbImageListToImageFilter.h
+++ b/Code/Common/otbImageListToImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageFilter_h
-#define _otbImageListToImageFilter_h
+#ifndef __otbImageListToImageFilter_h
+#define __otbImageListToImageFilter_h
 
 #include "itkImageSource.h"
 #include "otbImageList.h"
diff --git a/Code/Common/otbImageListToImageFilter.txx b/Code/Common/otbImageListToImageFilter.txx
index 9807e4e382..950b58c229 100644
--- a/Code/Common/otbImageListToImageFilter.txx
+++ b/Code/Common/otbImageListToImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageFilter_txx
-#define _otbImageListToImageFilter_txx
+#ifndef __otbImageListToImageFilter_txx
+#define __otbImageListToImageFilter_txx
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Code/Common/otbImageListToImageListFilter.h b/Code/Common/otbImageListToImageListFilter.h
index f56a533045..8bc7ba9858 100644
--- a/Code/Common/otbImageListToImageListFilter.h
+++ b/Code/Common/otbImageListToImageListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageListFilter_h
-#define _otbImageListToImageListFilter_h
+#ifndef __otbImageListToImageListFilter_h
+#define __otbImageListToImageListFilter_h
 
 #include "otbImageListSource.h"
 
diff --git a/Code/Common/otbImageListToImageListFilter.txx b/Code/Common/otbImageListToImageListFilter.txx
index 5426d3022d..d2cfc69428 100644
--- a/Code/Common/otbImageListToImageListFilter.txx
+++ b/Code/Common/otbImageListToImageListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToImageListFilter_txx
-#define _otbImageListToImageListFilter_txx
+#ifndef __otbImageListToImageListFilter_txx
+#define __otbImageListToImageListFilter_txx
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
index 1042c18172..b8fbcf397c 100644
--- a/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
+++ b/Code/Common/otbImageRegionNonUniformMultidimensionalSplitter.txx
@@ -18,8 +18,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageRegionNonUniformMultidimensionalSplitter_txx
-#define _otbImageRegionNonUniformMultidimensionalSplitter_txx
+#ifndef __otbImageRegionNonUniformMultidimensionalSplitter_txx
+#define __otbImageRegionNonUniformMultidimensionalSplitter_txx
 #include "otbImageRegionNonUniformMultidimensionalSplitter.h"
 #include <math.h>
 
diff --git a/Code/Common/otbImageRegionTileMapSplitter.txx b/Code/Common/otbImageRegionTileMapSplitter.txx
index 3ec5cefb6b..2a1b5b20cc 100644
--- a/Code/Common/otbImageRegionTileMapSplitter.txx
+++ b/Code/Common/otbImageRegionTileMapSplitter.txx
@@ -16,8 +16,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageRegionTileMapSplitter_txx
-#define _otbImageRegionTileMapSplitter_txx
+#ifndef __otbImageRegionTileMapSplitter_txx
+#define __otbImageRegionTileMapSplitter_txx
 #include "otbImageRegionTileMapSplitter.h"
 #include <math.h>
 
diff --git a/Code/Common/otbImageToImageListFilter.h b/Code/Common/otbImageToImageListFilter.h
index 1e0e07a7a6..ddd6fd11e9 100644
--- a/Code/Common/otbImageToImageListFilter.h
+++ b/Code/Common/otbImageToImageListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToImageListFilter_h
-#define _otbImageToImageListFilter_h
+#ifndef __otbImageToImageListFilter_h
+#define __otbImageToImageListFilter_h
 
 #include "otbImageListSource.h"
 
diff --git a/Code/Common/otbImageToImageListFilter.txx b/Code/Common/otbImageToImageListFilter.txx
index 5311128619..544351cfee 100644
--- a/Code/Common/otbImageToImageListFilter.txx
+++ b/Code/Common/otbImageToImageListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToImageListFilter_txx
-#define _otbImageToImageListFilter_txx
+#ifndef __otbImageToImageListFilter_txx
+#define __otbImageToImageListFilter_txx
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.h b/Code/Common/otbImageToLineSpatialObjectListFilter.h
index de6f7b4b35..a831b26b57 100755
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.h
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToLineSpatialObjectListFilter_h
-#define _otbImageToLineSpatialObjectListFilter_h
+#ifndef __otbImageToLineSpatialObjectListFilter_h
+#define __otbImageToLineSpatialObjectListFilter_h
 
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
diff --git a/Code/Common/otbImageToLineSpatialObjectListFilter.txx b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
index eead62871e..6aaecd5af7 100755
--- a/Code/Common/otbImageToLineSpatialObjectListFilter.txx
+++ b/Code/Common/otbImageToLineSpatialObjectListFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToLineSpatialObjectListFilter_txx
-#define _otbImageToLineSpatialObjectListFilter_txx
+#ifndef __otbImageToLineSpatialObjectListFilter_txx
+#define __otbImageToLineSpatialObjectListFilter_txx
 
 #include "otbImageToLineSpatialObjectListFilter.h"
 
diff --git a/Code/Common/otbLineSpatialObject.h b/Code/Common/otbLineSpatialObject.h
index 7a431f00ba..17abd8ea69 100644
--- a/Code/Common/otbLineSpatialObject.h
+++ b/Code/Common/otbLineSpatialObject.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLineSpatialObject_h
-#define _otbLineSpatialObject_h
+#ifndef __otbLineSpatialObject_h
+#define __otbLineSpatialObject_h
 
 #include "itkPointBasedSpatialObject.h"
 #include "itkLineSpatialObjectPoint.h"
diff --git a/Code/Common/otbLineSpatialObjectList.h b/Code/Common/otbLineSpatialObjectList.h
index 98a0d15eb1..e0dfe2fd0f 100644
--- a/Code/Common/otbLineSpatialObjectList.h
+++ b/Code/Common/otbLineSpatialObjectList.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLineSpatialObjectList_h
-#define _otbLineSpatialObjectList_h
+#ifndef __otbLineSpatialObjectList_h
+#define __otbLineSpatialObjectList_h
 
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
diff --git a/Code/Common/otbList.h b/Code/Common/otbList.h
index d060436eb3..22e9906519 100644
--- a/Code/Common/otbList.h
+++ b/Code/Common/otbList.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbList_h
-#define _otbList_h
+#ifndef __otbList_h
+#define __otbList_h
 
 #include <vector>
 #include "itkDataObject.h"
diff --git a/Code/Common/otbList.txx b/Code/Common/otbList.txx
index 465846ba40..2c93cb6ad0 100644
--- a/Code/Common/otbList.txx
+++ b/Code/Common/otbList.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbList_txx
-#define _otbList_txx
+#ifndef __otbList_txx
+#define __otbList_txx
 
 #include "otbList.h"
 
diff --git a/Code/Common/otbMultiChannelExtractROI.txx b/Code/Common/otbMultiChannelExtractROI.txx
index 38df4de4a3..f79277692f 100755
--- a/Code/Common/otbMultiChannelExtractROI.txx
+++ b/Code/Common/otbMultiChannelExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMultiChannelExtractROI_txx
-#define _otbMultiChannelExtractROI_txx
+#ifndef __otbMultiChannelExtractROI_txx
+#define __otbMultiChannelExtractROI_txx
 
 #include "otbMultiChannelExtractROI.h"
 
diff --git a/Code/Common/otbMultiToMonoChannelExtractROI.txx b/Code/Common/otbMultiToMonoChannelExtractROI.txx
index 642b23f335..c723480c19 100755
--- a/Code/Common/otbMultiToMonoChannelExtractROI.txx
+++ b/Code/Common/otbMultiToMonoChannelExtractROI.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMultiToMonoChannelExtractROI_txx
-#define _otbMultiToMonoChannelExtractROI_txx
+#ifndef __otbMultiToMonoChannelExtractROI_txx
+#define __otbMultiToMonoChannelExtractROI_txx
 
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Code/Common/otbObjectList.h b/Code/Common/otbObjectList.h
index 30a79270eb..38f38c7879 100644
--- a/Code/Common/otbObjectList.h
+++ b/Code/Common/otbObjectList.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbObjectList_h
-#define _otbObjectList_h
+#ifndef __otbObjectList_h
+#define __otbObjectList_h
 
 #include <vector>
 #include "itkDataObject.h"
diff --git a/Code/Common/otbObjectList.txx b/Code/Common/otbObjectList.txx
index 8f1ad2a797..0806ec9eee 100644
--- a/Code/Common/otbObjectList.txx
+++ b/Code/Common/otbObjectList.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbObjectList_txx
-#define _otbObjectList_txx
+#ifndef __otbObjectList_txx
+#define __otbObjectList_txx
 
 #include "otbObjectList.h"
 
diff --git a/Code/Common/otbPathFunction.h b/Code/Common/otbPathFunction.h
index ebc3ea1500..374a205cc0 100644
--- a/Code/Common/otbPathFunction.h
+++ b/Code/Common/otbPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPathFunction_h
-#define _otbPathFunction_h
+#ifndef __otbPathFunction_h
+#define __otbPathFunction_h
 
 #include "itkFunctionBase.h"
 
diff --git a/Code/Common/otbPathFunction.txx b/Code/Common/otbPathFunction.txx
index 3c049bb6a0..c44c33efb0 100644
--- a/Code/Common/otbPathFunction.txx
+++ b/Code/Common/otbPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPathFunction_txx
-#define _otbPathFunction_txx
+#ifndef __otbPathFunction_txx
+#define __otbPathFunction_txx
 
 #include "otbPathFunction.h"
 
diff --git a/Code/Common/otbPathListSource.h b/Code/Common/otbPathListSource.h
index 867938d9fc..75bd117035 100644
--- a/Code/Common/otbPathListSource.h
+++ b/Code/Common/otbPathListSource.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPathListSource_h
-#define _otbPathListSource_h
+#ifndef __otbPathListSource_h
+#define __otbPathListSource_h
 
 #include "itkProcessObject.h"
 #include "itkDataObject.h"
diff --git a/Code/Common/otbPathListSource.txx b/Code/Common/otbPathListSource.txx
index 4dc6ff0595..667c3d00cc 100644
--- a/Code/Common/otbPathListSource.txx
+++ b/Code/Common/otbPathListSource.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbPathListSource_txx
-#define _otbPathListSource_txx
+#ifndef __otbPathListSource_txx
+#define __otbPathListSource_txx
 #include "otbPathListSource.h"
 
 namespace otb
diff --git a/Code/Common/otbPathListToHistogramGenerator.txx b/Code/Common/otbPathListToHistogramGenerator.txx
index 2dc6970f93..9419846e1e 100644
--- a/Code/Common/otbPathListToHistogramGenerator.txx
+++ b/Code/Common/otbPathListToHistogramGenerator.txx
@@ -16,7 +16,7 @@
 
 =========================================================================*/
 
-#ifndef _otbPathListToHistogramGenerator_txx
+#ifndef __otbPathListToHistogramGenerator_txx
 #define _itkPathListToHistogramGenerator_txx
 
 #include "otbPathListToHistogramGenerator.h"
diff --git a/Code/Common/otbPathListToPathListFilter.h b/Code/Common/otbPathListToPathListFilter.h
index af3cec15a7..c856f488a5 100644
--- a/Code/Common/otbPathListToPathListFilter.h
+++ b/Code/Common/otbPathListToPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPathListToPathListFilter_h
-#define _otbPathListToPathListFilter_h
+#ifndef __otbPathListToPathListFilter_h
+#define __otbPathListToPathListFilter_h
 
 #include "otbPathListSource.h"
 
diff --git a/Code/Common/otbPathListToPathListFilter.txx b/Code/Common/otbPathListToPathListFilter.txx
index 4327b9881d..882f6ff2c5 100644
--- a/Code/Common/otbPathListToPathListFilter.txx
+++ b/Code/Common/otbPathListToPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPathListToPathListFilter_txx
-#define _otbPathListToPathListFilter_txx
+#ifndef __otbPathListToPathListFilter_txx
+#define __otbPathListToPathListFilter_txx
 
 #include "otbPathListToPathListFilter.h"
 
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.h b/Code/Common/otbPersistentFilterStreamingDecorator.h
index 195ca846e3..37946d0b40 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.h
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPersistentFilterStreamingDecorator_h
-#define _otbPersistentFilterStreamingDecorator_h
+#ifndef __otbPersistentFilterStreamingDecorator_h
+#define __otbPersistentFilterStreamingDecorator_h
 
 #include "otbStreamingImageVirtualWriter.h"
 #include "itkProcessObject.h"
diff --git a/Code/Common/otbPersistentFilterStreamingDecorator.txx b/Code/Common/otbPersistentFilterStreamingDecorator.txx
index dd6fe64e44..ca68d6b028 100644
--- a/Code/Common/otbPersistentFilterStreamingDecorator.txx
+++ b/Code/Common/otbPersistentFilterStreamingDecorator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPersistentFilterStreamingDecorator_txx
-#define _otbPersistentFilterStreamingDecorator_txx
+#ifndef __otbPersistentFilterStreamingDecorator_txx
+#define __otbPersistentFilterStreamingDecorator_txx
 
 #include "otbPersistentFilterStreamingDecorator.h"
 
diff --git a/Code/Common/otbPersistentImageFilter.h b/Code/Common/otbPersistentImageFilter.h
index 25738dc842..285a01c1f7 100644
--- a/Code/Common/otbPersistentImageFilter.h
+++ b/Code/Common/otbPersistentImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPersistentImageFilter_h
-#define _otbPersistentImageFilter_h
+#ifndef __otbPersistentImageFilter_h
+#define __otbPersistentImageFilter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/Common/otbPointSetAndValuesFunction.h b/Code/Common/otbPointSetAndValuesFunction.h
index e50c6c368d..70f0a805f6 100644
--- a/Code/Common/otbPointSetAndValuesFunction.h
+++ b/Code/Common/otbPointSetAndValuesFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetAndValuesFunction_h
-#define _otbPointSetAndValuesFunction_h
+#ifndef __otbPointSetAndValuesFunction_h
+#define __otbPointSetAndValuesFunction_h
 
 #include "itkFunctionBase.h"
 #include "itkPoint.h"
diff --git a/Code/Common/otbPointSetSource.h b/Code/Common/otbPointSetSource.h
index 7d8794f7b9..7c73c64429 100644
--- a/Code/Common/otbPointSetSource.h
+++ b/Code/Common/otbPointSetSource.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbPointSetSource_h
-#define _otbPointSetSource_h
+#ifndef __otbPointSetSource_h
+#define __otbPointSetSource_h
 
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
diff --git a/Code/Common/otbPointSetSource.txx b/Code/Common/otbPointSetSource.txx
index b109eb0c73..a5992ff2d9 100644
--- a/Code/Common/otbPointSetSource.txx
+++ b/Code/Common/otbPointSetSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetSource_txx
-#define _otbPointSetSource_txx
+#ifndef __otbPointSetSource_txx
+#define __otbPointSetSource_txx
 
 #include "otbPointSetSource.h"
 
diff --git a/Code/Common/otbPolyLineImageConstIterator.h b/Code/Common/otbPolyLineImageConstIterator.h
index dcb91cc202..415d095d61 100644
--- a/Code/Common/otbPolyLineImageConstIterator.h
+++ b/Code/Common/otbPolyLineImageConstIterator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolyLineImageConstIterator_h
-#define _otbPolyLineImageConstIterator_h
+#ifndef __otbPolyLineImageConstIterator_h
+#define __otbPolyLineImageConstIterator_h
 
 #include "itkIndex.h"
 #include "itkImage.h"
diff --git a/Code/Common/otbPolyLineImageConstIterator.txx b/Code/Common/otbPolyLineImageConstIterator.txx
index 4fc08f0873..9051f4936a 100644
--- a/Code/Common/otbPolyLineImageConstIterator.txx
+++ b/Code/Common/otbPolyLineImageConstIterator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolyLineImageConstIterator_txx
-#define _otbPolyLineImageConstIterator_txx
+#ifndef __otbPolyLineImageConstIterator_txx
+#define __otbPolyLineImageConstIterator_txx
 
 #include "otbPolyLineImageConstIterator.h"
 #include "otbMacro.h"
diff --git a/Code/Common/otbPolyLineImageIterator.h b/Code/Common/otbPolyLineImageIterator.h
index 38fa2b4082..f85596a44e 100644
--- a/Code/Common/otbPolyLineImageIterator.h
+++ b/Code/Common/otbPolyLineImageIterator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolyLineImageIterator_h
-#define _otbPolyLineImageIterator_h
+#ifndef __otbPolyLineImageIterator_h
+#define __otbPolyLineImageIterator_h
 
 #include "itkIndex.h"
 #include "itkImage.h"
diff --git a/Code/Common/otbPolyLineParametricPathWithValue.h b/Code/Common/otbPolyLineParametricPathWithValue.h
index 6658c5b74e..1494dfed91 100644
--- a/Code/Common/otbPolyLineParametricPathWithValue.h
+++ b/Code/Common/otbPolyLineParametricPathWithValue.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolyLineParametricPathWithValue_h
-#define _otbPolyLineParametricPathWithValue_h
+#ifndef __otbPolyLineParametricPathWithValue_h
+#define __otbPolyLineParametricPathWithValue_h
 
 #include "itkPolyLineParametricPath.h"
 #include "itkMetaDataObject.h"
diff --git a/Code/Common/otbPolygon.h b/Code/Common/otbPolygon.h
index 142e8ac5a0..957149b925 100644
--- a/Code/Common/otbPolygon.h
+++ b/Code/Common/otbPolygon.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolygon_h
-#define _otbPolygon_h
+#ifndef __otbPolygon_h
+#define __otbPolygon_h
 
 #include "otbPolyLineParametricPathWithValue.h"
 #include "itkImageRegion.h"
diff --git a/Code/Common/otbPolygon.txx b/Code/Common/otbPolygon.txx
index 1f9f7dad21..4ba530997b 100644
--- a/Code/Common/otbPolygon.txx
+++ b/Code/Common/otbPolygon.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolygon_txx
-#define _otbPolygon_txx
+#ifndef __otbPolygon_txx
+#define __otbPolygon_txx
 
 #include "otbPolygon.h"
 
diff --git a/Code/Common/otbSpatialObjectSource.h b/Code/Common/otbSpatialObjectSource.h
index bfb3af489d..7506088e8f 100644
--- a/Code/Common/otbSpatialObjectSource.h
+++ b/Code/Common/otbSpatialObjectSource.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpatialObjectSource_h
-#define _otbSpatialObjectSource_h
+#ifndef __otbSpatialObjectSource_h
+#define __otbSpatialObjectSource_h
 
 #include "otbMacro.h"
 #include "itkProcessObject.h"
diff --git a/Code/Common/otbSpatialObjectSource.txx b/Code/Common/otbSpatialObjectSource.txx
index cb42aa0ad9..2d7da5e7c6 100644
--- a/Code/Common/otbSpatialObjectSource.txx
+++ b/Code/Common/otbSpatialObjectSource.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpatialObjectSource_txx
-#define _otbSpatialObjectSource_txx
+#ifndef __otbSpatialObjectSource_txx
+#define __otbSpatialObjectSource_txx
 
 #include "otbSpatialObjectSource.h"
 
diff --git a/Code/Common/otbStreamingTraits.h b/Code/Common/otbStreamingTraits.h
index e8c167daa1..0f56c17f0b 100644
--- a/Code/Common/otbStreamingTraits.h
+++ b/Code/Common/otbStreamingTraits.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingTraits_h
-#define _otbStreamingTraits_h
+#ifndef __otbStreamingTraits_h
+#define __otbStreamingTraits_h
 
 #include "otbMacro.h"
 #include "otbConfigure.h"
diff --git a/Code/Common/otbStreamingTraits.txx b/Code/Common/otbStreamingTraits.txx
index 40665f3156..8a7ed6eac3 100644
--- a/Code/Common/otbStreamingTraits.txx
+++ b/Code/Common/otbStreamingTraits.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingTraits_txx
-#define _otbStreamingTraits_txx
+#ifndef __otbStreamingTraits_txx
+#define __otbStreamingTraits_txx
 
 #include "otbStreamingTraits.h"
 #include "otbMacro.h"
diff --git a/Code/Common/otbSystem.h b/Code/Common/otbSystem.h
index c1c56cc5e5..57930fafce 100755
--- a/Code/Common/otbSystem.h
+++ b/Code/Common/otbSystem.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSystem_h
-#define _otbSystem_h
+#ifndef __otbSystem_h
+#define __otbSystem_h
 
 #include <string>
 #include <vector>
diff --git a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
index 4c1204512e..ef203eb009 100644
--- a/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
+++ b/Code/Common/otbUnaryFunctorNeighborhoodImageFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbUnaryFunctorNeighborhoodImageFilter_txx
-#define _otbUnaryFunctorNeighborhoodImageFilter_txx
+#ifndef __otbUnaryFunctorNeighborhoodImageFilter_txx
+#define __otbUnaryFunctorNeighborhoodImageFilter_txx
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Common/otbVectorData.h b/Code/Common/otbVectorData.h
index deaddff3e6..addb88c702 100644
--- a/Code/Common/otbVectorData.h
+++ b/Code/Common/otbVectorData.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otb_VectorData_h
-#define _otb_VectorData_h
+#ifndef __otb_VectorData_h
+#define __otb_VectorData_h
 
 #include "itkTreeContainer.h"
 #include "itkDataObject.h"
diff --git a/Code/Common/otbVectorData.txx b/Code/Common/otbVectorData.txx
index 123e6f3e87..6502fb91ca 100644
--- a/Code/Common/otbVectorData.txx
+++ b/Code/Common/otbVectorData.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otb_VectorData_txx
-#define _otb_VectorData_txx
+#ifndef __otb_VectorData_txx
+#define __otb_VectorData_txx
 
 #include "otbVectorData.h"
 #include "itkPreOrderTreeIterator.h"
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
index 7bf1fb8cd0..119ec4b4b5 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplinesInterpolateDeformationFieldGenerator_h
-#define _otbBSplinesInterpolateDeformationFieldGenerator_h
+#ifndef __otbBSplinesInterpolateDeformationFieldGenerator_h
+#define __otbBSplinesInterpolateDeformationFieldGenerator_h
 
 #include "otbPointSetToDeformationFieldGenerator.h"
 
diff --git a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
index 8f074bcbc3..9c9ec871f7 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplinesInterpolateDeformationFieldGenerator_txx
-#define _otbBSplinesInterpolateDeformationFieldGenerator_txx
+#ifndef __otbBSplinesInterpolateDeformationFieldGenerator_txx
+#define __otbBSplinesInterpolateDeformationFieldGenerator_txx
 
 #include "otbBSplinesInterpolateDeformationFieldGenerator.h"
 #include "itkDeformationFieldSource.h"
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
index f9be9097da..7988c273e5 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplinesInterpolateTransformDeformationFieldGenerator_h
-#define _otbBSplinesInterpolateTransformDeformationFieldGenerator_h
+#ifndef __otbBSplinesInterpolateTransformDeformationFieldGenerator_h
+#define __otbBSplinesInterpolateTransformDeformationFieldGenerator_h
 
 #include "otbPointSetWithTransformToDeformationFieldGenerator.h"
 #include "ijBSplineScatteredDataPointSetToImageFilter.h"
diff --git a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
index 5e307a4a7e..9343c7aabd 100644
--- a/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbBSplinesInterpolateTransformDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBSplinesInterpolateTransformDeformationFieldGenerator_txx
-#define _otbBSplinesInterpolateTransformDeformationFieldGenerator_txx
+#ifndef __otbBSplinesInterpolateTransformDeformationFieldGenerator_txx
+#define __otbBSplinesInterpolateTransformDeformationFieldGenerator_txx
 
 #include "otbBSplinesInterpolateTransformDeformationFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.h b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
index 19d344d4df..a48cc97ddc 100644
--- a/Code/DisparityMap/otbDisparityMapEstimationMethod.h
+++ b/Code/DisparityMap/otbDisparityMapEstimationMethod.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbDisparityMapEstimationMethod_h
-#define _otbDisparityMapEstimationMethod_h
+#ifndef __otbDisparityMapEstimationMethod_h
+#define __otbDisparityMapEstimationMethod_h
 
 #include "itkProcessObject.h"
 #include "itkImageToImageMetric.h"
diff --git a/Code/DisparityMap/otbDisparityMapEstimationMethod.txx b/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
index 8685a51611..2a9e421444 100644
--- a/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
+++ b/Code/DisparityMap/otbDisparityMapEstimationMethod.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbDisparityMapEstimationMethod_txx
-#define _otbDisparityMapEstimationMethod_txx
+#ifndef __otbDisparityMapEstimationMethod_txx
+#define __otbDisparityMapEstimationMethod_txx
 
 #include "otbDisparityMapEstimationMethod.h"
 #include "itkImageRegistrationMethod.h"
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
index 02ace07cd6..1b14b3ff6b 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNNearestPointsLinearInterpolateDeformationFieldGenerator_h
-#define _otbNNearestPointsLinearInterpolateDeformationFieldGenerator_h
+#ifndef __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_h
+#define __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_h
 
 #include "otbPointSetToDeformationFieldGenerator.h"
 
diff --git a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
index 7c07470625..417a821c21 100644
--- a/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestPointsLinearInterpolateDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNNearestPointsLinearInterpolateDeformationFieldGenerator_txx
-#define _otbNNearestPointsLinearInterpolateDeformationFieldGenerator_txx
+#ifndef __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_txx
+#define __otbNNearestPointsLinearInterpolateDeformationFieldGenerator_txx
 
 #define EPSILON 1e-15
 
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
index 2ef148e3a6..8918660cab 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
-#define _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
+#ifndef __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
+#define __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_h
 
 #include "otbPointSetWithTransformToDeformationFieldGenerator.h"
 
diff --git a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
index 564231c762..bb87df0b8f 100644
--- a/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNNearestTransformsLinearInterpolateDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
-#define _otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
+#ifndef __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
+#define __otbNNearestTransformsLinearInterpolateDeformationFieldGenerator_txx
 
 #define EPSILON 1e-15
 
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
index 128b475ee5..809c33da5e 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNearestPointDeformationFieldGenerator_h
-#define _otbNearestPointDeformationFieldGenerator_h
+#ifndef __otbNearestPointDeformationFieldGenerator_h
+#define __otbNearestPointDeformationFieldGenerator_h
 
 #include "otbPointSetToDeformationFieldGenerator.h"
 
diff --git a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
index c0e865f9b1..1fe7735266 100644
--- a/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestPointDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNearestPointDeformationFieldGenerator_txx
-#define _otbNearestPointDeformationFieldGenerator_txx
+#ifndef __otbNearestPointDeformationFieldGenerator_txx
+#define __otbNearestPointDeformationFieldGenerator_txx
 
 #include "otbNearestPointDeformationFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
index abf2e3864b..e9f7702dd2 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNearestTransformDeformationFieldGenerator_h
-#define _otbNearestTransformDeformationFieldGenerator_h
+#ifndef __otbNearestTransformDeformationFieldGenerator_h
+#define __otbNearestTransformDeformationFieldGenerator_h
 
 #include "otbPointSetWithTransformToDeformationFieldGenerator.h"
 
diff --git a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
index d48353e75c..bbb4427d81 100644
--- a/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbNearestTransformDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNearestTransformDeformationFieldGenerator_txx
-#define _otbNearestTransformDeformationFieldGenerator_txx
+#ifndef __otbNearestTransformDeformationFieldGenerator_txx
+#define __otbNearestTransformDeformationFieldGenerator_txx
 
 #include "otbNearestTransformDeformationFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/DisparityMap/otbPointSetBasedResamplingFilter.h b/Code/DisparityMap/otbPointSetBasedResamplingFilter.h
index 09944f713e..36b0b70094 100644
--- a/Code/DisparityMap/otbPointSetBasedResamplingFilter.h
+++ b/Code/DisparityMap/otbPointSetBasedResamplingFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetBasedResamplingFilter_h
-#define _otbPointSetBasedResamplingFilter_h
+#ifndef __otbPointSetBasedResamplingFilter_h
+#define __otbPointSetBasedResamplingFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "itkTransform.h"
diff --git a/Code/DisparityMap/otbPointSetBasedResamplingFilter.txx b/Code/DisparityMap/otbPointSetBasedResamplingFilter.txx
index 305007336f..efa2232c5a 100644
--- a/Code/DisparityMap/otbPointSetBasedResamplingFilter.txx
+++ b/Code/DisparityMap/otbPointSetBasedResamplingFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetBasedResamplingFilter_txx
-#define _otbPointSetBasedResamplingFilter_txx
+#ifndef __otbPointSetBasedResamplingFilter_txx
+#define __otbPointSetBasedResamplingFilter_txx
 
 #include "otbPointSetBasedResamplingFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
index c2485e14e4..5c061df76f 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetToDeformationFieldGenerator_h
-#define _otbPointSetToDeformationFieldGenerator_h
+#ifndef __otbPointSetToDeformationFieldGenerator_h
+#define __otbPointSetToDeformationFieldGenerator_h
 
 #include "itkImageSource.h"
 
diff --git a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
index dad5d766f0..4326118381 100644
--- a/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbPointSetToDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetToDeformationFieldGenerator_txx
-#define _otbPointSetToDeformationFieldGenerator_txx
+#ifndef __otbPointSetToDeformationFieldGenerator_txx
+#define __otbPointSetToDeformationFieldGenerator_txx
 
 #include "otbPointSetToDeformationFieldGenerator.h"
 #include "otbMacro.h"
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
index 6126e56079..c98cb16a81 100644
--- a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
+++ b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetWithTransformToDeformationFieldGenerator_h
-#define _otbPointSetWithTransformToDeformationFieldGenerator_h
+#ifndef __otbPointSetWithTransformToDeformationFieldGenerator_h
+#define __otbPointSetWithTransformToDeformationFieldGenerator_h
 
 #include "otbPointSetToDeformationFieldGenerator.h"
 #include "itkTransform.h"
diff --git a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
index 1662f97a8e..beaee29e6a 100644
--- a/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
+++ b/Code/DisparityMap/otbPointSetWithTransformToDeformationFieldGenerator.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPointSetWithTransformToDeformationFieldGenerator_txx
-#define _otbPointSetWithTransformToDeformationFieldGenerator_txx
+#ifndef __otbPointSetWithTransformToDeformationFieldGenerator_txx
+#define __otbPointSetWithTransformToDeformationFieldGenerator_txx
 
 #include "otbPointSetWithTransformToDeformationFieldGenerator.h"
 
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
index 6644697ab6..3e0000b98b 100755
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBreakAngularPathListFilter_h
-#define _otbBreakAngularPathListFilter_h
+#ifndef __otbBreakAngularPathListFilter_h
+#define __otbBreakAngularPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
index d4029af933..907544059f 100755
--- a/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
+++ b/Code/FeatureExtraction/otbBreakAngularPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbBreakAngularPathListFilter_txx
-#define _otbBreakAngularPathListFilter_txx
+#ifndef __otbBreakAngularPathListFilter_txx
+#define __otbBreakAngularPathListFilter_txx
 
 #include "otbBreakAngularPathListFilter.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.h b/Code/FeatureExtraction/otbCompacityPathFunction.h
index 5baba7fb8d..10a793905e 100644
--- a/Code/FeatureExtraction/otbCompacityPathFunction.h
+++ b/Code/FeatureExtraction/otbCompacityPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbCompacityPathFunction_h
-#define _otbCompacityPathFunction_h
+#ifndef __otbCompacityPathFunction_h
+#define __otbCompacityPathFunction_h
 
 #include "otbPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Code/FeatureExtraction/otbCompacityPathFunction.txx b/Code/FeatureExtraction/otbCompacityPathFunction.txx
index 027c86ecb1..e85e5774f9 100644
--- a/Code/FeatureExtraction/otbCompacityPathFunction.txx
+++ b/Code/FeatureExtraction/otbCompacityPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbCompacityPathFunction_txx
-#define _otbCompacityPathFunction_txx
+#ifndef __otbCompacityPathFunction_txx
+#define __otbCompacityPathFunction_txx
 
 #include "otbPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.h b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
index 662e4b6d9c..b8fbb1ea3b 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbComplexMomentImageFunction_h
-#define _otbComplexMomentImageFunction_h
+#ifndef __otbComplexMomentImageFunction_h
+#define __otbComplexMomentImageFunction_h
 
 #include "otbGeometricMomentImageFunction.h"
 
diff --git a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
index c5e570fb72..d9703f726d 100644
--- a/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbComplexMomentImageFunction_txx
-#define _otbComplexMomentImageFunction_txx
+#ifndef __otbComplexMomentImageFunction_txx
+#define __otbComplexMomentImageFunction_txx
 
 #include "otbComplexMomentImageFunction.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.h b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
index 8218df2703..ad350c8609 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbComplexMomentPathFunction_h
-#define _otbComplexMomentPathFunction_h
+#ifndef __otbComplexMomentPathFunction_h
+#define __otbComplexMomentPathFunction_h
 
 #include "otbGeometricMomentPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
index 730d9b7d91..2066858678 100644
--- a/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
+++ b/Code/FeatureExtraction/otbComplexMomentPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbComplexMomentPathFunction_txx
-#define _otbComplexMomentPathFunction_txx
+#ifndef __otbComplexMomentPathFunction_txx
+#define __otbComplexMomentPathFunction_txx
 
 #include "otbComplexMomentPathFunction.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.h b/Code/FeatureExtraction/otbFlusserImageFunction.h
index 4cad09d3fd..2e8bb4119b 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.h
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFlusserImageFunction_h
-#define _otbFlusserImageFunction_h
+#ifndef __otbFlusserImageFunction_h
+#define __otbFlusserImageFunction_h
 
 #include "otbRealMomentImageFunction.h"
 
diff --git a/Code/FeatureExtraction/otbFlusserImageFunction.txx b/Code/FeatureExtraction/otbFlusserImageFunction.txx
index 4cc8a75c5a..7a6a4cb1b5 100644
--- a/Code/FeatureExtraction/otbFlusserImageFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFlusserImageFunction_txx
-#define _otbFlusserImageFunction_txx
+#ifndef __otbFlusserImageFunction_txx
+#define __otbFlusserImageFunction_txx
 
 #include "otbFlusserImageFunction.h"
 #include "otbComplexMomentImageFunction.h"
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.h b/Code/FeatureExtraction/otbFlusserPathFunction.h
index c86cc374a8..4919a1f736 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.h
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFlusserPathFunction_h
-#define _otbFlusserPathFunction_h
+#ifndef __otbFlusserPathFunction_h
+#define __otbFlusserPathFunction_h
 
 #include "otbRealMomentPathFunction.h"
 
diff --git a/Code/FeatureExtraction/otbFlusserPathFunction.txx b/Code/FeatureExtraction/otbFlusserPathFunction.txx
index 97d69a1ad7..d2d3cc8fb4 100644
--- a/Code/FeatureExtraction/otbFlusserPathFunction.txx
+++ b/Code/FeatureExtraction/otbFlusserPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFlusserPathFunction_txx
-#define _otbFlusserPathFunction_txx
+#ifndef __otbFlusserPathFunction_txx
+#define __otbFlusserPathFunction_txx
 
 #include "otbFlusserPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
index 5b6b90286b..32dcc8783f 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbForwardFourierMellinTransformImageFilter_h
-#define _otbForwardFourierMellinTransformImageFilter_h
+#ifndef __otbForwardFourierMellinTransformImageFilter_h
+#define __otbForwardFourierMellinTransformImageFilter_h
 
 #include "otbImage.h"
 #include "itkLinearInterpolateImageFunction.h"
diff --git a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
index b20ea6466b..fb2ed8a154 100644
--- a/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
+++ b/Code/FeatureExtraction/otbForwardFourierMellinTransformImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbForwardFourierMellinTransformImageFilter_txx
-#define _otbForwardFourierMellinTransformImageFilter_txx
+#ifndef __otbForwardFourierMellinTransformImageFilter_txx
+#define __otbForwardFourierMellinTransformImageFilter_txx
 
 #include "otbForwardFourierMellinTransformImageFilter.h"
 #include "itkImageDuplicator.h"
diff --git a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
index 237d5a321e..40e8e1ec0c 100644
--- a/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeometricMomentImageFunction_h
-#define _otbGeometricMomentImageFunction_h
+#ifndef __otbGeometricMomentImageFunction_h
+#define __otbGeometricMomentImageFunction_h
 
 #include "itkImageFunction.h"
 
diff --git a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
index e0dc4d9d7a..c0aa7eb760 100644
--- a/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbGeometricMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeometricMomentPathFunction_h
-#define _otbGeometricMomentPathFunction_h
+#ifndef __otbGeometricMomentPathFunction_h
+#define __otbGeometricMomentPathFunction_h
 
 #include "otbPathFunction.h"
 
diff --git a/Code/FeatureExtraction/otbHuImageFunction.h b/Code/FeatureExtraction/otbHuImageFunction.h
index 049ea7bd84..b5f41eb44c 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.h
+++ b/Code/FeatureExtraction/otbHuImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHuImageFunction_h
-#define _otbHuImageFunction_h
+#ifndef __otbHuImageFunction_h
+#define __otbHuImageFunction_h
 
 #include "otbRealMomentImageFunction.h"
 
diff --git a/Code/FeatureExtraction/otbHuImageFunction.txx b/Code/FeatureExtraction/otbHuImageFunction.txx
index 78da6ced0c..941ff86682 100644
--- a/Code/FeatureExtraction/otbHuImageFunction.txx
+++ b/Code/FeatureExtraction/otbHuImageFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHuImageFunction_txx
-#define _otbHuImageFunction_txx
+#ifndef __otbHuImageFunction_txx
+#define __otbHuImageFunction_txx
 
 #include "otbHuImageFunction.h"
 #include "otbComplexMomentImageFunction.h"
diff --git a/Code/FeatureExtraction/otbHuPathFunction.h b/Code/FeatureExtraction/otbHuPathFunction.h
index f25044c451..736d969f06 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.h
+++ b/Code/FeatureExtraction/otbHuPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHuPathFunction_h
-#define _otbHuPathFunction_h
+#ifndef __otbHuPathFunction_h
+#define __otbHuPathFunction_h
 
 #include "otbRealMomentPathFunction.h"
 
diff --git a/Code/FeatureExtraction/otbHuPathFunction.txx b/Code/FeatureExtraction/otbHuPathFunction.txx
index bf13a5ca78..e2eeebfdc0 100644
--- a/Code/FeatureExtraction/otbHuPathFunction.txx
+++ b/Code/FeatureExtraction/otbHuPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHuPathFunction_txx
-#define _otbHuPathFunction_txx
+#ifndef __otbHuPathFunction_txx
+#define __otbHuPathFunction_txx
 
 #include "otbHuPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx b/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
index 89542db21e..f0f185b590 100644
--- a/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
+++ b/Code/FeatureExtraction/otbImageToCarvingPathFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToCarvingPathFilter_txx
-#define _otbImageToCarvingPathFilter_txx
+#ifndef __otbImageToCarvingPathFilter_txx
+#define __otbImageToCarvingPathFilter_txx
 
 #include "otbImageToCarvingPathFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbImageToEdgePathFilter.txx b/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
index 62071e8bad..66675733ab 100755
--- a/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
+++ b/Code/FeatureExtraction/otbImageToEdgePathFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToEdgePathFilter_txx
-#define _otbImageToEdgePathFilter_txx
+#ifndef __otbImageToEdgePathFilter_txx
+#define __otbImageToEdgePathFilter_txx
 
 #include "otbImageToEdgePathFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
index 312efa24fb..55bf7c843a 100644
--- a/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
+++ b/Code/FeatureExtraction/otbImageToSIFTKeyPointSetFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToSIFTKeyPointSetFilter_h
-#define _otbImageToSIFTKeyPointSetFilter_h
+#ifndef __otbImageToSIFTKeyPointSetFilter_h
+#define __otbImageToSIFTKeyPointSetFilter_h
 
 #include <vector>
 
diff --git a/Code/FeatureExtraction/otbLikehoodPathListFilter.h b/Code/FeatureExtraction/otbLikehoodPathListFilter.h
index 69b56536ca..b7d6711037 100755
--- a/Code/FeatureExtraction/otbLikehoodPathListFilter.h
+++ b/Code/FeatureExtraction/otbLikehoodPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLikehoodPathListFilter_h
-#define _otbLikehoodPathListFilter_h
+#ifndef __otbLikehoodPathListFilter_h
+#define __otbLikehoodPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbLikehoodPathListFilter.txx b/Code/FeatureExtraction/otbLikehoodPathListFilter.txx
index c85dd92b7c..8d8ddbeeac 100755
--- a/Code/FeatureExtraction/otbLikehoodPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLikehoodPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLikehoodPathListFilter_txx
-#define _otbLikehoodPathListFilter_txx
+#ifndef __otbLikehoodPathListFilter_txx
+#define __otbLikehoodPathListFilter_txx
 
 #include "otbLikehoodPathListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.h b/Code/FeatureExtraction/otbLinkPathListFilter.h
index 15762fb86b..9cf9f16ec8 100755
--- a/Code/FeatureExtraction/otbLinkPathListFilter.h
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLinkPathListFilter_h
-#define _otbLinkPathListFilter_h
+#ifndef __otbLinkPathListFilter_h
+#define __otbLinkPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbLinkPathListFilter.txx b/Code/FeatureExtraction/otbLinkPathListFilter.txx
index 21f04703df..94eb6862c3 100755
--- a/Code/FeatureExtraction/otbLinkPathListFilter.txx
+++ b/Code/FeatureExtraction/otbLinkPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLinkPathListFilter_txx
-#define _otbLinkPathListFilter_txx
+#ifndef __otbLinkPathListFilter_txx
+#define __otbLinkPathListFilter_txx
 
 #include "otbLinkPathListFilter.h"
 #include "otbMath.h" 
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.h b/Code/FeatureExtraction/otbLocalHoughFilter.h
index c92b4e2bb0..4e284ab142 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.h
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLocalHoughFilter_h
-#define _otbLocalHoughFilter_h
+#ifndef __otbLocalHoughFilter_h
+#define __otbLocalHoughFilter_h
 
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
diff --git a/Code/FeatureExtraction/otbLocalHoughFilter.txx b/Code/FeatureExtraction/otbLocalHoughFilter.txx
index 593dacd12e..fc39fcf092 100644
--- a/Code/FeatureExtraction/otbLocalHoughFilter.txx
+++ b/Code/FeatureExtraction/otbLocalHoughFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbLocalHoughFilter_txx
-#define _otbLocalHoughFilter_txx
+#ifndef __otbLocalHoughFilter_txx
+#define __otbLocalHoughFilter_txx
 
 #include "otbLocalHoughFilter.h"
 
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
index 4ec97740e7..d1a49bf2f3 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNeighborhoodScalarProductFilter_h
-#define _otbNeighborhoodScalarProductFilter_h
+#ifndef __otbNeighborhoodScalarProductFilter_h
+#define __otbNeighborhoodScalarProductFilter_h
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 
diff --git a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
index 8217e097a1..af76d2f985 100644
--- a/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
+++ b/Code/FeatureExtraction/otbNeighborhoodScalarProductFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNeighborhoodScalarProduct_txx
-#define _otbNeighborhoodScalarProduct_txx
+#ifndef __otbNeighborhoodScalarProduct_txx
+#define __otbNeighborhoodScalarProduct_txx
 
 #include "otbNeighborhoodScalarProductFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
index 8e32fcfd95..c0f8d585d2 100644
--- a/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbNonMaxRemovalByDirectionFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNonMaxRemovalByDirectionFilter_h
-#define _otbNonMaxRemovalByDirectionFilter_h
+#ifndef __otbNonMaxRemovalByDirectionFilter_h
+#define __otbNonMaxRemovalByDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.h b/Code/FeatureExtraction/otbOrientationPathFunction.h
index 4eba3d51cc..784fb5afd7 100644
--- a/Code/FeatureExtraction/otbOrientationPathFunction.h
+++ b/Code/FeatureExtraction/otbOrientationPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbOrientationPathFunction_h
-#define _otbOrientationPathFunction_h
+#ifndef __otbOrientationPathFunction_h
+#define __otbOrientationPathFunction_h
 
 #include "otbPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Code/FeatureExtraction/otbOrientationPathFunction.txx b/Code/FeatureExtraction/otbOrientationPathFunction.txx
index ef537cf93f..3a312e70d1 100644
--- a/Code/FeatureExtraction/otbOrientationPathFunction.txx
+++ b/Code/FeatureExtraction/otbOrientationPathFunction.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbOrientationPathFunction_txx
-#define _otbOrientationPathFunction_txx
+#ifndef __otbOrientationPathFunction_txx
+#define __otbOrientationPathFunction_txx
 
 #include "otbPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Code/FeatureExtraction/otbRealMomentImageFunction.h b/Code/FeatureExtraction/otbRealMomentImageFunction.h
index 5709ac2339..c66c67ddfd 100644
--- a/Code/FeatureExtraction/otbRealMomentImageFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentImageFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRealMomentImageFunction_h
-#define _otbRealMomentImageFunction_h
+#ifndef __otbRealMomentImageFunction_h
+#define __otbRealMomentImageFunction_h
 
 #include "otbGeometricMomentImageFunction.h"
 
diff --git a/Code/FeatureExtraction/otbRealMomentPathFunction.h b/Code/FeatureExtraction/otbRealMomentPathFunction.h
index b8d62d6b35..3fc3ef854a 100644
--- a/Code/FeatureExtraction/otbRealMomentPathFunction.h
+++ b/Code/FeatureExtraction/otbRealMomentPathFunction.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRealMomentPathFunction_h
-#define _otbRealMomentPathFunction_h
+#ifndef __otbRealMomentPathFunction_h
+#define __otbRealMomentPathFunction_h
 
 #include "otbGeometricMomentPathFunction.h"
 #include "itkVectorContainer.h"
diff --git a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
index 379d4ca63f..c87c13683c 100644
--- a/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveIsolatedByDirectionFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRemoveIsolatedByDirectionFilter_h
-#define _otbRemoveIsolatedByDirectionFilter_h
+#ifndef __otbRemoveIsolatedByDirectionFilter_h
+#define __otbRemoveIsolatedByDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
diff --git a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
index ff04ac508c..990b8aba33 100644
--- a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
+++ b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRemoveTortuousPathListFilter_h
-#define _otbRemoveTortuousPathListFilter_h
+#ifndef __otbRemoveTortuousPathListFilter_h
+#define __otbRemoveTortuousPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 
diff --git a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.txx b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.txx
index ddd7de0686..036631e885 100644
--- a/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.txx
+++ b/Code/FeatureExtraction/otbRemoveTortuousPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRemoveTortuousPathListFilter_txx
-#define _otbRemoveTortuousPathListFilter_txx
+#ifndef __otbRemoveTortuousPathListFilter_txx
+#define __otbRemoveTortuousPathListFilter_txx
 
 #include "otbRemoveTortuousPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
index 2b310be508..27e4d3d20f 100644
--- a/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
+++ b/Code/FeatureExtraction/otbRemoveWrongDirectionFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRemoveWrongDirectionFilter_h
-#define _otbRemoveWrongDirectionFilter_h
+#ifndef __otbRemoveWrongDirectionFilter_h
+#define __otbRemoveWrongDirectionFilter_h
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "itkBinaryFunctorImageFilter.h"
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.h b/Code/FeatureExtraction/otbRoadExtractionFilter.h
index 059684e664..600081c3b0 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.h
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRoadExtractionFilter_h
-#define _otbRoadExtractionFilter_h
+#ifndef __otbRoadExtractionFilter_h
+#define __otbRoadExtractionFilter_h
 
 #include "itkCovariantVector.h"
 #include "itkGradientRecursiveGaussianImageFilter.h"
diff --git a/Code/FeatureExtraction/otbRoadExtractionFilter.txx b/Code/FeatureExtraction/otbRoadExtractionFilter.txx
index 8f75b798d6..037e46ec29 100644
--- a/Code/FeatureExtraction/otbRoadExtractionFilter.txx
+++ b/Code/FeatureExtraction/otbRoadExtractionFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRoadExtractionFilter_txx
-#define _otbRoadExtractionFilter_txx
+#ifndef __otbRoadExtractionFilter_txx
+#define __otbRoadExtractionFilter_txx
 
 #include "otbRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Code/FeatureExtraction/otbSimplifyPathListFilter.h b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
index becfdc0b4b..7f3584d0f1 100644
--- a/Code/FeatureExtraction/otbSimplifyPathListFilter.h
+++ b/Code/FeatureExtraction/otbSimplifyPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSimplifyPathListFilter_h
-#define _otbSimplifyPathListFilter_h
+#ifndef __otbSimplifyPathListFilter_h
+#define __otbSimplifyPathListFilter_h
 
 #include "otbPathListToPathListFilter.h"
 
diff --git a/Code/FeatureExtraction/otbSimplifyPathListFilter.txx b/Code/FeatureExtraction/otbSimplifyPathListFilter.txx
index 0f565e521d..769f4c8a34 100644
--- a/Code/FeatureExtraction/otbSimplifyPathListFilter.txx
+++ b/Code/FeatureExtraction/otbSimplifyPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSimplifyPathListFilter_txx
-#define _otbSimplifyPathListFilter_txx
+#ifndef __otbSimplifyPathListFilter_txx
+#define __otbSimplifyPathListFilter_txx
 
 #include "otbSimplifyPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/FeatureExtraction/otbTreeSource.txx b/Code/FeatureExtraction/otbTreeSource.txx
index a55eb1f8af..d41e9e9e64 100644
--- a/Code/FeatureExtraction/otbTreeSource.txx
+++ b/Code/FeatureExtraction/otbTreeSource.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbTreeSource_txx
-#define _otbTreeSource_txx
+#ifndef __otbTreeSource_txx
+#define __otbTreeSource_txx
 
 #include "otbTreeSource.h"
 
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.h b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
index a81ae240a7..5139f310f5 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.h
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorizationPathListFilter_h
-#define _otbVectorizationPathListFilter_h
+#ifndef __otbVectorizationPathListFilter_h
+#define __otbVectorizationPathListFilter_h
 
 #include "otbPathListSource.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
index dacce5f261..9ad355efc1 100644
--- a/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
+++ b/Code/FeatureExtraction/otbVectorizationPathListFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorizationPathListFilter_txx
-#define _otbVectorizationPathListFilter_txx
+#ifndef __otbVectorizationPathListFilter_txx
+#define __otbVectorizationPathListFilter_txx
 
 #include "otbVectorizationPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Code/IO/otbFileName.h b/Code/IO/otbFileName.h
index 9c9513b5ff..b29f3225d4 100644
--- a/Code/IO/otbFileName.h
+++ b/Code/IO/otbFileName.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFileName_h
-#define _otbFileName_h
+#ifndef __otbFileName_h
+#define __otbFileName_h
 
 #include "itkDataObject.h"
 #include "ossim/base/ossimFilename.h"
diff --git a/Code/IO/otbImageFileReader.txx b/Code/IO/otbImageFileReader.txx
index 27b6b21c59..8276de57f7 100755
--- a/Code/IO/otbImageFileReader.txx
+++ b/Code/IO/otbImageFileReader.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageFileReader_txx
-#define _otbImageFileReader_txx
+#ifndef __otbImageFileReader_txx
+#define __otbImageFileReader_txx
 #include "otbImageFileReader.h"
 
 #include "itkObjectFactory.h"
diff --git a/Code/IO/otbImageFileWriter.txx b/Code/IO/otbImageFileWriter.txx
index 3e58430a2c..d2dec0bcb3 100755
--- a/Code/IO/otbImageFileWriter.txx
+++ b/Code/IO/otbImageFileWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageFileWriter_txx
-#define _otbImageFileWriter_txx
+#ifndef __otbImageFileWriter_txx
+#define __otbImageFileWriter_txx
 
 #include "otbImageFileWriter.h"
 #include "otbImageIOFactory.h"
diff --git a/Code/IO/otbPrepareSRTMDirectory.h b/Code/IO/otbPrepareSRTMDirectory.h
index 6172de24e1..130b1e6afe 100644
--- a/Code/IO/otbPrepareSRTMDirectory.h
+++ b/Code/IO/otbPrepareSRTMDirectory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPrepareSRTMDirectory_h
-#define _otbPrepareSRTMDirectory_h
+#ifndef __otbPrepareSRTMDirectory_h
+#define __otbPrepareSRTMDirectory_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/IO/otbPrepareSRTMDirectory.txx b/Code/IO/otbPrepareSRTMDirectory.txx
index 89604a5b2d..60254fe767 100644
--- a/Code/IO/otbPrepareSRTMDirectory.txx
+++ b/Code/IO/otbPrepareSRTMDirectory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPrepareSRTMDirectory_txx
-#define _otbPrepareSRTMDirectory_txx
+#ifndef __otbPrepareSRTMDirectory_txx
+#define __otbPrepareSRTMDirectory_txx
 
 #include "otbPrepareSRTMDirectory.h"
 
diff --git a/Code/IO/otbSHPVectorDataIOFactory.txx b/Code/IO/otbSHPVectorDataIOFactory.txx
index 57a379fed4..768c281b93 100644
--- a/Code/IO/otbSHPVectorDataIOFactory.txx
+++ b/Code/IO/otbSHPVectorDataIOFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSHPVectorDataIOFactory_txx
-#define _otbSHPVectorDataIOFactory_txx
+#ifndef __otbSHPVectorDataIOFactory_txx
+#define __otbSHPVectorDataIOFactory_txx
 
 #include "otbSHPVectorDataIOFactory.h"
 
diff --git a/Code/IO/otbStreamingImageFileWriter.txx b/Code/IO/otbStreamingImageFileWriter.txx
index 6945b56214..3a0523ea95 100755
--- a/Code/IO/otbStreamingImageFileWriter.txx
+++ b/Code/IO/otbStreamingImageFileWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingImageFileWriter_txx
-#define _otbStreamingImageFileWriter_txx
+#ifndef __otbStreamingImageFileWriter_txx
+#define __otbStreamingImageFileWriter_txx
 #include "otbStreamingImageFileWriter.h"
 
 #include "itkCommand.h"
diff --git a/Code/IO/otbStreamingImageVirtualWriter.txx b/Code/IO/otbStreamingImageVirtualWriter.txx
index 7f0b78884a..44a5f7971a 100755
--- a/Code/IO/otbStreamingImageVirtualWriter.txx
+++ b/Code/IO/otbStreamingImageVirtualWriter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbStreamingImageVirtualWriter_txx
-#define _otbStreamingImageVirtualWriter_txx
+#ifndef __otbStreamingImageVirtualWriter_txx
+#define __otbStreamingImageVirtualWriter_txx
 #include "otbStreamingImageVirtualWriter.h"
 
 #include "itkCommand.h"
diff --git a/Code/IO/otbVectorDataIOBase.txx b/Code/IO/otbVectorDataIOBase.txx
index 52cc44aab0..3723f91d50 100644
--- a/Code/IO/otbVectorDataIOBase.txx
+++ b/Code/IO/otbVectorDataIOBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorDataIOBase_txx
-#define _otbVectorDataIOBase_txx
+#ifndef __otbVectorDataIOBase_txx
+#define __otbVectorDataIOBase_txx
 
 #if defined(_MSC_VER)
 #pragma warning ( disable : 4786 )
diff --git a/Code/IO/otbVectorDataIOFactory.txx b/Code/IO/otbVectorDataIOFactory.txx
index 6b83aec186..adb8d0d9b6 100644
--- a/Code/IO/otbVectorDataIOFactory.txx
+++ b/Code/IO/otbVectorDataIOFactory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorDataIOFactory_txx
-#define _otbVectorDataIOFactory_txx
+#ifndef __otbVectorDataIOFactory_txx
+#define __otbVectorDataIOFactory_txx
 
 #ifdef _MSC_VER
 #pragma warning ( disable : 4786 )
diff --git a/Code/IO/otbVectorDataSource.txx b/Code/IO/otbVectorDataSource.txx
index 955691d94f..1517f92199 100644
--- a/Code/IO/otbVectorDataSource.txx
+++ b/Code/IO/otbVectorDataSource.txx
@@ -16,8 +16,8 @@ PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
-#ifndef _otbVectorDataSource_txx
-#define _otbVectorDataSource_txx
+#ifndef __otbVectorDataSource_txx
+#define __otbVectorDataSource_txx
 
 #include "otbVectorDataSource.h"
 
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.h b/Code/Learning/otbChangeProfileKernelFunctor.h
index 51d9beacdd..bf07b8575f 100644
--- a/Code/Learning/otbChangeProfileKernelFunctor.h
+++ b/Code/Learning/otbChangeProfileKernelFunctor.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbChangeProfileKernelFunctor_h
-#define _otbChangeProfileKernelFunctor_h
+#ifndef __otbChangeProfileKernelFunctor_h
+#define __otbChangeProfileKernelFunctor_h
 
 #include "svm.h"
 
diff --git a/Code/Learning/otbChangeProfileKernelFunctor.txx b/Code/Learning/otbChangeProfileKernelFunctor.txx
index a81c6407cd..e067ca7bba 100644
--- a/Code/Learning/otbChangeProfileKernelFunctor.txx
+++ b/Code/Learning/otbChangeProfileKernelFunctor.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbChangeProfileKernelFunctor_txx
-#define _otbChangeProfileKernelFunctor_txx
+#ifndef __otbChangeProfileKernelFunctor_txx
+#define __otbChangeProfileKernelFunctor_txx
 
 #include "otbChangeProfileKernelFunctor.h"
 
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.h b/Code/Learning/otbKMeansImageClassificationFilter.h
index 46215652ae..1fbb8eaf8c 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.h
+++ b/Code/Learning/otbKMeansImageClassificationFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbKMeansImageClassificationFilter_h
-#define _otbKMeansImageClassificationFilter_h
+#ifndef __otbKMeansImageClassificationFilter_h
+#define __otbKMeansImageClassificationFilter_h
 
 #include "itkInPlaceImageFilter.h"
 #include "itkFixedArray.h"
diff --git a/Code/Learning/otbKMeansImageClassificationFilter.txx b/Code/Learning/otbKMeansImageClassificationFilter.txx
index e737200250..f799b2f3bd 100644
--- a/Code/Learning/otbKMeansImageClassificationFilter.txx
+++ b/Code/Learning/otbKMeansImageClassificationFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbKMeansImageClassificationFilter_txx
-#define _otbKMeansImageClassificationFilter_txx
+#ifndef __otbKMeansImageClassificationFilter_txx
+#define __otbKMeansImageClassificationFilter_txx
 
 #include "otbKMeansImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.h b/Code/Learning/otbMixturePolyRBFKernelFunctor.h
index aa2f949dee..79a408d8ab 100644
--- a/Code/Learning/otbMixturePolyRBFKernelFunctor.h
+++ b/Code/Learning/otbMixturePolyRBFKernelFunctor.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMixturePolyRBFKernelFunctor_h
-#define _otbMixturePolyRBFKernelFunctor_h
+#ifndef __otbMixturePolyRBFKernelFunctor_h
+#define __otbMixturePolyRBFKernelFunctor_h
 
 #include "svm.h"
 
diff --git a/Code/Learning/otbMixturePolyRBFKernelFunctor.txx b/Code/Learning/otbMixturePolyRBFKernelFunctor.txx
index 6865438ecd..12d7e91a11 100644
--- a/Code/Learning/otbMixturePolyRBFKernelFunctor.txx
+++ b/Code/Learning/otbMixturePolyRBFKernelFunctor.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMixturePolyRBFKernelFunctor_txx
-#define _otbMixturePolyRBFKernelFunctor_txx
+#ifndef __otbMixturePolyRBFKernelFunctor_txx
+#define __otbMixturePolyRBFKernelFunctor_txx
 
 #include <cmath>
 
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.h b/Code/Learning/otbNonGaussianRBFKernelFunctor.h
index 0dc6bd36c6..4b82c676b7 100644
--- a/Code/Learning/otbNonGaussianRBFKernelFunctor.h
+++ b/Code/Learning/otbNonGaussianRBFKernelFunctor.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNonGaussianRBFKernelFunctor_h
-#define _otbNonGaussianRBFKernelFunctor_h
+#ifndef __otbNonGaussianRBFKernelFunctor_h
+#define __otbNonGaussianRBFKernelFunctor_h
 
 #include "svm.h"
 
diff --git a/Code/Learning/otbNonGaussianRBFKernelFunctor.txx b/Code/Learning/otbNonGaussianRBFKernelFunctor.txx
index 93f1b6fdc1..c546be2c30 100644
--- a/Code/Learning/otbNonGaussianRBFKernelFunctor.txx
+++ b/Code/Learning/otbNonGaussianRBFKernelFunctor.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbNonGaussianRBFKernelFunctor_txx
-#define _otbNonGaussianRBFKernelFunctor_txx
+#ifndef __otbNonGaussianRBFKernelFunctor_txx
+#define __otbNonGaussianRBFKernelFunctor_txx
 
 #include <cmath>
 
diff --git a/Code/Learning/otbSOM.h b/Code/Learning/otbSOM.h
index 22244de07a..52fe3e9b14 100644
--- a/Code/Learning/otbSOM.h
+++ b/Code/Learning/otbSOM.h
@@ -17,8 +17,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOM_h
-#define _otbSOM_h
+#ifndef __otbSOM_h
+#define __otbSOM_h
 
 #include "itkImageToImageFilter.h"
 #include "itkEuclideanDistance.h"
diff --git a/Code/Learning/otbSOM.txx b/Code/Learning/otbSOM.txx
index 177fe1ea2f..d3952afb78 100644
--- a/Code/Learning/otbSOM.txx
+++ b/Code/Learning/otbSOM.txx
@@ -18,8 +18,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOM_txx
-#define _otbSOM_txx
+#ifndef __otbSOM_txx
+#define __otbSOM_txx
 
 #include "otbSOM.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Code/Learning/otbSOMActivationBuilder.h b/Code/Learning/otbSOMActivationBuilder.h
index cf1be226bf..826ae576da 100644
--- a/Code/Learning/otbSOMActivationBuilder.h
+++ b/Code/Learning/otbSOMActivationBuilder.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMActivationBuilder_h
-#define _otbSOMActivationBuilder_h
+#ifndef __otbSOMActivationBuilder_h
+#define __otbSOMActivationBuilder_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/Learning/otbSOMActivationBuilder.txx b/Code/Learning/otbSOMActivationBuilder.txx
index f2ce21f788..92dca161b6 100644
--- a/Code/Learning/otbSOMActivationBuilder.txx
+++ b/Code/Learning/otbSOMActivationBuilder.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMActivationBuilder_txx
-#define _otbSOMActivationBuilder_txx
+#ifndef __otbSOMActivationBuilder_txx
+#define __otbSOMActivationBuilder_txx
 
 #include "itkImageRegionConstIterator.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSOMImageClassificationFilter.h b/Code/Learning/otbSOMImageClassificationFilter.h
index db9cb1d074..242d0b2388 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.h
+++ b/Code/Learning/otbSOMImageClassificationFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMImageClassificationFilter_h
-#define _otbSOMImageClassificationFilter_h
+#ifndef __otbSOMImageClassificationFilter_h
+#define __otbSOMImageClassificationFilter_h
 
 #include "otbSOMClassifier.h"
 #include "itkInPlaceImageFilter.h"
diff --git a/Code/Learning/otbSOMImageClassificationFilter.txx b/Code/Learning/otbSOMImageClassificationFilter.txx
index cc43b02fe5..8b7f4aae5f 100644
--- a/Code/Learning/otbSOMImageClassificationFilter.txx
+++ b/Code/Learning/otbSOMImageClassificationFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMImageClassificationFilter_txx
-#define _otbSOMImageClassificationFilter_txx
+#ifndef __otbSOMImageClassificationFilter_txx
+#define __otbSOMImageClassificationFilter_txx
 
 #include "otbSOMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSOMMap.h b/Code/Learning/otbSOMMap.h
index a826d8e7b7..d57bd2efb4 100644
--- a/Code/Learning/otbSOMMap.h
+++ b/Code/Learning/otbSOMMap.h
@@ -18,8 +18,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMMap_h
-#define _otbSOMMap_h
+#ifndef __otbSOMMap_h
+#define __otbSOMMap_h
 
 #include "itkVariableLengthVector.h"
 #include "itkEuclideanDistance.h"
diff --git a/Code/Learning/otbSOMMap.txx b/Code/Learning/otbSOMMap.txx
index a008f1f950..e5aa964299 100644
--- a/Code/Learning/otbSOMMap.txx
+++ b/Code/Learning/otbSOMMap.txx
@@ -18,8 +18,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSOMMap_txx
-#define _otbSOMMap_txx
+#ifndef __otbSOMMap_txx
+#define __otbSOMMap_txx
 
 #include "itkImageRegionIteratorWithIndex.h"
 
diff --git a/Code/Learning/otbSVMImageClassificationFilter.h b/Code/Learning/otbSVMImageClassificationFilter.h
index db1cdfb919..eab0c81b86 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.h
+++ b/Code/Learning/otbSVMImageClassificationFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMImageClassificationFilter_h
-#define _otbSVMImageClassificationFilter_h
+#ifndef __otbSVMImageClassificationFilter_h
+#define __otbSVMImageClassificationFilter_h
 
 #include "otbSVMClassifier.h"
 #include "itkInPlaceImageFilter.h"
diff --git a/Code/Learning/otbSVMImageClassificationFilter.txx b/Code/Learning/otbSVMImageClassificationFilter.txx
index ac5ecb98e1..6f066ebd36 100644
--- a/Code/Learning/otbSVMImageClassificationFilter.txx
+++ b/Code/Learning/otbSVMImageClassificationFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMImageClassificationFilter_txx
-#define _otbSVMImageClassificationFilter_txx
+#ifndef __otbSVMImageClassificationFilter_txx
+#define __otbSVMImageClassificationFilter_txx
 
 #include "otbSVMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSVMImageModelEstimator.h b/Code/Learning/otbSVMImageModelEstimator.h
index 5a74fb0f33..c3bf1227a0 100644
--- a/Code/Learning/otbSVMImageModelEstimator.h
+++ b/Code/Learning/otbSVMImageModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMImageModelEstimator_h
-#define _otbSVMImageModelEstimator_h
+#ifndef __otbSVMImageModelEstimator_h
+#define __otbSVMImageModelEstimator_h
 
 #include "itkImageModelEstimatorBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSVMImageModelEstimator.txx b/Code/Learning/otbSVMImageModelEstimator.txx
index ec15b28b76..a403f8b256 100644
--- a/Code/Learning/otbSVMImageModelEstimator.txx
+++ b/Code/Learning/otbSVMImageModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMImageModelEstimator_txx
-#define _otbSVMImageModelEstimator_txx
+#ifndef __otbSVMImageModelEstimator_txx
+#define __otbSVMImageModelEstimator_txx
 
 #include "otbSVMImageModelEstimator.h"
 #include "otbMacro.h"
diff --git a/Code/Learning/otbSVMKernels.h b/Code/Learning/otbSVMKernels.h
index 05864a449c..c393a1c664 100644
--- a/Code/Learning/otbSVMKernels.h
+++ b/Code/Learning/otbSVMKernels.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMKernels_h
-#define _otbSVMKernels_h
+#ifndef __otbSVMKernels_h
+#define __otbSVMKernels_h
 
 #include "itkNumericTraits.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSVMModel.h b/Code/Learning/otbSVMModel.h
index 74acc7dc9b..bbe94ca4a7 100644
--- a/Code/Learning/otbSVMModel.h
+++ b/Code/Learning/otbSVMModel.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMModel_h
-#define _otbSVMModel_h
+#ifndef __otbSVMModel_h
+#define __otbSVMModel_h
 
 #include "itkDataObject.h"
 #include "itkVariableLengthVector.h"
diff --git a/Code/Learning/otbSVMModelEstimator.h b/Code/Learning/otbSVMModelEstimator.h
index d8df1164d5..e80c030cb6 100644
--- a/Code/Learning/otbSVMModelEstimator.h
+++ b/Code/Learning/otbSVMModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMModelEstimator_h
-#define _otbSVMModelEstimator_h
+#ifndef __otbSVMModelEstimator_h
+#define __otbSVMModelEstimator_h
 
 #include "otbSVMModel.h"
 #include "itkLightProcessObject.h"
diff --git a/Code/Learning/otbSVMModelEstimator.txx b/Code/Learning/otbSVMModelEstimator.txx
index a8a6bd13a3..6389e4966b 100644
--- a/Code/Learning/otbSVMModelEstimator.txx
+++ b/Code/Learning/otbSVMModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMModelEstimator_txx
-#define _otbSVMModelEstimator_txx
+#ifndef __otbSVMModelEstimator_txx
+#define __otbSVMModelEstimator_txx
 
 #include "otbSVMModelEstimator.h"
 #include "otbMacro.h"
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.h b/Code/Learning/otbSVMPointSetModelEstimator.h
index 4c029c0c2b..eb42ffb22e 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.h
+++ b/Code/Learning/otbSVMPointSetModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMPointSetModelEstimator_h
-#define _otbSVMPointSetModelEstimator_h
+#ifndef __otbSVMPointSetModelEstimator_h
+#define __otbSVMPointSetModelEstimator_h
 
 #include "itkImageModelEstimatorBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSVMPointSetModelEstimator.txx b/Code/Learning/otbSVMPointSetModelEstimator.txx
index 9589c5b1cb..49b904066d 100644
--- a/Code/Learning/otbSVMPointSetModelEstimator.txx
+++ b/Code/Learning/otbSVMPointSetModelEstimator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMPointSetModelEstimator_txx
-#define _otbSVMPointSetModelEstimator_txx
+#ifndef __otbSVMPointSetModelEstimator_txx
+#define __otbSVMPointSetModelEstimator_txx
 
 #include "otbSVMPointSetModelEstimator.h"
 #include "itkCommand.h"
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.h b/Code/Learning/otbSVMSampleListModelEstimator.h
index 408141ab38..0e20fea1a9 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.h
+++ b/Code/Learning/otbSVMSampleListModelEstimator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSVMSampleListModelEstimator_h
-#define _otbSVMSampleListModelEstimator_h
+#ifndef __otbSVMSampleListModelEstimator_h
+#define __otbSVMSampleListModelEstimator_h
 
 #include "itkImageModelEstimatorBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/Learning/otbSVMSampleListModelEstimator.txx b/Code/Learning/otbSVMSampleListModelEstimator.txx
index 653a630082..118eb540b0 100644
--- a/Code/Learning/otbSVMSampleListModelEstimator.txx
+++ b/Code/Learning/otbSVMSampleListModelEstimator.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbSVMSampleListModelEstimator_txx
-#define _otbSVMSampleListModelEstimator_txx
+#ifndef __otbSVMSampleListModelEstimator_txx
+#define __otbSVMSampleListModelEstimator_txx
 
 #include "otbSVMSampleListModelEstimator.h"
 #include "itkCommand.h"
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.h b/Code/Learning/otbSpectralAngleKernelFunctor.h
index 10d91daa76..a975b1e01b 100644
--- a/Code/Learning/otbSpectralAngleKernelFunctor.h
+++ b/Code/Learning/otbSpectralAngleKernelFunctor.h
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpectralAngleKernelFunctor_h
-#define _otbSpectralAngleKernelFunctor_h
+#ifndef __otbSpectralAngleKernelFunctor_h
+#define __otbSpectralAngleKernelFunctor_h
 
 #include "svm.h"
 
diff --git a/Code/Learning/otbSpectralAngleKernelFunctor.txx b/Code/Learning/otbSpectralAngleKernelFunctor.txx
index 904298002b..32f9a11c3b 100644
--- a/Code/Learning/otbSpectralAngleKernelFunctor.txx
+++ b/Code/Learning/otbSpectralAngleKernelFunctor.txx
@@ -17,8 +17,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSpectralAngleKernelFunctor_txx
-#define _otbSpectralAngleKernelFunctor_txx
+#ifndef __otbSpectralAngleKernelFunctor_txx
+#define __otbSpectralAngleKernelFunctor_txx
 
 #include <cmath>
 #include <cfloat>
diff --git a/Code/Markov/otbMRFEnergy.h b/Code/Markov/otbMRFEnergy.h
index a354e6c283..0c7934a2dd 100644
--- a/Code/Markov/otbMRFEnergy.h
+++ b/Code/Markov/otbMRFEnergy.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMRFEnergy_h
-#define _otbMRFEnergy_h
+#ifndef __otbMRFEnergy_h
+#define __otbMRFEnergy_h
 
 #include "itkConstNeighborhoodIterator.h"
 #include "itkObject.h"
diff --git a/Code/Markov/otbMRFEnergyEdgeFidelity.h b/Code/Markov/otbMRFEnergyEdgeFidelity.h
index 87619a9203..bd0fb07699 100644
--- a/Code/Markov/otbMRFEnergyEdgeFidelity.h
+++ b/Code/Markov/otbMRFEnergyEdgeFidelity.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbMRFEnergyEdgeFidelity_h
-#define _otbMRFEnergyEdgeFidelity_h
+#ifndef __otbMRFEnergyEdgeFidelity_h
+#define __otbMRFEnergyEdgeFidelity_h
 
 #include "otbMRFEnergy.h"
 #define M_SQUARE(x) ((x)*(x))
diff --git a/Code/Markov/otbMRFEnergyGaussian.h b/Code/Markov/otbMRFEnergyGaussian.h
index 12094a8829..7e480827b0 100755
--- a/Code/Markov/otbMRFEnergyGaussian.h
+++ b/Code/Markov/otbMRFEnergyGaussian.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbMRFEnergyGaussian_h
-#define _otbMRFEnergyGaussian_h
+#ifndef __otbMRFEnergyGaussian_h
+#define __otbMRFEnergyGaussian_h
 
 #include "otbMRFEnergy.h"
 
diff --git a/Code/Markov/otbMRFEnergyGaussianClassification.h b/Code/Markov/otbMRFEnergyGaussianClassification.h
index cd40a54a13..4b2ea95cd8 100644
--- a/Code/Markov/otbMRFEnergyGaussianClassification.h
+++ b/Code/Markov/otbMRFEnergyGaussianClassification.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMRFEnergyGaussianClassification_h
-#define _otbMRFEnergyGaussianClassification_h
+#ifndef __otbMRFEnergyGaussianClassification_h
+#define __otbMRFEnergyGaussianClassification_h
 
 #include "otbMRFEnergy.h"
 #include "otbMath.h"
diff --git a/Code/Markov/otbMRFEnergyPotts.h b/Code/Markov/otbMRFEnergyPotts.h
index 46650a3abe..883f9733dc 100644
--- a/Code/Markov/otbMRFEnergyPotts.h
+++ b/Code/Markov/otbMRFEnergyPotts.h
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbMRFEnergyPotts_h
-#define _otbMRFEnergyPotts_h
+#ifndef __otbMRFEnergyPotts_h
+#define __otbMRFEnergyPotts_h
 
 #include "otbMRFEnergy.h"
 
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.h b/Code/Markov/otbMarkovRandomFieldFilter.h
index d4cb03f83b..b5ed41b04e 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.h
+++ b/Code/Markov/otbMarkovRandomFieldFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMarkovRandomFieldFilter_h
-#define _otbMarkovRandomFieldFilter_h
+#ifndef __otbMarkovRandomFieldFilter_h
+#define __otbMarkovRandomFieldFilter_h
 
 #include "otbMacro.h"
 
diff --git a/Code/Markov/otbMarkovRandomFieldFilter.txx b/Code/Markov/otbMarkovRandomFieldFilter.txx
index 5adf9e97e2..b2fbcc4eb0 100644
--- a/Code/Markov/otbMarkovRandomFieldFilter.txx
+++ b/Code/Markov/otbMarkovRandomFieldFilter.txx
@@ -16,8 +16,8 @@
 
 =========================================================================*/
 
-#ifndef _otbMarkovRandomFieldFilter_txx
-#define _otbMarkovRandomFieldFilter_txx
+#ifndef __otbMarkovRandomFieldFilter_txx
+#define __otbMarkovRandomFieldFilter_txx
 #include "otbMarkovRandomFieldFilter.h"
 
 namespace otb
diff --git a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
index 52cfd83c3d..b3fe2587cb 100644
--- a/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbConvexOrConcaveClassificationFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbConvexOrConcaveClassificationFilter_h
-#define _otbConvexOrConcaveClassificationFilter_h
+#ifndef __otbConvexOrConcaveClassificationFilter_h
+#define __otbConvexOrConcaveClassificationFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 namespace otb
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
index efe75459b8..805efabcc6 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeodesicMorphologyDecompositionImageFilter_h
-#define _otbGeodesicMorphologyDecompositionImageFilter_h
+#ifndef __otbGeodesicMorphologyDecompositionImageFilter_h
+#define __otbGeodesicMorphologyDecompositionImageFilter_h
 
 #include "itkImageToImageFilter.h"
 #include "otbGeodesicMorphologyLevelingFilter.h"
diff --git a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
index 8f5b33e07d..31e747ee0d 100644
--- a/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyDecompositionImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeodesicMorphologyDecompositionImageFilter_txx
-#define _otbGeodesicMorphologyDecompositionImageFilter_txx
+#ifndef __otbGeodesicMorphologyDecompositionImageFilter_txx
+#define __otbGeodesicMorphologyDecompositionImageFilter_txx
 
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
 
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index 8507a490e2..1ce1f1a09c 100644
--- a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeodesicMorphologyIterativeDecompositionImageFilter_h
-#define _otbGeodesicMorphologyIterativeDecompositionImageFilter_h
+#ifndef __otbGeodesicMorphologyIterativeDecompositionImageFilter_h
+#define __otbGeodesicMorphologyIterativeDecompositionImageFilter_h
 
 #include "otbImageToImageListFilter.h"
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
diff --git a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
index 44b4af7e22..b7675b8ff3 100644
--- a/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
+++ b/Code/MultiScale/otbGeodesicMorphologyIterativeDecompositionImageFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
-#define _otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#ifndef __otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#define __otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
 
 #include <math.h>
 
diff --git a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
index 7706593d73..4514ce7221 100644
--- a/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
+++ b/Code/MultiScale/otbGeodesicMorphologyLevelingFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGeodesicMorphologyLevelingFilter_h
-#define _otbGeodesicMorphologyLevelingFilter_h
+#ifndef __otbGeodesicMorphologyLevelingFilter_h
+#define __otbGeodesicMorphologyLevelingFilter_h
 
 
 #include "itkTernaryFunctorImageFilter.h"
diff --git a/Code/MultiScale/otbImageToProfileFilter.h b/Code/MultiScale/otbImageToProfileFilter.h
index 2d44ee0cf0..9c87fc0ada 100644
--- a/Code/MultiScale/otbImageToProfileFilter.h
+++ b/Code/MultiScale/otbImageToProfileFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToProfileFilter_h
-#define _otbImageToProfileFilter_h
+#ifndef __otbImageToProfileFilter_h
+#define __otbImageToProfileFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Code/MultiScale/otbImageToProfileFilter.txx b/Code/MultiScale/otbImageToProfileFilter.txx
index 7e08adcc6c..0d1b386854 100644
--- a/Code/MultiScale/otbImageToProfileFilter.txx
+++ b/Code/MultiScale/otbImageToProfileFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToProfileFilter_txx
-#define _otbImageToProfileFilter_txx
+#ifndef __otbImageToProfileFilter_txx
+#define __otbImageToProfileFilter_txx
 
 #include "otbImageToProfileFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
index c81c76854e..a1cc07a500 100644
--- a/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalClosingProfileFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalClosingProfileFilter_h
-#define _otbMorphologicalClosingProfileFilter_h
+#ifndef __otbMorphologicalClosingProfileFilter_h
+#define __otbMorphologicalClosingProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
 #include "itkClosingByReconstructionImageFilter.h"
diff --git a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
index 58cce264fb..8bfb8f33e5 100644
--- a/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
+++ b/Code/MultiScale/otbMorphologicalOpeningProfileFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalOpeningProfileFilter_h
-#define _otbMorphologicalOpeningProfileFilter_h
+#ifndef __otbMorphologicalOpeningProfileFilter_h
+#define __otbMorphologicalOpeningProfileFilter_h
 
 #include "otbImageToProfileFilter.h"
 #include "itkOpeningByReconstructionImageFilter.h"
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
index 8db8ec1781..f45a2c4720 100644
--- a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidAnalysisFilter_h
-#define _otbMorphologicalPyramidAnalysisFilter_h
+#ifndef __otbMorphologicalPyramidAnalysisFilter_h
+#define __otbMorphologicalPyramidAnalysisFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
index 4aa8a0aa0c..3fd33c4f2a 100644
--- a/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidAnalysisFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidAnalysisFilter_txx
-#define _otbMorphologicalPyramidAnalysisFilter_txx
+#ifndef __otbMorphologicalPyramidAnalysisFilter_txx
+#define __otbMorphologicalPyramidAnalysisFilter_txx
 
 #include <math.h>
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
index 35259ef9c8..c6c002fbeb 100644
--- a/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidMRToMSConverter.h
@@ -15,8 +15,8 @@
  PURPOSE.  See the above copyright notices for more information.
 
  =========================================================================*/
-#ifndef _otbMorphologicalPyramidMRToMSConverter_h
-#define _otbMorphologicalPyramidMRToMSConverter_h
+#ifndef __otbMorphologicalPyramidMRToMSConverter_h
+#define __otbMorphologicalPyramidMRToMSConverter_h
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidResampler.h b/Code/MultiScale/otbMorphologicalPyramidResampler.h
index fbb75d63fb..bee233c147 100644
--- a/Code/MultiScale/otbMorphologicalPyramidResampler.h
+++ b/Code/MultiScale/otbMorphologicalPyramidResampler.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidResampler_h
-#define _otbMorphologicalPyramidResampler_h
+#ifndef __otbMorphologicalPyramidResampler_h
+#define __otbMorphologicalPyramidResampler_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
index ffafe1d896..a4e0d97bcc 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSegmentationFilter_h
-#define _otbMorphologicalPyramidSegmentationFilter_h
+#ifndef __otbMorphologicalPyramidSegmentationFilter_h
+#define __otbMorphologicalPyramidSegmentationFilter_h
 
 #include "otbImageListToImageListFilter.h"
 namespace otb
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
index cc9963c9df..3c727b3804 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmentationFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSegmentationFilter_txx
-#define _otbMorphologicalPyramidSegmentationFilter_txx
+#ifndef __otbMorphologicalPyramidSegmentationFilter_txx
+#define __otbMorphologicalPyramidSegmentationFilter_txx
 
 #include "otbMorphologicalPyramidSegmentationFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
index ef0e503f6d..2fa12d7588 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSegmenter_h
-#define _otbMorphologicalPyramidSegmenter_h
+#ifndef __otbMorphologicalPyramidSegmenter_h
+#define __otbMorphologicalPyramidSegmenter_h
 
 #include "itkImageToImageFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
index 2766356a80..c373aed852 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSegmenter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSegmenter_txx
-#define _otbMorphologicalPyramidSegmenter_txx
+#ifndef __otbMorphologicalPyramidSegmenter_txx
+#define __otbMorphologicalPyramidSegmenter_txx
 
 #include "otbMorphologicalPyramidSegmenter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
index 225bb10f76..8cddc17496 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSynthesisFilter_h
-#define _otbMorphologicalPyramidSynthesisFilter_h
+#ifndef __otbMorphologicalPyramidSynthesisFilter_h
+#define __otbMorphologicalPyramidSynthesisFilter_h
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
index 71575ad529..501fae0543 100644
--- a/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
+++ b/Code/MultiScale/otbMorphologicalPyramidSynthesisFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbMorphologicalPyramidSynthesisFilter_txx
-#define _otbMorphologicalPyramidSynthesisFilter_txx
+#ifndef __otbMorphologicalPyramidSynthesisFilter_txx
+#define __otbMorphologicalPyramidSynthesisFilter_txx
 
 #include "otbMorphologicalPyramidSynthesisFilter.h"
 
diff --git a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
index 4f91ae5416..3096abeb8f 100644
--- a/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
+++ b/Code/MultiScale/otbMultiScaleConvexOrConcaveClassificationFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbConvexOrConcaveClassificationFilter_h
-#define _otbConvexOrConcaveClassificationFilter_h
+#ifndef __otbConvexOrConcaveClassificationFilter_h
+#define __otbConvexOrConcaveClassificationFilter_h
 
 #include "otbQuaternaryFunctorImageFilter.h"
 namespace otb
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 9f2d9801ab..d3e3de9906 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProfileDerivativeMultiScaleToCharacteristicsFilter_h
-#define _otbProfileDerivativeMultiScaleToCharacteristicsFilter_h
+#ifndef __otbProfileDerivativeMultiScaleToCharacteristicsFilter_h
+#define __otbProfileDerivativeMultiScaleToCharacteristicsFilter_h
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
index 811a50f096..8779b5729f 100644
--- a/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
+++ b/Code/MultiScale/otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
-#define _otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#ifndef __otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#define __otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
 
 #include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
index fae85fbcf5..183ca0bc6c 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProfileToProfileDerivativeFilter_h
-#define _otbProfileToProfileDerivativeFilter_h
+#ifndef __otbProfileToProfileDerivativeFilter_h
+#define __otbProfileToProfileDerivativeFilter_h
 
 #include "otbImageListToImageListFilter.h"
 #include "itkSubtractImageFilter.h"
diff --git a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
index f323537eed..8239b34754 100644
--- a/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
+++ b/Code/MultiScale/otbProfileToProfileDerivativeFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbProfileToProfileDerivativeFilter_txx
-#define _otbProfileToProfileDerivativeFilter_txx
+#ifndef __otbProfileToProfileDerivativeFilter_txx
+#define __otbProfileToProfileDerivativeFilter_txx
 
 #include "otbProfileToProfileDerivativeFilter.h"
 
diff --git a/Code/Projections/otbOrthoRectificationFilter.txx b/Code/Projections/otbOrthoRectificationFilter.txx
index 4994b0939f..fdf14de1ce 100644
--- a/Code/Projections/otbOrthoRectificationFilter.txx
+++ b/Code/Projections/otbOrthoRectificationFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbOrthoRectificationFilter_txx
-#define _otbOrthoRectificationFilter_txx
+#ifndef __otbOrthoRectificationFilter_txx
+#define __otbOrthoRectificationFilter_txx
 
 #include "otbOrthoRectificationFilter.h"
 
diff --git a/Code/Projections/otbPlaceNameToLonLat.h b/Code/Projections/otbPlaceNameToLonLat.h
index c94f47eca9..365d9694d7 100644
--- a/Code/Projections/otbPlaceNameToLonLat.h
+++ b/Code/Projections/otbPlaceNameToLonLat.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPlaceNameToLonLat_h
-#define _otbPlaceNameToLonLat_h
+#ifndef __otbPlaceNameToLonLat_h
+#define __otbPlaceNameToLonLat_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/Projections/otbPlaceNameToLonLat.txx b/Code/Projections/otbPlaceNameToLonLat.txx
index c626c07dbd..591c626bd5 100644
--- a/Code/Projections/otbPlaceNameToLonLat.txx
+++ b/Code/Projections/otbPlaceNameToLonLat.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPlaceNameToLonLat_txx
-#define _otbPlaceNameToLonLat_txx
+#ifndef __otbPlaceNameToLonLat_txx
+#define __otbPlaceNameToLonLat_txx
 
 #include "otbPlaceNameToLonLat.h"
 #include "tinyxml.h"
diff --git a/Code/Projections/otbPrepareSRTMDirectory.h b/Code/Projections/otbPrepareSRTMDirectory.h
index d9dbd56916..da8b8b1192 100644
--- a/Code/Projections/otbPrepareSRTMDirectory.h
+++ b/Code/Projections/otbPrepareSRTMDirectory.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPrepareSRTMDirectory_h
-#define _otbPrepareSRTMDirectory_h
+#ifndef __otbPrepareSRTMDirectory_h
+#define __otbPrepareSRTMDirectory_h
 
 #include "itkObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/Projections/otbPrepareSRTMDirectory.txx b/Code/Projections/otbPrepareSRTMDirectory.txx
index 780fdb63be..c8483122ab 100644
--- a/Code/Projections/otbPrepareSRTMDirectory.txx
+++ b/Code/Projections/otbPrepareSRTMDirectory.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPrepareSRTMDirectory_txx
-#define _otbPrepareSRTMDirectory_txx
+#ifndef __otbPrepareSRTMDirectory_txx
+#define __otbPrepareSRTMDirectory_txx
 
 #include "otbPrepareSRTMDirectory.h"
 
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParameters.h b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
index 6d94a80c3d..599728c0bc 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParameters.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParameters.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbAtmosphericCorrectionParameters_h
-#define _otbAtmosphericCorrectionParameters_h
+#ifndef __otbAtmosphericCorrectionParameters_h
+#define __otbAtmosphericCorrectionParameters_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
index 959828b38c..ee062d571d 100644
--- a/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms_h
-#define _otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms_h
+#ifndef __otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms_h
+#define __otbAtmosphericCorrectionParametersTo6SAtmosphericRadiativeTerms_h
 
 #include "otbMacro.h"
 #include "itkProcessObject.h"
diff --git a/Code/Radiometry/otbAtmosphericRadiativeTerms.h b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
index 4a3cfb51ac..94630319df 100644
--- a/Code/Radiometry/otbAtmosphericRadiativeTerms.h
+++ b/Code/Radiometry/otbAtmosphericRadiativeTerms.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbAtmosphericRadiativeTerms_h
-#define _otbAtmosphericRadiativeTerms_h
+#ifndef __otbAtmosphericRadiativeTerms_h
+#define __otbAtmosphericRadiativeTerms_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/Radiometry/otbSIXSTraits.h b/Code/Radiometry/otbSIXSTraits.h
index 3c3be7c128..c0362cf2b5 100644
--- a/Code/Radiometry/otbSIXSTraits.h
+++ b/Code/Radiometry/otbSIXSTraits.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbSIXSTraits_h
-#define _otbSIXSTraits_h
+#ifndef __otbSIXSTraits_h
+#define __otbSIXSTraits_h
 
 #include "otbAtmosphericCorrectionParameters.h"
 
diff --git a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
index ff922f16a6..f780897a4a 100644
--- a/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
+++ b/Code/Radiometry/otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.txx
@@ -20,8 +20,8 @@
 
 =========================================================================*/
 
-#ifndef _otbSurfaceAdjencyEffect6SCorrectionSchemeFilter_txx
-#define _otbSurfaceAdjencyEffect6SCorrectionSchemeFilter_txx
+#ifndef __otbSurfaceAdjencyEffect6SCorrectionSchemeFilter_txx
+#define __otbSurfaceAdjencyEffect6SCorrectionSchemeFilter_txx
 
 #include "otbSurfaceAdjencyEffect6SCorrectionSchemeFilter.h"
 
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
index 7523697800..7b9ee3ff0a 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToRCC8GraphFilter_h
-#define _otbImageListToRCC8GraphFilter_h
+#ifndef __otbImageListToRCC8GraphFilter_h
+#define __otbImageListToRCC8GraphFilter_h
 
 #include "otbRCC8GraphSource.h"
 
diff --git a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
index 534e9da636..b5407d9c20 100644
--- a/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbImageListToRCC8GraphFilter.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageListToRCC8GraphFilter_txx
-#define _otbImageListToRCC8GraphFilter_txx
+#ifndef __otbImageListToRCC8GraphFilter_txx
+#define __otbImageListToRCC8GraphFilter_txx
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
index d234a3c833..9efb7a5fe9 100644
--- a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageMultiSegmentationToRCC8GraphFilter_h
-#define _otbImageMultiSegmentationToRCC8GraphFilter_h
+#ifndef __otbImageMultiSegmentationToRCC8GraphFilter_h
+#define __otbImageMultiSegmentationToRCC8GraphFilter_h
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
index f8e03ff525..9bbbc76a5f 100644
--- a/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
+++ b/Code/SpatialReasoning/otbImageMultiSegmentationToRCC8GraphFilter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageMultiSegmentationToRCC8GraphFilter_txx
-#define _otbImageMultiSegmentationToRCC8GraphFilter_txx
+#ifndef __otbImageMultiSegmentationToRCC8GraphFilter_txx
+#define __otbImageMultiSegmentationToRCC8GraphFilter_txx
 
 #include "otbImageMultiSegmentationToRCC8GraphFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
index 61d7fda7b9..7b3e6e248f 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToImageRCC8Calculator_h
-#define _otbImageToImageRCC8Calculator_h
+#ifndef __otbImageToImageRCC8Calculator_h
+#define __otbImageToImageRCC8Calculator_h
 
 #include "itkImageToImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
index 82430a6c2b..6bf4ec3462 100644
--- a/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbImageToImageRCC8Calculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToImageRCC8Calculator_txx
-#define _otbImageToImageRCC8Calculator_txx
+#ifndef __otbImageToImageRCC8Calculator_txx
+#define __otbImageToImageRCC8Calculator_txx
 
 #include "otbImageToImageRCC8Calculator.h"
 #include "itkBinaryDilateImageFilter.h"
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
index cee52a90f1..d1e0fd8d70 100644
--- a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
+++ b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolygonToPolygonRCC8Calculator_h
-#define _otbPolygonToPolygonRCC8Calculator_h
+#ifndef __otbPolygonToPolygonRCC8Calculator_h
+#define __otbPolygonToPolygonRCC8Calculator_h
 
 #include "itkObject.h"
 #include "otbRCC8Value.h"
diff --git a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
index a8a26e32ab..c181c72d8a 100644
--- a/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
+++ b/Code/SpatialReasoning/otbPolygonToPolygonRCC8Calculator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbPolygonToPolygonRCC8Calculator_txx
-#define _otbPolygonToPolygonRCC8Calculator_txx
+#ifndef __otbPolygonToPolygonRCC8Calculator_txx
+#define __otbPolygonToPolygonRCC8Calculator_txx
 
 #include "otbPolygonToPolygonRCC8Calculator.h"
 #include "otbMacro.h"
diff --git a/Code/SpatialReasoning/otbRCC8Edge.h b/Code/SpatialReasoning/otbRCC8Edge.h
index e886b6e364..89be39e2b1 100644
--- a/Code/SpatialReasoning/otbRCC8Edge.h
+++ b/Code/SpatialReasoning/otbRCC8Edge.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8Edge_h
-#define _otbRCC8Edge_h
+#ifndef __otbRCC8Edge_h
+#define __otbRCC8Edge_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.h b/Code/SpatialReasoning/otbRCC8EdgeIterator.h
index 3a900fa2f9..c7189f908d 100644
--- a/Code/SpatialReasoning/otbRCC8EdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8EdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8EdgeIterator_h
-#define _otbRCC8EdgeIterator_h
+#ifndef __otbRCC8EdgeIterator_h
+#define __otbRCC8EdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8EdgeIterator.txx b/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
index 3072e74f02..ab6315ad2b 100644
--- a/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8EdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8EdgeIterator_txx
-#define _otbRCC8EdgeIterator_txx
+#ifndef __otbRCC8EdgeIterator_txx
+#define __otbRCC8EdgeIterator_txx
 
 #include "otbRCC8EdgeIterator.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8Graph.h b/Code/SpatialReasoning/otbRCC8Graph.h
index 5a74837c7f..15b1dd659f 100644
--- a/Code/SpatialReasoning/otbRCC8Graph.h
+++ b/Code/SpatialReasoning/otbRCC8Graph.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8Graph_h
-#define _otbRCC8Graph_h
+#ifndef __otbRCC8Graph_h
+#define __otbRCC8Graph_h
 
 #include "otbRCC8Edge.h"
 #include <boost/graph/graph_traits.hpp>
diff --git a/Code/SpatialReasoning/otbRCC8Graph.txx b/Code/SpatialReasoning/otbRCC8Graph.txx
index 83cfb5d10c..2a8b50faaa 100644
--- a/Code/SpatialReasoning/otbRCC8Graph.txx
+++ b/Code/SpatialReasoning/otbRCC8Graph.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8Graph_txx
-#define _otbRCC8Graph_txx
+#ifndef __otbRCC8Graph_txx
+#define __otbRCC8Graph_txx
 
 namespace otb
 {
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.h b/Code/SpatialReasoning/otbRCC8GraphSource.h
index b1a58bb5d2..235a833614 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.h
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8GraphSource_h
-#define _otbRCC8GraphSource_h
+#ifndef __otbRCC8GraphSource_h
+#define __otbRCC8GraphSource_h
 
 #include "itkProcessObject.h"
 #include "otbImageList.h"
diff --git a/Code/SpatialReasoning/otbRCC8GraphSource.txx b/Code/SpatialReasoning/otbRCC8GraphSource.txx
index 0cdd8a81f3..c0f4070fbb 100644
--- a/Code/SpatialReasoning/otbRCC8GraphSource.txx
+++ b/Code/SpatialReasoning/otbRCC8GraphSource.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8GraphSource_txx
-#define _otbRCC8GraphSource_txx
+#ifndef __otbRCC8GraphSource_txx
+#define __otbRCC8GraphSource_txx
 
 #include "otbRCC8GraphSource.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.h b/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
index bd6380b347..3409507c97 100644
--- a/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8InEdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8InEdgeIterator_h
-#define _otbRCC8InEdgeIterator_h
+#ifndef __otbRCC8InEdgeIterator_h
+#define __otbRCC8InEdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx b/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
index 775e324183..29de019d32 100644
--- a/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8InEdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8InEdgeIterator_txx
-#define _otbRCC8InEdgeIterator_txx
+#ifndef __otbRCC8InEdgeIterator_txx
+#define __otbRCC8InEdgeIterator_txx
 
 #include "otbRCC8InEdgeIterator.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
index f71d777b64..a8defa7178 100644
--- a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
+++ b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8OutEdgeIterator_h
-#define _otbRCC8OutEdgeIterator_h
+#ifndef __otbRCC8OutEdgeIterator_h
+#define __otbRCC8OutEdgeIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
index abb7e8830f..078e947a87 100644
--- a/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8OutEdgeIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8OutEdgeIterator_txx
-#define _otbRCC8OutEdgeIterator_txx
+#ifndef __otbRCC8OutEdgeIterator_txx
+#define __otbRCC8OutEdgeIterator_txx
 
 #include "otbRCC8OutEdgeIterator.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8Value.h b/Code/SpatialReasoning/otbRCC8Value.h
index 9e084cb33b..c306fc0962 100644
--- a/Code/SpatialReasoning/otbRCC8Value.h
+++ b/Code/SpatialReasoning/otbRCC8Value.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8Value_h
-#define _otbRCC8Value_h
+#ifndef __otbRCC8Value_h
+#define __otbRCC8Value_h
 
 namespace otb
 {
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.h b/Code/SpatialReasoning/otbRCC8VertexBase.h
index 6acba06825..b7db068a1b 100644
--- a/Code/SpatialReasoning/otbRCC8VertexBase.h
+++ b/Code/SpatialReasoning/otbRCC8VertexBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexBase_h
-#define _otbRCC8VertexBase_h
+#ifndef __otbRCC8VertexBase_h
+#define __otbRCC8VertexBase_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/SpatialReasoning/otbRCC8VertexBase.txx b/Code/SpatialReasoning/otbRCC8VertexBase.txx
index c0ae5c7d18..131ca6e5ce 100644
--- a/Code/SpatialReasoning/otbRCC8VertexBase.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexBase_txx
-#define _otbRCC8VertexBase_txx
+#ifndef __otbRCC8VertexBase_txx
+#define __otbRCC8VertexBase_txx
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.h b/Code/SpatialReasoning/otbRCC8VertexIterator.h
index bc9c500259..e1c3bad638 100644
--- a/Code/SpatialReasoning/otbRCC8VertexIterator.h
+++ b/Code/SpatialReasoning/otbRCC8VertexIterator.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexIterator_h
-#define _otbRCC8VertexIterator_h
+#ifndef __otbRCC8VertexIterator_h
+#define __otbRCC8VertexIterator_h
 
 #include "otbRCC8Graph.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8VertexIterator.txx b/Code/SpatialReasoning/otbRCC8VertexIterator.txx
index 8496793319..53e1b6e1af 100644
--- a/Code/SpatialReasoning/otbRCC8VertexIterator.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexIterator.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexIterator_txx
-#define _otbRCC8VertexIterator_txx
+#ifndef __otbRCC8VertexIterator_txx
+#define __otbRCC8VertexIterator_txx
 
 #include "otbRCC8VertexIterator.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
index 7dffcba63f..c430739e71 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexWithCompacity_h
-#define _otbRCC8VertexWithCompacity_h
+#ifndef __otbRCC8VertexWithCompacity_h
+#define __otbRCC8VertexWithCompacity_h
 
 #include "otbRCC8VertexBase.h"
 #include "itkObjectFactory.h"
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
index e43614b1d5..117ccf6a2d 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexWithCompacity.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexWithCompacity_txx
-#define _otbRCC8VertexWithCompacity_txx
+#ifndef __otbRCC8VertexWithCompacity_txx
+#define __otbRCC8VertexWithCompacity_txx
 
 #include "otbRCC8VertexWithCompacity.h"
 
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
index 75ec29a660..552b7332d7 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexWithRegionCenter_h
-#define _otbRCC8VertexWithRegionCenter_h
+#ifndef __otbRCC8VertexWithRegionCenter_h
+#define __otbRCC8VertexWithRegionCenter_h
 
 #include "otbRCC8VertexBase.h"
 #include "itkObjectFactory.h"
diff --git a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
index faa22ea463..999e12b082 100644
--- a/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
+++ b/Code/SpatialReasoning/otbRCC8VertexWithRegionCenter.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbRCC8VertexWithRegionCenter_txx
-#define _otbRCC8VertexWithRegionCenter_txx
+#ifndef __otbRCC8VertexWithRegionCenter_txx
+#define __otbRCC8VertexWithRegionCenter_txx
 
 #include "otbRCC8VertexWithRegionCenter.h"
 
diff --git a/Code/Visu/otbFixedSizeFullImageWidget.h b/Code/Visu/otbFixedSizeFullImageWidget.h
index 13b20c5d19..4cf705438f 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.h
+++ b/Code/Visu/otbFixedSizeFullImageWidget.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFixedSizeFullImageWidget_h
-#define _otbFixedSizeFullImageWidget_h
+#ifndef __otbFixedSizeFullImageWidget_h
+#define __otbFixedSizeFullImageWidget_h
 
 #include "otbImageWidgetBase.h"
 
diff --git a/Code/Visu/otbFixedSizeFullImageWidget.txx b/Code/Visu/otbFixedSizeFullImageWidget.txx
index c8e7ec1136..dc3a4dd799 100644
--- a/Code/Visu/otbFixedSizeFullImageWidget.txx
+++ b/Code/Visu/otbFixedSizeFullImageWidget.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFixedSizeFullImageWidget_txx
-#define _otbFixedSizeFullImageWidget_txx
+#ifndef __otbFixedSizeFullImageWidget_txx
+#define __otbFixedSizeFullImageWidget_txx
 
 #include "otbFixedSizeFullImageWidget.h"
 #include "otbMacro.h"
diff --git a/Code/Visu/otbFullResolutionImageWidget.h b/Code/Visu/otbFullResolutionImageWidget.h
index e1bfc13a04..02f2106fc6 100644
--- a/Code/Visu/otbFullResolutionImageWidget.h
+++ b/Code/Visu/otbFullResolutionImageWidget.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFullResolutionImageWidget_h
-#define _otbFullResolutionImageWidget_h
+#ifndef __otbFullResolutionImageWidget_h
+#define __otbFullResolutionImageWidget_h
 
 #include "otbImageWidgetBase.h"
 
diff --git a/Code/Visu/otbFullResolutionImageWidget.txx b/Code/Visu/otbFullResolutionImageWidget.txx
index 9849486798..90620c3a16 100644
--- a/Code/Visu/otbFullResolutionImageWidget.txx
+++ b/Code/Visu/otbFullResolutionImageWidget.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbFullResolutionImageWidget_txx
-#define _otbFullResolutionImageWidget_txx
+#ifndef __otbFullResolutionImageWidget_txx
+#define __otbFullResolutionImageWidget_txx
 
 #include "otbFullResolutionImageWidget.h"
 #include "otbMacro.h"
diff --git a/Code/Visu/otbGluPolygonDrawingHelper.h b/Code/Visu/otbGluPolygonDrawingHelper.h
index 38ff675a67..884143407f 100644
--- a/Code/Visu/otbGluPolygonDrawingHelper.h
+++ b/Code/Visu/otbGluPolygonDrawingHelper.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbGluPolygonDrawingHelper_h
-#define _otbGluPolygonDrawingHelper_h
+#ifndef __otbGluPolygonDrawingHelper_h
+#define __otbGluPolygonDrawingHelper_h
 
 #include <FL/gl.h>
 #  ifdef __APPLE__
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.h b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
index 1f7ea7358f..7f93bdc1cb 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHistogramAndTransferFunctionWidget_h
-#define _otbHistogramAndTransferFunctionWidget_h
+#ifndef __otbHistogramAndTransferFunctionWidget_h
+#define __otbHistogramAndTransferFunctionWidget_h
 
 #include "itkProcessObject.h"
 #include "itkFixedArray.h"
diff --git a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
index 8fbfc9fb57..aeb5e34246 100644
--- a/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
+++ b/Code/Visu/otbHistogramAndTransferFunctionWidget.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbHistogramAndTransferFunctionWidget_txx
-#define _otbHistogramAndTransferFunctionWidget_txx
+#ifndef __otbHistogramAndTransferFunctionWidget_txx
+#define __otbHistogramAndTransferFunctionWidget_txx
 
 #include "otbHistogramAndTransferFunctionWidget.h"
 #include <FL/gl.h>
diff --git a/Code/Visu/otbImageAlternateViewer.h b/Code/Visu/otbImageAlternateViewer.h
index 200806839a..2636172405 100644
--- a/Code/Visu/otbImageAlternateViewer.h
+++ b/Code/Visu/otbImageAlternateViewer.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageAlternateViewer_h
-#define _otbImageAlternateViewer_h
+#ifndef __otbImageAlternateViewer_h
+#define __otbImageAlternateViewer_h
 
 #include "FL/Fl_Gl_Window.H"
 #include "itkObject.h"
diff --git a/Code/Visu/otbImageAlternateViewer.txx b/Code/Visu/otbImageAlternateViewer.txx
index 4c0b7fcfc0..7238d31b9e 100644
--- a/Code/Visu/otbImageAlternateViewer.txx
+++ b/Code/Visu/otbImageAlternateViewer.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageAlternateViewer_txx
-#define _otbImageAlternateViewer_txx
+#ifndef __otbImageAlternateViewer_txx
+#define __otbImageAlternateViewer_txx
 
 #include "otbImageAlternateViewer.h"
 #include <FL/fl_draw.H>
diff --git a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
index ca416b1a96..1c9ceef688 100644
--- a/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
+++ b/Code/Visu/otbImageToGrayscaleAnaglyphImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageToGrayscaleAnaglyphImageFilter_h
-#define _otbImageToGrayscaleAnaglyphImageFilter_h
+#ifndef __otbImageToGrayscaleAnaglyphImageFilter_h
+#define __otbImageToGrayscaleAnaglyphImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Code/Visu/otbImageViewer.txx b/Code/Visu/otbImageViewer.txx
index ed55ca0a1f..7048f9986e 100644
--- a/Code/Visu/otbImageViewer.txx
+++ b/Code/Visu/otbImageViewer.txx
@@ -9,8 +9,8 @@
   the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
   PURPOSE.  See the above copyright notices for more information.
   =========================================================================*/
-#ifndef _otbImageViewer_txx
-#define _otbImageViewer_txx
+#ifndef __otbImageViewer_txx
+#define __otbImageViewer_txx
 #include "otbImageViewer.h"
 
 namespace otb
diff --git a/Code/Visu/otbImageViewerBase.txx b/Code/Visu/otbImageViewerBase.txx
index 3b7a9342b9..16fa22b4c7 100644
--- a/Code/Visu/otbImageViewerBase.txx
+++ b/Code/Visu/otbImageViewerBase.txx
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageViewerBase_txx
-#define _otbImageViewerBase_txx
+#ifndef __otbImageViewerBase_txx
+#define __otbImageViewerBase_txx
 
 #include "otbImageViewer.h"
 #include "otbFltkFilterWatcher.h"
diff --git a/Code/Visu/otbImageViewerFullWidget.h b/Code/Visu/otbImageViewerFullWidget.h
index 8a91a67ea6..750306b2d8 100644
--- a/Code/Visu/otbImageViewerFullWidget.h
+++ b/Code/Visu/otbImageViewerFullWidget.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageViewerFullWidget_h
-#define _otbImageViewerFullWidget_h
+#ifndef __otbImageViewerFullWidget_h
+#define __otbImageViewerFullWidget_h
 
 #include "otbFullResolutionImageWidget.h"
 #include "otbImageViewerFullResolutionEventsInterface.h"
diff --git a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
index c2f8aebaa5..cdd1101900 100644
--- a/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
+++ b/Code/Visu/otbImageViewerHistogramAndTransferFunctionWidget.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageViewerHistogramAndTransferFunctionWidget_h
-#define _otbImageViewerHistogramAndTransferFunctionWidget_h
+#ifndef __otbImageViewerHistogramAndTransferFunctionWidget_h
+#define __otbImageViewerHistogramAndTransferFunctionWidget_h
 
 #include "otbHistogramAndTransferFunctionWidget.h"
 
diff --git a/Code/Visu/otbImageViewerScrollWidget.h b/Code/Visu/otbImageViewerScrollWidget.h
index f3861decbc..456619a3de 100644
--- a/Code/Visu/otbImageViewerScrollWidget.h
+++ b/Code/Visu/otbImageViewerScrollWidget.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageViewerScrollWidget_h
-#define _otbImageViewerScrollWidget_h
+#ifndef __otbImageViewerScrollWidget_h
+#define __otbImageViewerScrollWidget_h
 
 #include "otbFixedSizeFullImageWidget.h"
 #include "otbImageWidgetRectangleForm.h"
diff --git a/Code/Visu/otbImageViewerZoomWidget.h b/Code/Visu/otbImageViewerZoomWidget.h
index b75d2c3162..3691f20034 100644
--- a/Code/Visu/otbImageViewerZoomWidget.h
+++ b/Code/Visu/otbImageViewerZoomWidget.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageViewerZoomWidget_h
-#define _otbImageViewerZoomWidget_h
+#ifndef __otbImageViewerZoomWidget_h
+#define __otbImageViewerZoomWidget_h
 
 #include "otbZoomableImageWidget.h"
 #include "otbImageWidgetRectangleForm.h"
diff --git a/Code/Visu/otbImageWidgetBase.h b/Code/Visu/otbImageWidgetBase.h
index fb6b9a298b..f782e4dba3 100644
--- a/Code/Visu/otbImageWidgetBase.h
+++ b/Code/Visu/otbImageWidgetBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetBase_h
-#define _otbImageWidgetBase_h
+#ifndef __otbImageWidgetBase_h
+#define __otbImageWidgetBase_h
 
 #include <FL/gl.h>
 #include "FL/Fl_Gl_Window.H"
diff --git a/Code/Visu/otbImageWidgetBase.txx b/Code/Visu/otbImageWidgetBase.txx
index afbb3aa5a0..53829fd706 100644
--- a/Code/Visu/otbImageWidgetBase.txx
+++ b/Code/Visu/otbImageWidgetBase.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetBase_txx
-#define _otbImageWidgetBase_txx
+#ifndef __otbImageWidgetBase_txx
+#define __otbImageWidgetBase_txx
 
 #include "itkImageRegionConstIterator.h"
 #include "itkMacro.h"
diff --git a/Code/Visu/otbImageWidgetBoxForm.h b/Code/Visu/otbImageWidgetBoxForm.h
index e40f7bb462..931c97ce66 100644
--- a/Code/Visu/otbImageWidgetBoxForm.h
+++ b/Code/Visu/otbImageWidgetBoxForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetBoxForm_h
-#define _otbImageWidgetBoxForm_h
+#ifndef __otbImageWidgetBoxForm_h
+#define __otbImageWidgetBoxForm_h
 
 #include "itkSize.h"
 #include "itkIndex.h"
diff --git a/Code/Visu/otbImageWidgetCircleForm.cxx b/Code/Visu/otbImageWidgetCircleForm.cxx
index f64c3a47d6..ef82a4d545 100644
--- a/Code/Visu/otbImageWidgetCircleForm.cxx
+++ b/Code/Visu/otbImageWidgetCircleForm.cxx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetCircleForm_cxx
-#define _otbImageWidgetCircleForm_cxx
+#ifndef __otbImageWidgetCircleForm_cxx
+#define __otbImageWidgetCircleForm_cxx
 
 #include "otbImageWidgetCircleForm.h"
 #include "otbMath.h"
diff --git a/Code/Visu/otbImageWidgetCircleForm.h b/Code/Visu/otbImageWidgetCircleForm.h
index 26b57b624d..a378367333 100644
--- a/Code/Visu/otbImageWidgetCircleForm.h
+++ b/Code/Visu/otbImageWidgetCircleForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetCircleForm_h
-#define _otbImageWidgetCircleForm_h
+#ifndef __otbImageWidgetCircleForm_h
+#define __otbImageWidgetCircleForm_h
 
 #include "itkSize.h"
 #include "itkIndex.h"
diff --git a/Code/Visu/otbImageWidgetFormBase.h b/Code/Visu/otbImageWidgetFormBase.h
index 8711dffa8b..85ea3dc3b9 100644
--- a/Code/Visu/otbImageWidgetFormBase.h
+++ b/Code/Visu/otbImageWidgetFormBase.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetFormBase_h
-#define _otbImageWidgetFormBase_h
+#ifndef __otbImageWidgetFormBase_h
+#define __otbImageWidgetFormBase_h
 
 #include "itkDataObject.h"
 #include "itkObjectFactory.h"
diff --git a/Code/Visu/otbImageWidgetPointForm.h b/Code/Visu/otbImageWidgetPointForm.h
index b334bf767e..9c63f3d9dd 100644
--- a/Code/Visu/otbImageWidgetPointForm.h
+++ b/Code/Visu/otbImageWidgetPointForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetPointForm_h
-#define _otbImageWidgetPointForm_h
+#ifndef __otbImageWidgetPointForm_h
+#define __otbImageWidgetPointForm_h
 
 #include "itkIndex.h"
 #include "otbImageWidgetFormBase.h"
diff --git a/Code/Visu/otbImageWidgetPolygonForm.h b/Code/Visu/otbImageWidgetPolygonForm.h
index e27e032e1e..c08a7fc003 100644
--- a/Code/Visu/otbImageWidgetPolygonForm.h
+++ b/Code/Visu/otbImageWidgetPolygonForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetPolygonForm_h
-#define _otbImageWidgetPolygonForm_h
+#ifndef __otbImageWidgetPolygonForm_h
+#define __otbImageWidgetPolygonForm_h
 
 #include "itkSize.h"
 #include "itkIndex.h"
diff --git a/Code/Visu/otbImageWidgetPolygonForm.txx b/Code/Visu/otbImageWidgetPolygonForm.txx
index 4a073f63b4..bec5d80f7a 100644
--- a/Code/Visu/otbImageWidgetPolygonForm.txx
+++ b/Code/Visu/otbImageWidgetPolygonForm.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetPolygonForm_txx
-#define _otbImageWidgetPolygonForm_txx
+#ifndef __otbImageWidgetPolygonForm_txx
+#define __otbImageWidgetPolygonForm_txx
 
 #include "otbImageWidgetPolygonForm.h"
 #include "otbGluPolygonDrawingHelper.h"
diff --git a/Code/Visu/otbImageWidgetPolylineForm.h b/Code/Visu/otbImageWidgetPolylineForm.h
index 2b0559dd84..eb9ba7f821 100644
--- a/Code/Visu/otbImageWidgetPolylineForm.h
+++ b/Code/Visu/otbImageWidgetPolylineForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetPolylineForm_h
-#define _otbImageWidgetPolylineForm_h
+#ifndef __otbImageWidgetPolylineForm_h
+#define __otbImageWidgetPolylineForm_h
 
 #include "itkSize.h"
 #include "itkIndex.h"
diff --git a/Code/Visu/otbImageWidgetPolylineForm.txx b/Code/Visu/otbImageWidgetPolylineForm.txx
index f181f15e66..86400dc3fb 100644
--- a/Code/Visu/otbImageWidgetPolylineForm.txx
+++ b/Code/Visu/otbImageWidgetPolylineForm.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetPolylineForm_txx
-#define _otbImageWidgetPolylineForm_txx
+#ifndef __otbImageWidgetPolylineForm_txx
+#define __otbImageWidgetPolylineForm_txx
 
 #include "otbImageWidgetPolylineForm.h"
 
diff --git a/Code/Visu/otbImageWidgetRectangleForm.h b/Code/Visu/otbImageWidgetRectangleForm.h
index 886003bfb2..4a695a8e12 100644
--- a/Code/Visu/otbImageWidgetRectangleForm.h
+++ b/Code/Visu/otbImageWidgetRectangleForm.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetRectangleForm_h
-#define _otbImageWidgetRectangleForm_h
+#ifndef __otbImageWidgetRectangleForm_h
+#define __otbImageWidgetRectangleForm_h
 
 #include "otbImageWidgetFormBase.h"
 #include "otbMacro.h"
diff --git a/Code/Visu/otbImageWidgetTransferFunction.h b/Code/Visu/otbImageWidgetTransferFunction.h
index a6c87f11fd..0152fdbaa5 100644
--- a/Code/Visu/otbImageWidgetTransferFunction.h
+++ b/Code/Visu/otbImageWidgetTransferFunction.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbImageWidgetTransferFunction_h
-#define _otbImageWidgetTransferFunction_h
+#ifndef __otbImageWidgetTransferFunction_h
+#define __otbImageWidgetTransferFunction_h
 
 #include "itkProcessObject.h"
 #include "itkMacro.h"
diff --git a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
index 80223641b9..4ff4f2c1ae 100644
--- a/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
+++ b/Code/Visu/otbVectorImageToColorAnaglyphVectorImageFilter.h
@@ -15,8 +15,8 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbVectorImageToColorAnaglyphVectorImageFilter_h
-#define _otbVectorImageToColorAnaglyphVectorImageFilter_h
+#ifndef __otbVectorImageToColorAnaglyphVectorImageFilter_h
+#define __otbVectorImageToColorAnaglyphVectorImageFilter_h
 
 #include "itkBinaryFunctorImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Code/Visu/otbZoomableImageWidget.h b/Code/Visu/otbZoomableImageWidget.h
index 30a06bf191..e8a49739d6 100644
--- a/Code/Visu/otbZoomableImageWidget.h
+++ b/Code/Visu/otbZoomableImageWidget.h
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbZoomableImageWidget_h
-#define _otbZoomableImageWidget_h
+#ifndef __otbZoomableImageWidget_h
+#define __otbZoomableImageWidget_h
 
 #include "otbImageWidgetBase.h"
 
diff --git a/Code/Visu/otbZoomableImageWidget.txx b/Code/Visu/otbZoomableImageWidget.txx
index b921f28fa9..1fe517dc49 100644
--- a/Code/Visu/otbZoomableImageWidget.txx
+++ b/Code/Visu/otbZoomableImageWidget.txx
@@ -15,8 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#ifndef _otbZoomableImageWidget_txx
-#define _otbZoomableImageWidget_txx
+#ifndef __otbZoomableImageWidget_txx
+#define __otbZoomableImageWidget_txx
 
 #include "otbZoomableImageWidget.h"
 #include "otbMacro.h"
-- 
GitLab