diff --git a/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx b/Code/BasicFilters/otbBSplineDecompositionImageFilter.txx
index 5e0f9d81f1e7034c0fb828ecab1625acffd41d63..8017c5f39f2995f47f7fb205f2bd4653105b292c 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 500efeae1e3512c37c911ed23cceb8e30e60bd25..a377371794c11bacab6c196686498df0cb1f06f8 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 d4790c5824bd6aa39dd5dd8d44007ca5ed49beb2..1f19b00b1e915102a4462f9c112e2961c67cf98d 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 165667b6a0457c2dfeb596495b87513774a73734..946468ff7b88d36311b740f08a24f9f3a2ab1e0d 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 13062c51c4032960f8230f8fe7d727fdbbcec777..5658a5a71788dcc006b743f0c3430272163faec3 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 dfcd043a932e67404265b9e30c6d0820bfc78892..32dfaf124be34f1e467df9c366277c36535d2ee7 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 41c51e34a3cee68e0b731459a529e87d4be04692..0e33f6762f97eba2bbee4b653734498ffeeb1f05 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 62281ad666b6a024a57f36ad0dff296e8b11b7a5..95bd8133cedf50d04d3d90890bc06aeada8e860f 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 627a7b797a1f9e5104cdb963493a3e7a1d356300..889a38bd44247ec4816dbe090c97f67cdc175cb0 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 3ada81543a1156f833b1e5cfa7826ff9f1366650..6e5a9cc844da5c665750c1c269eb6a57c7736496 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 7d87062744a4a63c7e0a8210efb777b6755e62dd..16097705e7fb341cf9579028ea14c95547be18b7 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 ac6fdd71c0ff4f776a246203671f89b2ea14aff2..529078d9f8b48f843153dde18c3f2c96a46ab60f 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 4ab358c2e9ebd1abd060a7da0c2e11712b177674..20385a7a823f01d5d56d4d5bc7c85bdba69600a3 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 cd6f0e53af6fa661293a1a383c64617c55278a39..81c527884647ca22a324cd956fe988d1599f6e6a 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 f629a543cb1c0b12935830d8ed1570e18d01d381..459e8c652bd9758d9ccef4cd935a20d9a8696d47 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 7c0f2ee692383cb8c364e324bf597a26936eb24b..c57aa35730edd4bf262a491d24c3896e19880e64 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 434228306f032194a4ed2407138107c0612bbbd5..c0bc9136291cc912dbbceb79ec2e1f04e98c9a30 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 67a6528986fc0eeb09e5f7850487d448398196d9..ffc268e213bcdf4c9101ca30db8cd7be42f1f42a 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 ea88a362d86ce851597e69cd60b3241eb78b0c8d..d26ed34fd99b98674c00d6aed7a41cc555cf5428 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 b6832079400c5e2943a57001d7d1fe508b6931af..e9a947bbae09f687d12b1c07d5630ab389945cbd 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 62f8e4cd90c70ba2e1262f0a13d69f6bb05f4b17..90b8b93769f32dcc9ddcab1684c16f9110c3c9fa 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 a4880723684731eba88b7dd19b591bbc60e285c1..865ffcf522f01408101dbb8209041484b5a3d051 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 8ac2fc7f4c1eb0b770bbc61840369f4fd7c8b51f..2ce82093578fbea24ef9b82bdc83a7cc2f46e02c 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 3b2227c634de6c4dba82c29791a77eb467890a3f..a4be11706df1abef98c34198bd59c0d3e8790de0 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 3661cdd2818229b5b9f345897de8ac5c8714b313..5dd0c50b559f07265ffdba2e7a1edb9777f98734 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 963263a5274dcc1fc1dacc332237608e72944cb1..ebb852e8b4f6a76203fb1d9163b097881bcdec6f 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 bdbcf3fd3eec436af897f8be56d4400b9ee9c81b..cb7b750a492f11dcd239e77f966bd6d2a22fc2e1 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 3e9d108d37fd43591930f374ce4de4c396d1b203..3d824a06bebd1074bfde8fad9e9b7e930ba66e25 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 cde1c4c275ce9eae0976d00356dc7bdd1e7345ca..bc7552f83151624ab2ad2e8b86fad80eb135d5ee 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 153caf25cb7affd97ea36c3edaec02d64db6352d..3ebd66c86746fbd4c124eec35860d9d28b128859 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 8be19623231c702f5322683330d4917804544984..f43e6b24a1810c15867786acaf24c00aacc67c18 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 dd6a86899a110af6f20873438a98bc625f47da10..dc0aa9f9d11486b10888867ed6d739ad7a3bf2df 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 a0f82cfe6ede888dcc1844889b7afcbb1f8729cf..3eb0b245cc91050986f80ed68f40bf7ffa77900b 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 6da3b92abb83a73e66010aec5a2f6c8ff9264d68..8e9299a9501621cea43631fa149096ac25ce0fed 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 bf937ec699f561783901108c158e40544b929f2a..3cffa742909a70c209f1eb7cf0b221f0e9ddd025 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 c5d02de25840d4b0f74d243a7fe744f3add83afb..2cc32cccc61a0660524f358c64a8ae9761a9f140 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 37732ef4fcb3c45dacffd314ca62eacf7f7148d7..833b50a734a88f7317490efb24d4ffefe7d700c6 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 dcd94cd73e39ecbcdf8da49b9659b18c506b0b10..3472051e91933ddfcbab856f969b7425f97881bb 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 a04b6f37dd80adb774c57feb8d1e275465ec5b13..a5eb349c8b7d3d637bd57bf323f6b47054c25f63 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 710f4f2754ae249204e75337d9d8720b100d693a..1c70868d6691d38f31dfbda15a07570e48da389a 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 d197ac9d71b7a17c3aac3e4d65ba015002ff2612..a4ae85dfd6a59b8fff6b8fed9c162d16e4764b2c 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 776c48bc530b6df9d855aa89e09a2ea7f829b025..0fe2c28131d82cb171113a6608cded9874352eac 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 5058104e9ea2440fc3f427054a9a762f0fd97092..adab40781a38b7ab00e92cfd220b40240de59136 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 3bd7a7a7abaf2d79399a0d8e64e7a41594090bb3..b7495d7cf90b73dccb4b90f4e5454363dcda1894 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 2ea5055bbf7d5012718a79aa32dd1252317b6b1c..4d4e52705e7b8a2da2fd681859e891b6bc3c5e20 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 ffe212ae9120c6aa281ded16b10b58766d271045..88c6b80bd81225cd57f01f2c89d9846d8a334f3d 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 57da278f2541df721f79bd1aab6e0fe633c2e181..063e623c4f67b1b041954023da6181aa0f59c5a1 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 fba72910f34dbcae4cc96f5f56a43212811734d0..0202aa7769bd1c37504c74e895007e74802eb24f 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 26c9af780df15444e9e2d114d08832da4e92e4bd..6b9139be8530bcf76a79d5b1973677fa5f6b3247 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 5f4deaa7a9cb938401937d2b0d3baec84d1d648a..06ed43f42b6e84b817b2a82b13a104d978008e35 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 27c24260a01d2b07786d3645d683a52a2e59c97e..a9109a4409bc6d93083f4533bdc8fa18e035a579 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 40b9d72a54dcc96864cf43cc1bcd31186a502198..a7b5caf0911668cc56daae4423bbcdf3ba587860 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 9e03e1f0007727abbcf7c55f7c0205c9282f4061..24429c96bca77a08aae286036c8a9ab4c89f72df 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 e34c49ec30a556be2692a5cf869d78453935dd9a..36f7d89cf96e708a64e1777bf750aacf357e59f5 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 ff0c406d398243fd9cb5924477d2eda84e68d34a..fb91ad109f3a47f40182cb889ef7694eef5e1e95 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 bdbb73df3475d8f58ccd14f6de4f1fadda4134e4..7e47d88bb99b72dca00484d546529ae020d9a44f 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 dde5b20efdc7a0f191fda822ce82b0d9b3bd9ed5..f58ddf81c689be0f166215146e42f124d8ca4010 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 f6f354635c7f47a5d62c1e52725a649edabc6176..cd6bd07c9417c92f01874bec7ccc1150bf39e445 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 176d3475fcc7558c2bbd959dfe0d7b8657dce85e..d2e0096027fb891adc80a9d9b3d8814c3ab7d8e9 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 88aac8ad9b5425c1ab1fb04427e3fc28fbef28ce..66639bf318de3a38c11c4f507131ab10dae2253f 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 327159834c926b9a5eaed062d670eff21438b4a6..d21077bc7ecae8b00c8d69ce23ecc6b353268e5a 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 efaf159e8eaa5d59b88494579b4aafec85749900..c698320afe743fede3802fd73c592634d762586f 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 0cfa0a75ed59351a98a02f75e1bcae8c09e64e97..87b45941e63efb2548877105d5de6d65258fb888 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 45f1452094b6f185ea6175783dea25d906e874b4..9202e6200914e6e4b576558256bd2f34fc7acc1d 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 65b70dc58e4f5d539abb574f91dd1ffe1a2f7794..1ff862353219b3efdf02f46ca5789998517832d7 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 d0d6c6382eab5469eacf7f834cf7ae2f9c660f90..ff897c03331044c245793f767ba856bee88d2fcb 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 1319f263819082ad7655c12e0236a2b435f26330..8eb0d99b9a13d8fc086641f2990dd6efabf995a5 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 42d329a3d01f088ce9ba873d3416a4d35b2135c3..643b301f24db0f8c1fd16944975c3175c25f3b13 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 9eeb37c11a8e74ccb3d7ac1b13c32ee5c69c4d00..474adc8a1f9e3a7cfcd86b1b53e05fd740643378 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 ec07df23a20e3357eb4f9cb612e08be99ec94508..687562f66e1ee09a20bec6fa7127ec6cff07cc5e 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 b8fc7fd39c6e4f2b01c13a560bfcd33fd425b8fe..d4093946735db9028129f9a6beb7754d2ed59012 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 3df0f2f35545442f52e7f15fa9dddbe4629ae2c1..d793fd8563049f84a0fca8bf0fc6e5fac03d4e3a 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 d6eb6970615666c216382c8f28e36365e553d3d3..13827dfb19326e1562a9452648e97338c465269d 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 9807e4e3825c55a931b11720697bd966e8cab9c3..950b58c229ae7b0814331801d739954c0344cdf2 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 f56a5330453d7a2acc71c0aff50972dff066a1d4..8bc7ba9858dcbbb85ea27a246266140e65565262 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 5426d3022d353a32f5707b82e617a0fb1ca8ff57..d2cfc6942804ea894bd1fa048bbdbc99a8d9d4bd 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 1042c1817267e307f6b35cad6d289ea5e2cfa42a..b8fbcf397cbdf430dddb9bb3a2d93eee50502964 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 3ec5cefb6b1a95c6abe11ef82f74e02b07a3e360..2a1b5b20ccd9a9cd92bf2182770c851d50caa507 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 1e0e07a7a6aced7ab2456c76a5a9ba208229e60c..ddd6fd11e9300a34aa0854c1f0101a2a35ecb530 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 5311128619c24f7468aedfdb0a7793bd3acbfaf2..544351cfeeb3e9df352f4d8a52718eb9f3072f81 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 de6f7b4b3556b355285b333a99dae63986a9873d..a831b26b573a634a10bc73aea2fbf8bb4224e583 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 eead62871eee5d918e796b006883170e33bd8dd6..6aaecd5af7c67ac729e0fd578735c275ad73f2be 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 7a431f00bae824f98f7adfef8ba0378f570d450b..17abd8ea69469f26f0ef6d2d32c511eff8e7ccc6 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 98a0d15eb14e20de892facb2de1a1def98885c92..e0dfe2fd0f0107cd9826bdd0608ddd232f26e301 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 d060436eb37c65c4a5815ed3c290773c7a4d27e4..22e9906519652e4e9fce6c060a36a3b83fed3aee 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 465846ba40f907bb293871849b92f3470ee4b960..2c93cb6ad0756c2389c0a11f2a23d9d6fe2afa06 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 38df4de4a3ed3fb15d032bf9c54c9981f56e77a1..f79277692faa5f043955f82bcf2b2809f9012259 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 642b23f3355a63ce44f6f7836f81455ef522c241..c723480c193b61223e36232892dfd72833b01f27 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 30a79270ebad5cbb3ea98552b2378c88fc5cbdd3..38f38c7879e632ef7561799dc150fbca030c47df 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 8f1ad2a797567908a162365099a031ed848b65f8..0806ec9eee96dc3e29c75d9b15b476cd1476d330 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 ebc3ea1500c36c1b5a1f2963e00d0198b2fd746e..374a205cc06612a7dc36de19fc484d6a0a26d823 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 3c049bb6a0d24d596e988185d9ed4f4909be4417..c44c33efb0f0665d9ccb110f55b7c6282e350f83 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 867938d9fc62a46c64c63be62e39c55e8b7d3a50..75bd1170354f255fdae95b3a6d14fd9c2efea1c5 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 4dc6ff0595029f2ea3a9551e66d32c1ff668faf4..667c3d00cc714fff2e3bcf2e53d9c22e8f807319 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 2dc6970f9352a829e50b02c957e533a9924ed44b..9419846e1eef06328d19145383523afddc556c26 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 af3cec15a7d650e848cc67627ef79e6dee7cd4e2..c856f488a5a14103d37f08ed5fcd296899f9f327 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 4327b9881dc055b6cc7cad80f974198895294ca7..882f6ff2c5a22459ebe9117e7176f4fcba12d84f 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 195ca846e30bc31b916e6169de37cb21493cd621..37946d0b407c116f7133b92f1d6dd83d48be6f9d 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 dd6fe64e44196315d732db1998b71438c3b81bee..ca68d6b028a67e97717d7a69691bf0c46a7f3b2c 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 25738dc84267765d9724768ffacbfaf4f3de140f..285a01c1f7206f51d5df06e2ab11fcb1dbcc215b 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 e50c6c368dce3d2b16b7ae68158e483495fa7435..70f0a805f62ca36a34cdebd007dbe62b05f3b16d 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 7d8794f7b98acd50f2a48f73f198fe60f12abbd9..7c73c644298a912872c60c75fee6e983e12816d7 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 b109eb0c737aa8d542f753727b4cfcc49ad3b1d7..a5992ff2d91f7283857a915e6d9aa2c45d0c7f60 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 dcb91cc202bb8ee6ab42baf216da148772603464..415d095d612aae3df46e6526d0c405a2438b9088 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 4fc08f08733f906d184aa1057070eef2b203f3e6..9051f4936a902ac2ca078fbec1740756e504312d 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 38fa2b40822f32deee88fd60512ffab31de3c69f..f85596a44e37efe48079980675ceeb8ce5925c95 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 6658c5b74e60b3d0749dc869022d88a85a9adfd8..1494dfed91751bdbebd29ca4587f186240d59a80 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 142e8ac5a009b0515a2a9127c45cad95a38c34f9..957149b9255ced581575935613e5dd811369ab22 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 1f9f7dad21b32a705a07e0eb4b49cff5c0d30cdd..4ba530997bd1a0cef9e206dc34a2a4097ed2c7fb 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 bfb3af489d1d1b60c56049ab479c6f5396a9ab3c..7506088e8f77cb8111a1f86e0bf95191994d53fc 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 cb42aa0ad974a2f4972d2f6d63950736560fafc7..2d7da5e7c6d6a6565720f23060e5801357e778a5 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 e8c167daa187037f99b941050195bc477ce28836..0f56c17f0be993c499ad247d2433dbc478dca7d6 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 40665f3156e5179326793b8c751c3d3f5121ffac..8a7ed6eac375bb312ccfa11903cb37d5b4b9d118 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 c1c56cc5e50ddb12c5c6ceff5de2a92e0c3be3fd..57930fafce58ced400fc1d65ca7a8a16c1e9f9d9 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 4c1204512efc6243cdcd40cd5993ecb2c2a3cb4b..ef203eb0096d60bdc4ccd468d4580b4585708dcc 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 deaddff3e6bff455aa5432fb0d3c8293de72b8ca..addb88c702ff8f89951ebfb5733ad9187503d87e 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 123e6f3e8796e877eed937fba8a00150ce8cbeb0..6502fb91ca0ed190bad091b8767fb1ab69f3829f 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 7bf1fb8cd023fac0a552f6b78d071e99acdc9a17..119ec4b4b56cd6eee93fc04738de90cc770be0dd 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 8f074bcbc34908a397902cd7d6c0fcb4664b7ebe..9c9ec871f710cc7ab906fac8b4a63bc273f68342 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 f9be9097dad77ef11a2daf0488860e287efb8d99..7988c273e512b2caa501814c316ce52dd7b2af38 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 5e307a4a7e725223811df423f4afe9df883bf65e..9343c7aabd4f8d6f64629b337f6dfdad83937e42 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 19d344d4df5f08f6636eda13338605381c3d65a6..a48cc97ddc978704895e9b3826b7c37d16e51b2e 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 8685a51611c7c118bd350f3fdfab49ee1d98cc06..2a9e421444f8f50053788896df6deedb4e152483 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 02ace07cd63550c3a190fa1bcffbfed228a153a3..1b14b3ff6ba56f99f1d3eba4ae945cb49ec0b428 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 7c07470625f36282b030f75ed7d52809b10564f1..417a821c2129e44dfda51648937e9291739e26ee 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 2ef148e3a6bdeeefa306f07cb6ae10033d1e2375..8918660cab1ba167a0b1fba900734fd4a36fea64 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 564231c762a5d61b1337a7b6472ec93e876cc829..bb87df0b8f1dd99b755107ff459b30767c74498f 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 128b475ee54a17ff1480d52bdf52aebd9c38b69a..809c33da5ecf07337ca67affa89504ae21b44d43 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 c0e865f9b1c33c8d45f8b0a4bd4b1be91700bdcf..1fe7735266860a32a115d3da2960c328f3794864 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 abf2e3864bb8e0ff063283f3e21fa8fc0882d5bb..e9f7702dd2b3d547be812945b7ec45866d14b1cc 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 d48353e75c7836f712521daf7a4dca826e305691..bbb4427d81c36e019a4f2cea6dcffeb2d0aba8fd 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 09944f713e5ee20803fc23890fdfb11deacc3b95..36b0b70094bca439510a37b6d00d4cf067021843 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 305007336fe798a0504961dca9e4ca1e213b2589..efa2232c5a93fac76748aaedfc771a860b8fbaea 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 c2485e14e442268e5675d2744d3d9ef8130fd33e..5c061df76f99f0656de24b3884ea4efd68d80a07 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 dad5d766f0bd704030568209d5e3e5da129246e7..43261183818173b321c43bb1fefe55e9f8900a2b 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 6126e56079b0f1fdf77c95e4bbe7d55eb11f1f84..c98cb16a8193703c0375655edfaa798feda4cc65 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 1662f97a8e1bf6e799812e91d56524a5bdc74116..beaee29e6ab2454d3217db0e6944b35abb907203 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 6644697ab6926bfd4a656dac113b76b3b2450d48..3e0000b98bd78e4673675c835654df00d166b3ab 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 d4029af93335698d803c82470b5a234212fc1ec4..907544059f528f9cbaf61f741c93d227c6a40775 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 5baba7fb8d8c0d8be464970497fdf1a677cb9c74..10a793905e386f6e5257187d09b50e1c93f9b8d6 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 027c86ecb148ba60d1bf9050082b8e7f0f44ece0..e85e5774f98af1b9053d9ac67963a60c2e95030f 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 662e4b6d9ccc5d0806ec8c1c8f33035d3c361230..b8fbb1ea3bffdcf0d1712d3d83014d3cbf721f84 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 c5e570fb721dbe0036c8975c1479101172fe0a86..d9703f726d238835bd9cdfd379ed89ab9d5c7556 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 8218df2703905f65e076b302ab5976178ade8ac0..ad350c8609a572fa0217d59077d5e2f71ec84cf1 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 730d9b7d9144ff432e186dde7989536e805335af..2066858678b87934d8e48eaae40bc60d0d992ff0 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 4cad09d3fd485b193d37813274eb04a18b8775a0..2e8bb4119b4ae14771f5296ec4b109b7736daa95 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 4cc8a75c5aa2d6dc59739fbbfaa82f49127617e9..7a6a4cb1b530647c6e5ddfab8387ef8ebc1042f6 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 c86cc374a82d63490a8a8feffa3a03b1bcddcd6c..4919a1f7363221a0d71efb8a60783c661f72b335 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 97d69a1ad7641fc453f6275ec0cdb5622c5e2d41..d2d3cc8fb4dfb24101989001f67d3ff3deb91c59 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 5b6b90286ba12a9cfbc5f690b98fb3aa05d90444..32dcc8783fe97d24d9b0ed953587b8db59fd3cf9 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 b20ea6466b6bb6f08ca2979a8a8656e116bf71df..fb2ed8a15401b67a6a0c66cffab4d671ff459755 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 237d5a321eaa852a782472fda3c7bd46a919d023..40e8e1ec0cf58c4f9393bde4b255728086441dfb 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 e0dc4d9d7ac6991ad1ea22f0e8fe9a60c67d393d..c0aa7eb7600503bf2aae4742b49498fd7a74a4e6 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 049ea7bd840ca588bbc9c7f5a21fb57906a5e537..b5f41eb44cb0ecc39bbbfed8c4a546073e17a3ac 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 78da6ced0c121e6eed3888a26a5fc0e027dbbbf2..941ff866826809023928173bef25fee346eea89d 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 f25044c45132ded8ea89bbb450e501ea0582bdc7..736d969f06b4b9b8fac1b35c47a706532c8f10ae 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 bf13a5ca7801b0b0f6fec081e24fa24c38d6d4ee..e2eeebfdc096a98f9d95ffb9b693cda01aba25d4 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 89542db21ebe12b3c48bd0ccfb16ee90ada4fd51..f0f185b5904fb65af0d4ce8585318149919ea8b1 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 62071e8bad8f77bd7c8fdb7e778bd3f5ae02beff..66675733ab2f0b7e6d3624ed86ff6f101a430490 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 312efa24fbdf947ecc25f0f6176374e87be9e695..55bf7c843adbae6801a96fc0040df812d4e06322 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 69b56536ca120fbd295af0756dd8fa8b136c57db..b7d67110374ff944075c3d1885ca6daf5534c07d 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 c85dd92b7c32376f0e94002110cc78605ebce428..8d8ddbeeac38d218859135d2623989105aded142 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 15762fb86b9f51ff4ed74a81a151397849d5fb4f..9cf9f16ec83ff9b6660a5a7d48afda62e29fe036 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 21f04703df89f74ea985571c25eced729eef73a1..94eb6862c3539cd26406fa484ac96f9f0b7a8f75 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 c92b4e2bb0225bbda0f6847696bb98884762cc3a..4e284ab142bdf143e697dae38175a0ea8b8d1ccb 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 593dacd12eee2e7db168713e435c1f511b8fbc13..fc39fcf092b9292fed9d605db3c33c76c074f526 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 4ec97740e71f75068cfe1cff1da39acfe0347418..d1a49bf2f367a0462508115affb34fe6c31fa4cb 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 8217e097a18b69bcc0ec0c7aa86f9bac1edec932..af76d2f9855bf3bb341cdaaf5bec68a05a192adc 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 8e32fcfd950fd41054884d6ff8e9ed85120373f8..c0f8d585d235bc42610d7f33bfe3759511f71810 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 4eba3d51ccfed2966550ffd712328713718d2358..784fb5afd727e19b65028fc47cde08591771ba08 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 ef537cf93fa36bc1dc2f48ad61fd218f4aefd222..3a312e70d1f741a294312d0f1271b1420e2877d3 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 5709ac233922d2420182323d515857094791bbcf..c66c67ddfd0aed61f64be93f48f9816fa86f91f9 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 b8d62d6b35a69533511d092896e9b3d0caffde93..3fc3ef854afd345d1287a3bd1d614406f7ce0c69 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 379d4ca63f6b7c63d8ce97f191c89bdb6c1ade80..c87c13683c118e13019d7e44a3b3592e380907ab 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 ff04ac508c04be6ec8f266929b1ac08a5ab58e14..990b8aba33c68fc6b63c7da4f35a47e3d2af61c4 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 ddd7de0686a5327a4cb97c013b9608915cfa3d1b..036631e885ec63e5f93569944c4ea0e1fb3395cb 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 2b310be5086ffd6cf1aa42e288e631e88c1ac5a3..27e4d3d20f5bfb4afe1716af697b61c8f3c9bdce 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 059684e66439a3a9fe5592fe8d10ffc1e6d0fa5a..600081c3b01efdafc409c72e2c3b55a041992d81 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 8f75b798d68c856cb42530fc91680fb213f9b777..037e46ec29e155001644ba7d12533a9cbf08e453 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 becfdc0b4b873df853863d20551cedf351811743..7f3584d0f10e11415bf80e49c6a6e65161279c99 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 0f565e521d20566983feb3c641168c69179c6fa9..769f4c8a34c3dc277b8bac8b5024fa5a8a439e15 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 a55eb1f8af3109966c3275930375272574508336..d41e9e9e647a651bbbc1015832795ab71fe37339 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 a81ae240a7299974e6333d10ca1523533bb3818d..5139f310f510e048fecee67d02f5477e1d1cd6f7 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 dacce5f2615a2dda19bf81f7d2a929bf6fea513b..9ad355efc194cdf830c24d97dfb1fc28b49575b8 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 9c9513b5ff5df49573b27351897a703b943f5713..b29f3225d46c93b4c5d5c78c098ba63b4911fed3 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 27b6b21c59edc34f67cbf047ecbda57261e9cfad..8276de57f7c389fdd0dcf93fe1ebb8bd48ecfc41 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 3e58430a2cd4794565d4e3716b06758cf0156c5e..d2dec0bcb3f4ff7f461ad2105e7d1f77e0d32b1d 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 6172de24e11810da04731c70e4f74c8a8793cd02..130b1e6afe3cbee9f33dda4a94e41e6fc47a678d 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 89604a5b2d9e064a1d8208d17f5c9660f8303aa9..60254fe767f904ed2ac845783677235585c9c423 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 57a379fed4936ebeeb0fb7a225f985f24566c4a1..768c281b93042e14408cf9b37a27c5888d6cbfdb 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 6945b56214951ba4cee7cb2b1305251dbd25585f..3a0523ea95d0295be1ff4eba1a55f28f83f13ccc 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 7f0b78884aa4c326ced610769f225258d1cfe2ea..44a5f7971a06d2c350c483593acabff90e494010 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 52cc44aab081232f3e4be54ad667af9f27f9f600..3723f91d500e7fde8a15a607111714d868756fe7 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 6b83aec18650249acd129fb3dd7e4527ec23e5bb..adb8d0d9b6638013984398ac6879065cf1f3ff67 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 955691d94f5c4b1810b62ca426d18f57e0d58953..1517f9219987957bececba47146eef5d8633977b 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 51d9beacdd6673650fc26d8f2490eddeb3442a52..bf07b8575f46ee635b5d03a5b52a284242e449e2 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 a81c6407cd9733374c9cce76e4e4a36e110b0815..e067ca7bbac14762f6330554b9f71eb1f71ca485 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 46215652ae92841a32bb6f0347cd4e492d1d0eea..1fbb8eaf8c88b3ddb58f3dbf0d60f256d705a9dc 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 e737200250ac99808d0bc1f0046f37bf6ef27e8b..f799b2f3bdc4b8de1fec152cdb9fa0e238b7a0b0 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 aa2f949dee67604f658e52a99d2ac91f8e0f252d..79a408d8ab13540a98cb3a7baeaa0c05590a8384 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 6865438ecd511e10c309b65e83ad092956c61642..12d7e91a119d5f475820be95321b55bb4da5672d 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 0dc6bd36c6212699bbd066253d492feb5b668e58..4b82c676b7c2fd02b8cd5970db72882dc8beeae8 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 93f1b6fdc11228a11aa2b580ff2a3092d58b3699..c546be2c300b84ad078698ee6960a99c2fd27bfe 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 22244de07a3c2d51dee4751b02414e14d5f32595..52fe3e9b147e845cb14e0411beee0e879d0dbce9 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 177fe1ea2f3e0aa200e10ad7d46eaf32c44d013b..d3952afb78ae930dfb3fb4423fef2def9c77ff6b 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 cf1be226bf81016ed0bb1540e0d869ba1ba2e2aa..826ae576da540dd0e16d9ec39b0c80d5de0203e4 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 f2ce21f788c90fca0a26cc299d5aad8b27409622..92dca161b6bf88586adcbf353cf4a1ea876017e6 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 db9cb1d0745e4ff7067eaffdea2df46a4a3d406c..242d0b2388a1c8bd5d3e1733c0b21b26b3f894bd 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 cc43b02fe542404c26a642486768906381397d1e..8b7f4aae5f440ce5633cb8263d157db01b24e018 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 a826d8e7b73d28b35a2c468e27ed68bda11b14d2..d57bd2efb47eedb7341f85138abae7a9aea88251 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 a008f1f950d4f14fa1ecded7bcd90850dff3a556..e5aa9642999666ffbf25e8841c316260c8592d77 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 db1cdfb91955defa931e985d7027950ef0c2a078..eab0c81b86216c7d26a4e39afc1baf0f31f0cb46 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 ac5ecb98e1e73ac8e4e8412fb3028973efc7a163..6f066ebd36dc5c946f1020d51eadd9b933212043 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 5a74fb0f3391ce97d4d0bdebd449f0cd358dbf21..c3bf1227a054b3ba396aef6be908a5a493a30726 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 ec15b28b76396a14c46762087d64417d9a5872d8..a403f8b256c676adbbd5919f5a6d95fdb414e070 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 05864a449c1c40695b31648500e0d81c42e8dc1f..c393a1c66490ec167606595bcd69b09b139d118b 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 74acc7dc9bcd717f7e83815a9f4cd18908dc2d4c..bbe94ca4a78c7717f746b61df18a3c37c54e6c3c 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 d8df1164d5e2a456ea348f12803690f3453b0fc3..e80c030cb6cb066d4988837365be72feff7c6499 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 a8a6bd13a360cd4e483500d7ae8204d3fcb31d7e..6389e4966bcf6b35017b7ce27b5c96e325c58fa5 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 4c029c0c2b9bd0eaf06392fd746da5fbeddd9af0..eb42ffb22e09ba3e11122d8342e692d2de0dcb00 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 9589c5b1cb1e83b6b595d5d99494a26f8cb55c77..49b904066d95ffa7eaecd5acfb6d2fc1dcb9b6f8 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 408141ab38757e86d634e4c0103f1d6c8e905275..0e20fea1a9dd9c5e9e4a067d20302f70e46edb63 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 653a63008272ce885581434eda80cab6815e9ed6..118eb540b0dc96381baa87633007204b8c6aaebd 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 10d91daa7637784dfac0e9a5b7a64e34755a1cc7..a975b1e01bd8d56e645760e96cb8b58c4e4d0d16 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 904298002b9b458dd9a4e17da551e5f29dd9e740..32f9a11c3b0e6f6492189c04fd1c10f1765bc3c4 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 a354e6c2833e604b99ee5885f23db67db07402ea..0c7934a2dd564eca24a82545c6c74c09585d9567 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 87619a92032ca734703fd193f4182e7c71e33cec..bd0fb07699deed8c444e97a27bb5ad95bc916937 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 12094a882990626006264172fd664b1d4eb0d7f1..7e480827b0576a8dc353de9f3d6d848861c0c673 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 cd40a54a13e4d5206c1e6c4291b396f414a25a17..4b2ea95cd82aeec03ad70bb59437756f370ac126 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 46650a3abedd08f6ea36d94b5d327d88dfc9ec7b..883f9733dc9eb3325f24ab78df0616e745ba2f55 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 d4cb03f83b319d47e5f6213736c0ac94d3ad5cfa..b5ed41b04ede53e0ee50d522e894aee817a81d94 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 5adf9e97e2ec27872ef8590f5b8462bd5ed3013f..b2fbcc4eb090b79e47884177e80254c6aeb29703 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 52cfd83c3d28025f9dd3f208f8f7564628040734..b3fe2587cbf3d291e0527036f253e872d564a0c6 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 efe75459b8f7ab8639c7284c7f0d79a867d0cbbe..805efabcc69d261a65da4769d7a95368e38ed080 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 8f5b33e07d97634dcd3e8ab8978c8d2ef3e24bfa..31e747ee0dadded6ddadd91fa857729d5932ebd8 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 8507a490e2b5e8c2d8da7ac9165158ed8426d1a1..1ce1f1a09c0cd29fc42eea6f6ddde208aff517dc 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 44b4af7e22d120c1902a0eb749052635d365916d..b7675b8ff36ed6c30a22bdb9e9046839c5b461c4 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 7706593d73cc0d83ccf1729fd01fb42ff11bba1b..4514ce7221d72a63c8b194b019df21c6264721b5 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 2d44ee0cf046fd603e6d76dceb9c9c698677380e..9c87fc0ada3927019799c9c193550853c3ccb371 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 7e08adcc6c71eeeb5b6a60746f06f529e33b3494..0d1b386854d127fead274234dd8c8c3c20a7631d 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 c81c76854e0569ed56d950e494bc94cac38652ca..a1cc07a500bd45d9a778c063a5521b6d12d06050 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 58cce264fbca0d757d001934883133ef14037610..8bfb8f33e5487b5fbf60a117d08d7fb79f88d4eb 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 8db8ec1781ef146af593fdbb8110409deb52f6ee..f45a2c47202df8a93c7e5477cec2823a4890ddb5 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 4aa8a0aa0c12af5a61c2b33100241cf952b8ddb2..3fd33c4f2aa083bba8ae849c4792637a01de2d50 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 35259ef9c813c1d071bae6e042b1210def298120..c6c002fbebe4844db6df86a0e5b2f4841d42fdd8 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 fbb75d63fbc9a8dde92595ff6e8cfa0503b989b7..bee233c1477752cbba942ddf8d5b52c43fef544e 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 ffafe1d896417fa80ec8b3d9a7521f87b4d1dae1..a4e0d97bcc71a54d39840dbe0249e643ea22329f 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 cc9963c9df625a0b591a78f1c4ebf01f319c4dd9..3c727b3804f8718894b3b38b05bc3a6644f282c9 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 ef0e503f6d64a7e262f340df021e66ceae61f070..2fa12d75889597036b3a7782d098374d52ea4ce6 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 2766356a80be9fd1a90fc5c274a654d94bf4bbf9..c373aed852d7e628531a27428347aa2d1df40eae 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 225bb10f76cad1395c6742cb93f6d3ec9e4042d9..8cddc174969eb38693d7381b2f25fa1cb143bbf4 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 71575ad529a28ebbc3989f573bad23d60969374b..501fae0543f6bff40bc87e4e194f213d8dbbef60 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 4f91ae5416b1a3d1018d1ba40f0671241e216fa1..3096abeb8f1ac934afba66b5b14033f5385b55c3 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 9f2d9801ab1a745697425632da8758162dee68cf..d3e3de9906cd7df57bc95a6ff985cc09ab7db0b9 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 811a50f09650102947fc2d907bdb5f8f2e341607..8779b5729fb3b1156eabc5c35e75c3ed02d8a718 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 fae85fbcf59b7ccd4192feef06d4111315fcba52..183ca0bc6c2235a99483a79b3db76b2fcc08282a 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 f323537eedb523b06b7ad704e37e82d3144af2f5..8239b34754f3b584609e53cff55387255c23b099 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 4994b0939f361bb77da7b3d1ab821a96c0163cab..fdf14de1ce32377b9d11e9a05fec2350ba5c20f9 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 c94f47eca9c7a96333bcae4407777e9824d4d2b9..365d9694d7ba7d896cce618612e548a58be4d613 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 c626c07dbd58abe92b835d91c22a70349a7ad70b..591c626bd52e3e6c4ea33075856b66a739f868c8 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 d9dbd56916b76610670bdb443eb39cdae28b6b03..da8b8b119264be3984c4fd5fe3b0a786890ad9c9 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 780fdb63bec296747caec405dc83fa2d24a4ffbf..c8483122ab8209cf39caffb9a462ce8ffb04193f 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 6d94a80c3d394e6d973bfca914c5ba8ffe442211..599728c0bc61c56608dde5589ce4c84bd75659a5 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 959828b38c57bacdd644dbcdd418be0d9cf42b81..ee062d571d5ad9f7c55d9cd0614d416652cc384a 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 4a3cfb51ac1c86230aa4fbfbcafe04832ffd0776..94630319df73e5e9ab5ecd1ae3bff34bf1e30f55 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 3c3be7c12876115202bf2fb95a186ef2217cda76..c0362cf2b5015cfa683f4fa4d3c6193e7fbceb97 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 ff922f16a64b3f89987f90bbc73555c024f35d1e..f780897a4aed779783dfcd4f08b902b2ee41384f 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 7523697800f938c5071dc8945acc216bc4d67916..7b9ee3ff0a2780d9e7a9d4fd42b50d65f665f86c 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 534e9da6362fa90eaaebe7f21c84bf7b24479807..b5407d9c201be5641af24a78ae95e93970e1c690 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 d234a3c83332c324a9c59bda191f8ce1595fdf2c..9efb7a5fe90b4d4a0baafc862747191fa0567bfa 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 f8e03ff525c9047ccdb18e6e095c767251e1098a..9bbbc76a5fdb3d6ad11954065b0fe5c6acb41a58 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 61d7fda7b9564008dd7f8080123b37e3544b201f..7b3e6e248f8527de4a194d17fe2efe246a74d104 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 82430a6c2b2e32a65ac6f07397f4f63d02bcc86d..6bf4ec34624894bbad852b4addef2f8d3082973e 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 cee52a90f1d1303d9405a0237eaa5d6ef3af76c1..d1e0fd8d70d4d76919646e45fb305ce4a7365b7c 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 a8a26e32aba4c0b16342fabbe0f9d07193b214d8..c181c72d8a4aa325735b93a0b6334d0e63f96e6e 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 e886b6e3648a21ddda066b9756ce3b6121af686a..89be39e2b1ed541745980a31b6da6cdfef003eff 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 3a900fa2f9a16508667df93ff52f3eb42c5c7a03..c7189f908defff2817b1d1feb5055b15dc2b5a3b 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 3072e74f02f0eb62e69a49b9e398272b9536a322..ab6315ad2bd0006e50d8bfb24ae25f9e133ff5b6 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 5a74837c7f370570f14d7c25c4f2f3b5ae7cd021..15b1dd659f972afafccf20556020baff3fde59a9 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 83cfb5d10cb5c2ed88b12e9a289112768b621d91..2a8b50faaa7909152b845653ad85503ec38d52e0 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 b1a58bb5d2f1bb82b37b0104343618a433fed583..235a833614a6deb2fe57b8deab00d349c2239504 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 0cdd8a81f3c7d08ba6bf511574b08ff465906eeb..c0f4070fbb6613cb689dd16b015840a0df68d64c 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 bd6380b3476b44374d52d3379b5e76299c01c539..3409507c97eaf96f3fc2338e60ed102bef740d7d 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 775e324183b51366aca35c38cdad0886079891e0..29de019d32759842bede238725f2d0374e66bd16 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 f71d777b64cb30054b2c9d84d85696e706517b37..a8defa717849239cb8f9b5f470d1a2e3b45366ea 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 abb7e8830fc5ce4903b0cfd8c78fa1d28727b77b..078e947a87b0f4fef3ed494f746c65f835076a75 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 9e084cb33b1a23a05fc6b4131c9be7af69ce7b6b..c306fc0962fef0918c638b3fba6f570d6312dbd5 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 6acba0682567612239fd77b7ae35eda7bf653002..b7db068a1b2917c2b85282063e4c13479d0be848 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 c0ae5c7d18e3bcbb8b78f937646a9cc04dccb9f8..131ca6e5ce8bd8f46f040282c04b88b2604fbbed 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 bc9c50025975d7adf38d0dffa361c588aa603b02..e1c3bad638d7dca43381fde17f3d4263c2d9c5ee 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 8496793319a323c48ed32108e3660094a0ca7379..53e1b6e1afaec006f33b99a61e4812fe32c8932d 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 7dffcba63ffcea1932a7d15638f8425f17615217..c430739e713a837aadc3ea26df0a20f07de65d95 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 e43614b1d5af659a93142f4ab84a650da5dc8370..117ccf6a2dce501ad3fef9515861814ed28aef87 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 75ec29a6606166986daad7fa7a84295371d6c7ac..552b7332d7a7401a2dd0cf2297aa39954f5e9653 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 faa22ea463ce75f1aa8b0b523a0aaaee4165d270..999e12b0829c22154f7f7dd161e3232552d05f24 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 13b20c5d190d3cd948c7045a6b863d981a8bd3b8..4cf705438f9e2a342945c20152935d625f99018d 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 c8e7ec1136de85f1b45d991ce652caede0a903c9..dc3a4dd7996fa451bda2d0282936258d1b45db72 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 e1bfc13a045528f52ff1341b118bf9760ff05d35..02f2106fc6d1a5d0d0db852308377b6966cf8f25 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 98494867981e01094856ed5e6fcaec47c5a87113..90620c3a1648989f3adc23a3fe172533511316f9 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 38ff675a674b4c2f152d53069592aaf4090b1aa1..884143407f16c76bbc98fb83d740fb6b923adbdf 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 1f7ea7358fc9ccbbcfa0568748e6d240d1d8f30e..7f93bdc1cb2765fa55e6c6d95a3fefdc27bae70d 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 8fbfc9fb57fa051f3fbde40aa5bbfc9320ffbe20..aeb5e342464ed1781abef82964a24610fe9a2433 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 200806839a0ff3475788c66f49ffdf4df89a8814..2636172405a4780fbc5bd6c816628c3cb8a4aa77 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 4c0b7fcfc0bf6b1529579a701f111f1d7c0ee488..7238d31b9e0e09c7c7e1f60b0776fff522d8dc5e 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 ca416b1a963b5b4b10272713a801984273c1a2cf..1c9ceef68890e7d2b0f25cc1be4f45f401cf223f 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 ed55ca0a1fb418a80a229fa25504189d52ff7635..7048f9986ec9344ba7a29d161a4d2cdea84a820a 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 3b7a9342b9735ae90fa36371ca4d52d7ad193719..16fa22b4c7c7fe7fdcf1142f8a1f3d39f78b3a61 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 8a91a67ea61148346e5f910301c05c7c5971a014..750306b2d8cfe83932018d35d1249984eec6d631 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 c2f8aebaa5d168953962aa85aba901fb19b3da19..cdd1101900f4035b9707cb766afafedcc42bd3de 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 f3861decbc3fd166a4e8f7fb38c02a6352597858..456619a3de2966aaae9e4b772cf8a9574fac1f81 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 b75d2c31622be9a915b332a9495e3c3a42f5870b..3691f20034b8d9929fc615b34a9e78602bc8ad47 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 fb6b9a298bec25cb0e85f88c0457d70321f17dd5..f782e4dba39cb927f75f085e530f2f32637edbc3 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 afbb3aa5a042b293dca934d3bb58d928850b874b..53829fd706805e6723d63388268b88d0c9051c5c 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 e40f7bb462c9556012f8856fcf63b2babb295111..931c97ce66e5b0d02eddeaa17d3dd70b91c8492d 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 f64c3a47d64c5d7cafa15a6ac9aa17e2d69fea77..ef82a4d545f9d73f29f7c29480a1800df646a8a9 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 26b57b624dc5fca2bf9e5b7c2041cb6589f884dd..a378367333d0320c6e197631848e21f94a125e35 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 8711dffa8b01a85afa5db87792944c53de6c65df..85ea3dc3b91aa534e689dfb329215f4a069f5292 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 b334bf767e6426f020aeb4bbd239a485c368d43c..9c63f3d9dd4622ed8f25db1cbad5d25f397c0a9e 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 e27e032e1ed92a4ba9b4539ee5ae39ad1dab898b..c08a7fc0030779693f9018514454fed9892a3c8c 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 4a073f63b4d829815a20f20c234929ea803cf244..bec5d80f7ab374fefb6f6cfb77cee79a54cd3ee8 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 2b0559dd84b178a6f51db153c019f1b919a5808e..eb9ba7f821f987d91202d5d7a309f94126d863e4 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 f181f15e667fe5f51ccb37148cbc0d5ac6023e77..86400dc3fb3b17efd0df4334bda51a7cea9b27fb 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 886003bfb2bdfa39edafd47a6bcc828bcb8720bb..4a695a8e12374838290649084b7e683380dfdcf4 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 a6c87f11fd99a541445e6ed0809614eac8e2b14f..0152fdbaa5e2be6a0e098b57f93315990881a246 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 80223641b90c77fd338cae41b7e60d3ab57d0fc8..4ff4f2c1aef981995c73a3d5014e0eb19aaa73f6 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 30a06bf19130ce6096b5cb6ee5da4e5f2c3cf029..e8a49739d6c46a53f1b0f15b3772fd9be216ab4d 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 b921f28fa9e3cff55308b8db903ba05eb16a07b2..1fe517dc49bc3bb91ffebf50c12e173ad9180917 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"