diff --git a/CMake/OTBModuleHeaderTest.cmake b/CMake/OTBModuleHeaderTest.cmake
index ca2f7cb5ef27ff712e52ed3d05d55d2c499d298b..1b01c7e82ef5e8288ec5181a5f4f4667de5250f4 100644
--- a/CMake/OTBModuleHeaderTest.cmake
+++ b/CMake/OTBModuleHeaderTest.cmake
@@ -46,7 +46,7 @@ if(NOT OTB_USE_OPENCV)
 	SET(BANNED_HEADERS "${BANNED_HEADERS} otbDecisionTreeMachineLearningModelFactory.h otbDecisionTreeMachineLearningModel.h otbKNearestNeighborsMachineLearningModelFactory.h otbKNearestNeighborsMachineLearningModel.h otbRandomForestsMachineLearningModelFactory.h otbRandomForestsMachineLearningModel.h otbSVMMachineLearningModelFactory.h otbSVMMachineLearningModel.h otbGradientBoostedTreeMachineLearningModelFactory.h otbGradientBoostedTreeMachineLearningModel.h otbBoostMachineLearningModelFactory.h otbBoostMachineLearningModel.h otbNeuralNetworkMachineLearningModelFactory.h otbNeuralNetworkMachineLearningModel.h otbNormalBayesMachineLearningModelFactory.h otbNormalBayesMachineLearningModel.h otbRequiresOpenCVCheck.h otbOpenCVUtils.h otbCvRTreesWrapper.h")
 endif()
 if(NOT OTB_USE_SHARK)
-  SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.txx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h  otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.txx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.txx")
+  SET(BANNED_HEADERS "${BANNED_HEADERS} otbSharkRandomForestsMachineLearningModel.h otbSharkRandomForestsMachineLearningModel.hxx otbSharkUtils.h otbRequiresSharkCheck.h otbSharkRandomForestsMachineLearningModelFactory.h  otbSharkKMeansMachineLearningModel.h otbSharkKMeansMachineLearningModel.hxx otbSharkKMeansMachineLearningModelFactory.h otbSharkKMeansMachineLearningModelFactory.hxx")
 endif()
 if(NOT OTB_USE_LIBSVM)
 	SET(BANNED_HEADERS "${BANNED_HEADERS} otbLibSVMMachineLearningModel.h otbLibSVMMachineLearningModelFactory.h")
diff --git a/Documentation/SoftwareGuide/Examples/RunExamples.pl b/Documentation/SoftwareGuide/Examples/RunExamples.pl
index 9d6f330cc32a526a899d3c6245776a9847048a6c..dfb6efb5488e87a56fd4245ae249a422c2652d6b 100644
--- a/Documentation/SoftwareGuide/Examples/RunExamples.pl
+++ b/Documentation/SoftwareGuide/Examples/RunExamples.pl
@@ -2,7 +2,7 @@
 
 #
 #
-# This Script is used to infer figure dependencies from the .cxx/.txx source
+# This Script is used to infer figure dependencies from the .cxx/.hxx source
 # files in the Insight/Examples directory.
 # 
 # This automatic generation mechanism guaranties that the figures 
@@ -77,7 +77,7 @@ $numArgs = $#ARGV + 1;
 if( $numArgs < 5 )
   {
       print "Usage arguments: \n";
-      print "  Name of the .cxx/.txx file (with extension).\n";
+      print "  Name of the .cxx/.hxx file (with extension).\n";
       print "  OTBExecsDirectoryPath \n";
       print "  Cmake file to be generated\n";
       print "  Name of the TEX file generated, so dependencies can be specified\n";
@@ -121,7 +121,7 @@ sub GetArgsAndFilenames {
   #Exec file anme is assumed to be the same as the source filename
   my $volume; my $directories;
   ($volume,$directories,$inputsourcefile) = File::Spec->splitpath( $inputfilename );
-  $inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.txx|\.TXX)/; 
+  $inputsourcefile =~ m/(.*)(\.cxx|\.CXX|\.hxx|\.HXX)/; 
   my $execfilenamebase = $1;
 
   #If the paths have a trailing /, remove it.
diff --git a/Documentation/SoftwareGuide/Latex/Introduction.tex b/Documentation/SoftwareGuide/Latex/Introduction.tex
index f3ae6653bade821339a938887b6313916cd4125c..ad782dca9f16149b810bb283a9ef8d5315e7b984 100644
--- a/Documentation/SoftwareGuide/Latex/Introduction.tex
+++ b/Documentation/SoftwareGuide/Latex/Introduction.tex
@@ -200,7 +200,7 @@ aware of.
         \url{http://www.orfeo-toolbox.org/doxygen/}.
 
 	\item[Header Files.] Each OTB class is implemented with a .h and
-        .cxx/.txx file (.txx file for templated classes). All methods
+        .cxx/.hxx file (.hxx file for templated classes). All methods
         found in the .h header files are documented and provide a quick way
         to find documentation for a particular method. (Indeed, Doxygen uses
         the header documentation to produces its output.)
diff --git a/Documentation/SoftwareGuide/Latex/Iterators.tex b/Documentation/SoftwareGuide/Latex/Iterators.tex
index 1c303cbbf132a564db755845251a4cb5fda50b2c..590eeac55a0d69490e9f18f1d9d5272adae49c43 100644
--- a/Documentation/SoftwareGuide/Latex/Iterators.tex
+++ b/Documentation/SoftwareGuide/Latex/Iterators.tex
@@ -397,15 +397,15 @@ tasks more efficient or easier to implement.
 %./Common/itkFloodFilledFunctionConditionalIterator.h (BaseClass)
 
 %[ here are all classes where these filters are used:
-% ./BasicFilters/itkConfidenceConnectedImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkConnectedThresholdImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkIsolatedConnectedImageFilter.txx (ImageFunction)
-% ./BasicFilters/itkNeighborhoodConnectedImageFilter.txx (ImageFunction)
+% ./BasicFilters/itkConfidenceConnectedImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkConnectedThresholdImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkIsolatedConnectedImageFilter.hxx (ImageFunction)
+% ./BasicFilters/itkNeighborhoodConnectedImageFilter.hxx (ImageFunction)
 %
-% ./Common/itkBinaryBallStructuringElement.txx (SpatialFunction)
-% ./Common/itkBloxCoreAtomImage.txx (SpatialFunction)
-% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.txx (SpatialFunction)
-% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.txx (SpatialFunction)
+% ./Common/itkBinaryBallStructuringElement.hxx (SpatialFunction)
+% ./Common/itkBloxCoreAtomImage.hxx (SpatialFunction)
+% ./BasicFilters/itkBloxBoundaryPointToCoreAtomImageFilter.hxx (SpatialFunction)
+% ./BasicFilters/itkBloxBoundaryPointImageToBloxBoundaryProfileImageFilter.hxx (SpatialFunction)
 %]
 
 %\subsection{itk::FloodFilledImageFunctionConditionalIterator}
diff --git a/Documentation/SoftwareGuide/Latex/SystemOverview.tex b/Documentation/SoftwareGuide/Latex/SystemOverview.tex
index 76e6e9c3614349f9662f8f51098ecf14ccbc4cf2..915953c123c30bb1b756a75029b1da240d4d602c 100644
--- a/Documentation/SoftwareGuide/Latex/SystemOverview.tex
+++ b/Documentation/SoftwareGuide/Latex/SystemOverview.tex
@@ -152,7 +152,7 @@ simplest syntax errors.
 
 In ITK and OTB classes are defined by a maximum of two files: a header \code{.h} file
 and an implementation file---\code{.cxx} if a non-templated class, and a
-\code{.txx} if a templated class.
+\code{.hxx} if a templated class.
 The header files contain class declarations
 and formatted comments that are used by the Doxygen documentation
 system to automatically produce HTML manual pages.
diff --git a/Documentation/SoftwareGuide/Latex/WriteAFilter.tex b/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
index c6cf45a7dfb84c1dd8f3f6b2ab382ea29e697bec..c210051ca6a0b14cfcf294cbce7065c893170e17 100644
--- a/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
+++ b/Documentation/SoftwareGuide/Latex/WriteAFilter.tex
@@ -521,12 +521,12 @@ defaults (usually zero) for all parameters.  The copy constructor and
 assignment operator should be declared \code{private} and not implemented,
 to prevent instantiating the filter without the factory methods (above). 
 
-Finally, the template implementation code (in the \code{.txx} file) should
+Finally, the template implementation code (in the \code{.hxx} file) should
 be included, bracketed by a test for manual instantiation, thus:
 
 \begin{verbatim}
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "itkExampleFilter.txx"
+#include "itkExampleFilter.hxx"
 #endif
 \end{verbatim}
 
diff --git a/Documentation/SoftwareGuide/Latex/WriteModules.tex b/Documentation/SoftwareGuide/Latex/WriteModules.tex
index b707526e3832cef4bafffeda30a0774bcb50966a..e959f0a7d2066ca98bf2f26ce091431dd075b1fa 100644
--- a/Documentation/SoftwareGuide/Latex/WriteModules.tex
+++ b/Documentation/SoftwareGuide/Latex/WriteModules.tex
@@ -85,7 +85,7 @@ if(NOT OTB_SOURCE_DIR)
 
 \section{The include folder}
 
-The include folder will contain all your headers (*.h files) and template method boy files (*.txx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required). 
+The include folder will contain all your headers (*.h files) and template method boy files (*.hxx or *.hxx). It does not require any additional file (in particular, no CMakeLists.txt file is required). 
 
 \section{The src folder }
 
diff --git a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
index 7dcb3976a0c08c67ee3316ca9c18e1e5d039ab7e..a28764cc153d3fafcc93de0e678a92097df8d12f 100644
--- a/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
+++ b/Examples/ChangeDetection/ChangeDetectionFrameworkExample.cxx
@@ -152,7 +152,7 @@ private:
 
 // Software Guide : BeginLatex
 //
-// Pay attention to the fact that no \code{.txx} file is needed, since
+// Pay attention to the fact that no \code{.hxx} file is needed, since
 // filtering operation is implemented in the
 // \doxygen{otb}{BinaryFunctorNeighborhoodImageFilter} class. So all
 // the algorithmics part is inside the functor.
diff --git a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
index e0c6d878a1b87fce48e6fdeaa4693deed66568ae..f4d52bf934eab81dbd614b45893ac77c420b2c6e 100644
--- a/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
+++ b/Modules/Adapters/BoostAdapters/include/otbJoinContainer.h
@@ -61,7 +61,7 @@ std::ostream & Join(std::ostream &os, TRange const& range, std::string const& se
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbJoinContainer.txx"
+// #include "otbJoinContainer.hxx"
 #endif
 
 #endif // otbJoinContainer_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
index 9306c6575b8389d3adcd540950a378f7600a5a93..91b65ec13cbdc0abe1e813a82fcd038c90b33655 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesSet.h
@@ -172,7 +172,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbGeometriesSet.txx"
+// #include "otbGeometriesSet.hxx"
 #endif
 
 #endif // otbGeometriesSet_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
index 26089652fb5ea7920c3db3dd751b14d81d9b5114..3e604dab369c6358a9e59e33fbeed235ac14d600 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.h
@@ -394,7 +394,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeometriesToGeometriesFilter.txx"
+#include "otbGeometriesToGeometriesFilter.hxx"
 #endif
 
 #endif // otbGeometriesToGeometriesFilter_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
index f93df4b179e417f8b5a651ba1776c4c7d356d6dd..d76e49380b373069328dab84c37b650f2dc3d7a6 100644
--- a/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbGeometriesToGeometriesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeometriesToGeometriesFilter_txx
-#define otbGeometriesToGeometriesFilter_txx
+#ifndef otbGeometriesToGeometriesFilter_hxx
+#define otbGeometriesToGeometriesFilter_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
diff --git a/Modules/Adapters/GdalAdapters/include/otbImageReference.h b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
index b0b5429bf740ae41bc4eccbc85a9c2f1165b7608..0a4f80a11d22feb4f22a3ead29f7499988de0788 100644
--- a/Modules/Adapters/GdalAdapters/include/otbImageReference.h
+++ b/Modules/Adapters/GdalAdapters/include/otbImageReference.h
@@ -173,7 +173,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbImageReference.txx"
+// #include "otbImageReference.hxx"
 #endif
 
 #endif // otbImageReference_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
index 2456e388581dca3345a40d3bd29c972f1f3b4866..f75d86e7847099a0c757f3e0b239f48fa47ad51b 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.h
@@ -572,7 +572,7 @@ namespace boost { namespace foreach {
 #endif
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataSourceWrapper.txx"
+#include "otbOGRDataSourceWrapper.hxx"
 #endif
 
 #endif // otbOGRDataSourceWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
index 202a223c97c5c189b3b77e13f50e4c10d5eaf3f8..e2990958c6d871df3e433ca66732cd5e77c0b760 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRDataSourceWrapper.hxx
@@ -20,12 +20,12 @@
 
 
 /**\ingroup Geometry
- * \file    otbOGRDataSourceWrapper.txx
+ * \file    otbOGRDataSourceWrapper.hxx
  * \internal this file is meant to be included by otbOGRDataSourceWrapper.h
  */
 
-#ifndef otbOGRDataSourceWrapper_txx
-#define otbOGRDataSourceWrapper_txx
+#ifndef otbOGRDataSourceWrapper_hxx
+#define otbOGRDataSourceWrapper_hxx
 
 #include "otbOGRDataSourceWrapper.h"
 
@@ -132,4 +132,4 @@ Value otb::ogr::DataSource::layer_iter<Value>::dereference() const
 }
 
 
-#endif // otbOGRDataSourceWrapper_txx
+#endif // otbOGRDataSourceWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
index 945241bda357d983f2546b4566904aab339f0044..e0cb6b3005b14dd2c7d09b4ee0cb406af1c85e22 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.h
@@ -367,7 +367,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRFeatureWrapper.txx"
+#include "otbOGRFeatureWrapper.hxx"
 #endif
 
 #endif // otbOGRFeatureWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
index df46cee99d0c4e47a15f40c7055fc788367da3c7..8b0203a3a12dd9d32e09c90c68d7fd674b924b56 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFeatureWrapper.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRFeatureWrapper_txx
-#define otbOGRFeatureWrapper_txx
+#ifndef otbOGRFeatureWrapper_hxx
+#define otbOGRFeatureWrapper_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -208,4 +208,4 @@ void otb::ogr::Feature::PrintSelf(std::ostream & os, itk::Indent indent) const
   UncheckedPrintSelf(os, indent);
 }
 
-#endif // otbOGRFeatureWrapper_txx
+#endif // otbOGRFeatureWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
index 8b3f6275719ef1c68403eb005a42b1191b131820..3f5e4c1e0f3bf3a7567ebc053e260a64205723de 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.h
@@ -222,7 +222,7 @@ private:
 } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRFieldWrapper.txx"
+#include "otbOGRFieldWrapper.hxx"
 #endif
 
 #endif // otbOGRFieldWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
index 1e74ea5aff20d446b6193a7915bb7d073d005ccd..082cf8b4fa08b389e1737d501f5fa9769d663643 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbOGRFieldWrapper_txx
-#define otbOGRFieldWrapper_txx
+#ifndef otbOGRFieldWrapper_hxx
+#define otbOGRFieldWrapper_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
@@ -495,4 +495,4 @@ OGRField & otb::ogr::Field::ogr() const
   return const_cast <Field*>(this)->ogr();
 }
 
-#endif // otbOGRFieldWrapper_txx
+#endif // otbOGRFieldWrapper_hxx
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
index 2b7a20c7a4310f7d55e2777e2fe9650e5b5df43a..46643e97684207608bb3abc774bc6e1551a01b54 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometriesVisitor.h
@@ -94,7 +94,7 @@ TResult apply(TGeometry * geometry, TFunctor functor)
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbOGRGeometriesVisitor.txx"
+// #include "otbOGRGeometriesVisitor.hxx"
 #endif
 
 #endif // otbOGRGeometriesVisitor_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
index b5aaa5853083838d6dfc3d10ae2e9f0b2df94954..98a86d849a838aba5354ad9e658b0af2f09b6561 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRGeometryWrapper.h
@@ -161,7 +161,7 @@ OTBGdalAdapters_EXPORT UniqueGeometryPtr SimplifyPreserveTopology(OGRGeometry co
 } } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbOGRGeometryWrapper.txx"
+// #include "otbOGRGeometryWrapper.hxx"
 #endif
 
 #endif // otbOGRGeometryWrapper_h
diff --git a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
index 1a111523feef4f026137bce414f2e2fdd644b073..eab6c14a6707e1264c6c3718d6af570fd34ced95 100644
--- a/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
+++ b/Modules/Adapters/GdalAdapters/include/otbOGRLayerWrapper.h
@@ -553,7 +553,7 @@ inline bool operator!=(Layer const& lhs, Layer const& rhs)
 } } // end namespace otb::ogr
 
 #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbLayerWrapper.txx"
+// #include "otbLayerWrapper.hxx"
 #endif
 
 #endif // otbOGRLayerWrapper_h
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
index 72e87a389ce73951061e25bd0c0760d26ef5afa0..d7e1401098a8e5ac08ac9c2d1915b9e4cf336eb6 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
@@ -214,23 +214,23 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLearningApplicationBase.txx"
+#include "otbLearningApplicationBase.hxx"
 #ifdef OTB_USE_OPENCV
-#include "otbTrainBoost.txx"
-#include "otbTrainDecisionTree.txx"
-#include "otbTrainGradientBoostedTree.txx"
-#include "otbTrainKNN.txx"
-#include "otbTrainNeuralNetwork.txx"
-#include "otbTrainNormalBayes.txx"
-#include "otbTrainRandomForests.txx"
-#include "otbTrainSVM.txx"
+#include "otbTrainBoost.hxx"
+#include "otbTrainDecisionTree.hxx"
+#include "otbTrainGradientBoostedTree.hxx"
+#include "otbTrainKNN.hxx"
+#include "otbTrainNeuralNetwork.hxx"
+#include "otbTrainNormalBayes.hxx"
+#include "otbTrainRandomForests.hxx"
+#include "otbTrainSVM.hxx"
 #endif
 #ifdef OTB_USE_LIBSVM
-#include "otbTrainLibSVM.txx"
+#include "otbTrainLibSVM.hxx"
 #endif
 #ifdef OTB_USE_SHARK
-#include "otbTrainSharkRandomForests.txx"
-#include "otbTrainSharkKMeans.txx"
+#include "otbTrainSharkRandomForests.hxx"
+#include "otbTrainSharkKMeans.hxx"
 #endif
 #endif
 
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
index 9fc20626d43e71e7795ed25b13d413139db2f1f0..7ecc30ab6afcb7b7db71b51ae4d966a39f2c523a 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLearningApplicationBase_txx
-#define otbLearningApplicationBase_txx
+#ifndef otbLearningApplicationBase_hxx
+#define otbLearningApplicationBase_hxx
 
 #include "otbLearningApplicationBase.h"
 // only need this filter as a dummy process object
diff --git a/Modules/Applications/AppClassification/include/otbTrainBoost.hxx b/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
index f971a2a6294bf42561db2bd799c895877482f254..7ea1b673f9f35569f19323f6762fae16eac6a536 100644
--- a/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainBoost.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainBoost_txx
-#define otbTrainBoost_txx
+#ifndef otbTrainBoost_hxx
+#define otbTrainBoost_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbBoostMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
index 01284b5826247a8f07aaabe429d3bd06034e95ed..324bc7dd1d8dceabab88635e39d853f1b7c0c2e2 100644
--- a/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainDecisionTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainDecisionTree_txx
-#define otbTrainDecisionTree_txx
+#ifndef otbTrainDecisionTree_hxx
+#define otbTrainDecisionTree_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbDecisionTreeMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
index 30a3fde157d6bc04ca60524373333d088254b549..719bf8b06e8f4ba74002c635570afb0da5b9babb 100644
--- a/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainGradientBoostedTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainGradientBoostedTree_txx
-#define otbTrainGradientBoostedTree_txx
+#ifndef otbTrainGradientBoostedTree_hxx
+#define otbTrainGradientBoostedTree_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbGradientBoostedTreeMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
index 3ca86e31cd0391c02930257c22d3b74420646ccc..594983e17568024ebeb59c2b0a818b8e57e86a60 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
@@ -300,7 +300,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainImagesBase.txx"
+#include "otbTrainImagesBase.hxx"
 #endif
 
 #endif //otbTrainImagesBase_h
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx b/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
index 15d599176a00bace3665bf780ec4ea55ad197b4d..edede857d7d7c2221a820c9eae3db20c1a858b01 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainImagesBase_txx
-#define otbTrainImagesBase_txx
+#ifndef otbTrainImagesBase_hxx
+#define otbTrainImagesBase_hxx
 
 #include "otbTrainImagesBase.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainKNN.hxx b/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
index 71e02215dbbf94e4b6d014ae89e92f11ac1389fb..74639e3a704ef168760b1b1f17a55a34fa069a4c 100644
--- a/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainKNN.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainKNN_txx
-#define otbTrainKNN_txx
+#ifndef otbTrainKNN_hxx
+#define otbTrainKNN_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbKNearestNeighborsMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx b/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
index 0e34ad78c40f9e7465f1de7a88e5bef08bfa1fa0..bd4a29a757e1e973749acd297bc09c336c1fea8a 100644
--- a/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainLibSVM.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainLibSVM_txx
-#define otbTrainLibSVM_txx
+#ifndef otbTrainLibSVM_hxx
+#define otbTrainLibSVM_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbLibSVMMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
index 33a4930ac4f2458b0aa0153d7f762529b7fa280a..72becd8d6bf493c27efaebac78c0312525e90591 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainNeuralNetwork.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainNeuralNetwork_txx
-#define otbTrainNeuralNetwork_txx
+#ifndef otbTrainNeuralNetwork_hxx
+#define otbTrainNeuralNetwork_hxx
 #include <boost/lexical_cast.hpp>
 #include "otbLearningApplicationBase.h"
 #include "otbNeuralNetworkMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
index f796e8e975e746887d6680c30cfbca47fe243f7f..59f882356f70ba8946705f707e5ab138997f997b 100644
--- a/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainNormalBayes.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainNormalBayes_txx
-#define otbTrainNormalBayes_txx
+#ifndef otbTrainNormalBayes_hxx
+#define otbTrainNormalBayes_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbNormalBayesMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx b/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
index e19777a6861c793150c652cdb9d695cde874a618..1751f927026bf15c6e0e940df7993c63798e93bd 100644
--- a/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainRandomForests.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainRandomForests_txx
-#define otbTrainRandomForests_txx
+#ifndef otbTrainRandomForests_hxx
+#define otbTrainRandomForests_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbRandomForestsMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainSVM.hxx b/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
index ab5138ba33027df907b4d908622250404e2dd1a0..1e3f47d30fdec82dbd10b4eac21f14cb62cc27c4 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSVM.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainSVM_txx
-#define otbTrainSVM_txx
+#ifndef otbTrainSVM_hxx
+#define otbTrainSVM_hxx
 #include "otbLearningApplicationBase.h"
 #include "otbSVMMachineLearningModel.h"
 
diff --git a/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx b/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
index ca03ea33b2d8ee3b3085db3d0f112447eebaf77b..f2008908f1f0cb88aca8afbfe72e0f9cfa082824 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSharkKMeans.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainSharkKMeans_txx
-#define otbTrainSharkKMeans_txx
+#ifndef otbTrainSharkKMeans_hxx
+#define otbTrainSharkKMeans_hxx
 
 #include "otbLearningApplicationBase.h"
 #include "otbSharkKMeansMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx b/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
index fa7ef6646ac634a1dca47dbc5741743ad201ccee..3160740f3f9ba3bdb50d38d6821b520d2d7b4d27 100644
--- a/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainSharkRandomForests.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTrainSharkRandomForests_txx
-#define otbTrainSharkRandomForests_txx
+#ifndef otbTrainSharkRandomForests_hxx
+#define otbTrainSharkRandomForests_hxx
 
 #include "otbLearningApplicationBase.h"
 #include "otbSharkRandomForestsMachineLearningModel.h"
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
index 300b1b5879d05d7682fb944649e3f12bc482a882..2327462210ee93007c5c06db013862a956929f0c 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.h
@@ -190,7 +190,7 @@ protected:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainVectorBase.txx"
+#include "otbTrainVectorBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
index 453db3f3f02c29a23533ef26db67fb71d8cb6411..676cd0eeb3354d7a9da0b02d2303a9725cff3e21 100644
--- a/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
+++ b/Modules/Applications/AppClassification/include/otbTrainVectorBase.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainVectorBase_txx
-#define otbTrainVectorBase_txx
+#ifndef otbTrainVectorBase_hxx
+#define otbTrainVectorBase_hxx
 
 #include "otbTrainVectorBase.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
index f474167e38be7fe6f2a8e56fc8838811afec789b..6a36fe0e7ce762cb9502e983f98f3ffb6bea3847 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainAutoencoder.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainAutoencoder_txx
-#define otbDimensionalityReductionTrainAutoencoder_txx
+#ifndef otbDimensionalityReductionTrainAutoencoder_hxx
+#define otbDimensionalityReductionTrainAutoencoder_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbAutoencoderModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
index 03016916cb0186d118f57a95ee726b80f69486d5..f490d47e053f800149a73b8c83475ce32dd8d188 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainPCA.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainPCA_txx
-#define otbDimensionalityReductionTrainPCA_txx
+#ifndef otbDimensionalityReductionTrainPCA_hxx
+#define otbDimensionalityReductionTrainPCA_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbPCAModel.h"
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
index 51cdd9e1acf1ededba9b54f93260e10c16962572..dc0f4190f7fac18ceba6a7fa5ba5cdaeaec57f93 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionTrainSOM_txx
-#define otbDimensionalityReductionTrainSOM_txx
+#ifndef otbDimensionalityReductionTrainSOM_hxx
+#define otbDimensionalityReductionTrainSOM_hxx
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 #include "otbSOMModel.h"
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
index b0a2ae847ac0595c1744c73117a9c4d711bc93a9..ec833ea574b9a3d1ab0edfd5945c6ee88e0923c0 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.h
@@ -135,12 +135,12 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTrainDimensionalityReductionApplicationBase.txx"
-#include "otbDimensionalityReductionTrainSOM.txx"
+#include "otbTrainDimensionalityReductionApplicationBase.hxx"
+#include "otbDimensionalityReductionTrainSOM.hxx"
 
 #ifdef OTB_USE_SHARK
-#include "otbDimensionalityReductionTrainAutoencoder.txx"
-#include "otbDimensionalityReductionTrainPCA.txx"
+#include "otbDimensionalityReductionTrainAutoencoder.hxx"
+#include "otbDimensionalityReductionTrainPCA.hxx"
 #endif
 #endif
 
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
index 057541017693139268c1039820dc3febde93562b..3852a24bb195dea79df1d6fd615930a9c995852b 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbTrainDimensionalityReductionApplicationBase.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbTrainDimensionalityReductionApplicationBase_txx
-#define otbTrainDimensionalityReductionApplicationBase_txx
+#ifndef otbTrainDimensionalityReductionApplicationBase_hxx
+#define otbTrainDimensionalityReductionApplicationBase_hxx
 
 #include "otbTrainDimensionalityReductionApplicationBase.h"
 
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.h b/Modules/Core/Common/include/otbCommandProgressUpdate.h
index 14e61cb8109e1ff9056e9f83d81017cfdd5047f3..9a4d7b949dc8888ce9033051c5be480f90e2e61f 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.h
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.h
@@ -56,7 +56,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCommandProgressUpdate.txx"
+#include "otbCommandProgressUpdate.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbCommandProgressUpdate.hxx b/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
index 95c745407ffdcd452ac38b1a921cc6c46fde505b..8f6010dd8c96775b34a04fa86ca1c66e2b5efbd9 100644
--- a/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
+++ b/Modules/Core/Common/include/otbCommandProgressUpdate.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCommandProgressUpdate_txx
-#define otbCommandProgressUpdate_txx
+#ifndef otbCommandProgressUpdate_hxx
+#define otbCommandProgressUpdate_hxx
 
 #include "otbCommandProgressUpdate.h"
 
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.h b/Modules/Core/Common/include/otbDecimateImageFilter.h
index c46fdb1519f46fcd0dfae2e72046e83990bf61d4..21752b0539a04cf4e2371ac30b472ab69daba5b2 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.h
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.h
@@ -110,7 +110,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecimateImageFilter.txx"
+#include "otbDecimateImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbDecimateImageFilter.hxx b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
index 9450dd7b8f96424bd25e7a1e6471957179994f29..bfd1a471f8bf12902d005c17f911d32697a0048e 100644
--- a/Modules/Core/Common/include/otbDecimateImageFilter.hxx
+++ b/Modules/Core/Common/include/otbDecimateImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbDecimateImageFilter_txx
-#define otbDecimateImageFilter_txx
+#ifndef otbDecimateImageFilter_hxx
+#define otbDecimateImageFilter_hxx
 
 #include "otbDecimateImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.h b/Modules/Core/Common/include/otbDotProductImageFilter.h
index ec9a18e5838f01ae9472464e718d769d29ae4373..823deeb7c13beb1ae19df7e33b5af31c36c0c19e 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.h
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDotProductImageFilter.txx"
+#include "otbDotProductImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbDotProductImageFilter.hxx b/Modules/Core/Common/include/otbDotProductImageFilter.hxx
index 0ac971c2af6c2deb47ebaf1b8c243787633a9abb..7d2266ec2089588ef11950c9b86f242e9a71934b 100644
--- a/Modules/Core/Common/include/otbDotProductImageFilter.hxx
+++ b/Modules/Core/Common/include/otbDotProductImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDotProductImageFilter_txx
-#define otbDotProductImageFilter_txx
+#ifndef otbDotProductImageFilter_hxx
+#define otbDotProductImageFilter_hxx
 
 #include "otbDotProductImageFilter.h"
 
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.h b/Modules/Core/Common/include/otbFunctionToImageFilter.h
index 2b0af570c1280f05c71f82b16b69b594aef1a9f2..ae026455e4aae8971543a322328632dd347ddca7 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.h
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.h
@@ -138,7 +138,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFunctionToImageFilter.txx"
+#include "otbFunctionToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
index c743bb92c655f42a63e8f9280542797c8034332a..826df4d8ed2a45037cff81ff319651cfc31d1844 100644
--- a/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
+++ b/Modules/Core/Common/include/otbFunctionToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFunctionToImageFilter_txx
-#define otbFunctionToImageFilter_txx
+#ifndef otbFunctionToImageFilter_hxx
+#define otbFunctionToImageFilter_hxx
 
 #include "otbFunctionToImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
index dd4fb6c937de48bf86c2ce1a2f116a4c03bfeb31..77246dc9d2c719938959e419d37e743446f0da3b 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.h
@@ -235,7 +235,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageAndVectorImageOperationFilter.txx"
+#include "otbImageAndVectorImageOperationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
index 89e1133992ddb49a55be3ceddf880b8536e96e8f..0199986738dea7ab2d029a56ae373dbcebbe43dc 100644
--- a/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
+++ b/Modules/Core/Common/include/otbImageAndVectorImageOperationFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageAndVectorImageOperationFilter_txx
-#define otbImageAndVectorImageOperationFilter_txx
+#ifndef otbImageAndVectorImageOperationFilter_hxx
+#define otbImageAndVectorImageOperationFilter_hxx
 
 #include "otbImageAndVectorImageOperationFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
index 8104d9990b50c74092784d30aaaf9758431445b3..e9ac73c411140da15c147f0428ceff18cd032ec4 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionAdaptativeSplitter.txx"
+# include "otbImageRegionAdaptativeSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
index b9bb88e318d687d85b48976f43a8b11bbd3d8b23..08370077a773609752469fabf2ec9401311074bc 100644
--- a/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionAdaptativeSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionAdaptativeSplitter_txx
-#define otbImageRegionAdaptativeSplitter_txx
+#ifndef otbImageRegionAdaptativeSplitter_hxx
+#define otbImageRegionAdaptativeSplitter_hxx
 
 #include "otbImageRegionAdaptativeSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
index 5c59809713028927cd99cd386d5515ca87c2c3a0..31d8242760e487939e6c64bd2ac39b8227493891 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.h
@@ -130,7 +130,7 @@ private:
 #endif
 
 #ifndef ITK_MANUAL_INSTANTIATION
-# include "otbImageRegionNonUniformMultidimensionalSplitter.txx"
+# include "otbImageRegionNonUniformMultidimensionalSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
index 7002576fe127270a0abd09e92b64017aea02dcff..bc61209bdf90c8ea3cb9359ea494286e4f95efea 100644
--- a/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionNonUniformMultidimensionalSplitter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionNonUniformMultidimensionalSplitter_txx
-#define otbImageRegionNonUniformMultidimensionalSplitter_txx
+#ifndef otbImageRegionNonUniformMultidimensionalSplitter_hxx
+#define otbImageRegionNonUniformMultidimensionalSplitter_hxx
 #include "otbImageRegionNonUniformMultidimensionalSplitter.h"
 
 namespace otb
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
index 7825a41a29efafdee611bd04627973e6e292bd16..c08d86f28ee8a81d6353cefcf345173d53c41541 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.h
@@ -143,7 +143,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionSquareTileSplitter.txx"
+# include "otbImageRegionSquareTileSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
index 45a57b557bf77c3228cc4c04e24290c0cda6fee8..f09e0d02157dbfd63dd8e0d9c5e31faa6cf40476 100644
--- a/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionSquareTileSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionSquareTileSplitter_txx
-#define otbImageRegionSquareTileSplitter_txx
+#ifndef otbImageRegionSquareTileSplitter_hxx
+#define otbImageRegionSquareTileSplitter_hxx
 
 #include "otbImageRegionSquareTileSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
index 7e58227ac8f439b4188278bb8ef459721add3cf0..2d20c9f54da1c3ac4cad43f993d11284666ec555 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.h
@@ -138,7 +138,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbImageRegionTileMapSplitter.txx"
+# include "otbImageRegionTileMapSplitter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
index d01034baab6a4bcac976ed5cf478366472ccdd12..2e4c793eb36f06d03a2801a56609ba15f75260e9 100644
--- a/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
+++ b/Modules/Core/Common/include/otbImageRegionTileMapSplitter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageRegionTileMapSplitter_txx
-#define otbImageRegionTileMapSplitter_txx
+#ifndef otbImageRegionTileMapSplitter_hxx
+#define otbImageRegionTileMapSplitter_hxx
 
 #include "otbImageRegionTileMapSplitter.h"
 #include "otbMath.h"
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
index 8846d0ebd387bd555f5e341af7e2942898323483..9701077133fdec50a75273e4b1e206ebdc33415b 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToModulusAndDirectionImageFilter.txx"
+#include "otbImageToModulusAndDirectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
index ab571da29e8de2aac2ff0b34c3baf8c56c695fe6..01362430c5cba2b3483a35697d0619d55974ae52 100644
--- a/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImageToModulusAndDirectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToModulusAndDirectionImageFilter_txx
-#define otbImageToModulusAndDirectionImageFilter_txx
+#ifndef otbImageToModulusAndDirectionImageFilter_hxx
+#define otbImageToModulusAndDirectionImageFilter_hxx
 
 #include "otbImageToModulusAndDirectionImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/Common/include/otbImportImageFilter.h b/Modules/Core/Common/include/otbImportImageFilter.h
index 63396d7112ec324886e704a8edf63e1eb76d03b7..bb5c1895fe5a0372247fb9fedcae7179343db1fe 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.h
+++ b/Modules/Core/Common/include/otbImportImageFilter.h
@@ -181,7 +181,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportImageFilter.txx"
+#include "otbImportImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImportImageFilter.hxx b/Modules/Core/Common/include/otbImportImageFilter.hxx
index f6affce633377ae99bc1b6aad545a53e20848941..6fe724224709f6f25828349fe32c63924f89f463 100644
--- a/Modules/Core/Common/include/otbImportImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImportImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportImageFilter_txx
-#define otbImportImageFilter_txx
+#ifndef otbImportImageFilter_hxx
+#define otbImportImageFilter_hxx
 
 #include "otbImportImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.h b/Modules/Core/Common/include/otbImportVectorImageFilter.h
index d4681c48f732fe2bd9f4929708a81daa649005c4..d05e6b8da7344929bdbe40c0571fce4bba8c21df 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.h
@@ -186,7 +186,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportVectorImageFilter.txx"
+#include "otbImportVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbImportVectorImageFilter.hxx b/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
index 1db74621750ddc78adb71512d17a6bc27a63437c..4257b6208c7b59927c2f5e2ef586fb00b108213d 100644
--- a/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbImportVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportVectorImageFilter_txx
-#define otbImportVectorImageFilter_txx
+#ifndef otbImportVectorImageFilter_hxx
+#define otbImportVectorImageFilter_hxx
 
 #include "otbImportVectorImageFilter.h"
 #include "itkObjectFactory.h"
diff --git a/Modules/Core/Common/include/otbModelComponentBase.h b/Modules/Core/Common/include/otbModelComponentBase.h
index 57b13394ddac8bb107a895b729c0575bee5ff2da..088e5b58a086e83ac55dd461e3ec25ab543a5dea 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.h
+++ b/Modules/Core/Common/include/otbModelComponentBase.h
@@ -166,7 +166,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbModelComponentBase.txx"
+#include "otbModelComponentBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbModelComponentBase.hxx b/Modules/Core/Common/include/otbModelComponentBase.hxx
index 11ba6164ba701622c8ab04e1e3dbcf5f460299ca..4010d24262bcfd1b7b07c90bc3ebe7110a698b80 100644
--- a/Modules/Core/Common/include/otbModelComponentBase.hxx
+++ b/Modules/Core/Common/include/otbModelComponentBase.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbModelComponentBase_txx
-#define otbModelComponentBase_txx
+#ifndef otbModelComponentBase_hxx
+#define otbModelComponentBase_hxx
 
 #include <iostream>
 
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
index 8908d95d4c514028f0af61f420bf99b236bb3e1c..74afdecc93760a0b8a676f5d7d7db19764192ddd 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.h
@@ -171,7 +171,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbQuaternaryFunctorImageFilter.txx"
+#include "otbQuaternaryFunctorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
index 3c63cb5ed75e79925321b96dcc523ba807bc1a79..c5ac5bc00fad54f8ecf933b27a7bacc08e7aca0b 100644
--- a/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbQuaternaryFunctorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbQuaternaryFunctorImageFilter_txx
-#define otbQuaternaryFunctorImageFilter_txx
+#ifndef otbQuaternaryFunctorImageFilter_hxx
+#define otbQuaternaryFunctorImageFilter_hxx
 
 #include "otbQuaternaryFunctorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.h b/Modules/Core/Common/include/otbRGBAPixelConverter.h
index be7389057de899459e3991cc74c181a3a24ee253..78fd678fd03b6bf96e676b855f45289a870b01ab 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.h
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRGBAPixelConverter.txx"
+#include "otbRGBAPixelConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbRGBAPixelConverter.hxx b/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
index cd5dd0c5279b5101da99b0ca12c6d1c31cfc84ec..fff51b0cac6bde91a636ac5bec414f6ed5c202f2 100644
--- a/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
+++ b/Modules/Core/Common/include/otbRGBAPixelConverter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRGBAPixelConverter_txx
-#define otbRGBAPixelConverter_txx
+#ifndef otbRGBAPixelConverter_hxx
+#define otbRGBAPixelConverter_hxx
 
 #include "otbRGBAPixelConverter.h"
 
diff --git a/Modules/Core/Common/include/otbRectangle.h b/Modules/Core/Common/include/otbRectangle.h
index b3c5276953c4e7d36e7b12b584be71c2cde5f33f..dcd7bbb14a2c2d175a0515d08ee9923cba3c2f2e 100644
--- a/Modules/Core/Common/include/otbRectangle.h
+++ b/Modules/Core/Common/include/otbRectangle.h
@@ -122,6 +122,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRectangle.txx"
+#include "otbRectangle.hxx"
 #endif
 #endif
diff --git a/Modules/Core/Common/include/otbRectangle.hxx b/Modules/Core/Common/include/otbRectangle.hxx
index 31c46b404428ec263fd174af942e0c220138fa9e..8ada6f1d928791f33e3af2da970a4c0e8cddcda7 100644
--- a/Modules/Core/Common/include/otbRectangle.hxx
+++ b/Modules/Core/Common/include/otbRectangle.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRectangle_txx
-#define otbRectangle_txx
+#ifndef otbRectangle_hxx
+#define otbRectangle_hxx
 
 #include "otbRectangle.h"
 
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
index 1b80e8f8cff93230da6967a209d80199873596d4..c40490a09dbe3fe061080281988a242b1626bbfc 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.h
@@ -250,7 +250,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubsampledImageRegionConstIterator.txx"
+#include "otbSubsampledImageRegionConstIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
index 17753110600f799a93032a2f34ff2e13c2e354d0..45c50f98bb1eb8dedecc5bd9c1cc94a4b34d7be4 100644
--- a/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
+++ b/Modules/Core/Common/include/otbSubsampledImageRegionConstIterator.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSubsampledImageRegionConstIterator_txx
-#define otbSubsampledImageRegionConstIterator_txx
+#ifndef otbSubsampledImageRegionConstIterator_hxx
+#define otbSubsampledImageRegionConstIterator_hxx
 
 #include "otbSubsampledImageRegionConstIterator.h"
 
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
index 99c1ab7b70d5c80c3808e8a08308e3c4b38dc8db..a48a69cced987236fffa1ebb8df6d8e5afc165f1 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.h
@@ -141,7 +141,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodVectorImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
index 3570f866518d094a3b85de892582fe545727cf2a..1ab182587810110a4ea0584dc9363da958653551 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_txx
-#define otbUnaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodVectorImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodVectorImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
index 59c5c5090bf5ca7bb770b4337e6e91aa53e0399d..ce20d49d12f382a0c36b3aad4bf6e8577fac2249 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorVectorImageFilter.txx"
+#include "otbUnaryFunctorVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
index 004a6a7b4e813ca16331d36bf68cfcf0ad8e26ec..92cb277eef3e3723d272e59b2bc022c43281f229 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorVectorImageFilter_txx
-#define otbUnaryFunctorVectorImageFilter_txx
+#ifndef otbUnaryFunctorVectorImageFilter_hxx
+#define otbUnaryFunctorVectorImageFilter_hxx
 
 #include "otbUnaryFunctorVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
index f17916deec08a9df7da788d5e1e086118e3ba5d0..c83e7dcafab400c2883c0c71f2c10b8957a4db6a 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h
@@ -156,7 +156,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.txx"
+#include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
index cb0cff09dafd70cc60c27e46ac73b9129a0e56ce..ac16a26213b485ce20331b73efefd9b6863d7715 100644
--- a/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
+++ b/Modules/Core/Common/include/otbUnaryFunctorWithIndexWithOutputSizeImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
-#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexWithOutputSizeImageFilter_hxx
+#define otbUnaryFunctorWithIndexWithOutputSizeImageFilter_hxx
 
 #include "otbUnaryFunctorWithIndexWithOutputSizeImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
index 2e773e1443fbea6938fa2818cd2597dd62adee93..be24d2fa894f0f4553fb74f16b25bd9114edf7fb 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.h
@@ -295,7 +295,7 @@ private:
 }// namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVariableLengthVectorConverter.txx"
+#include "otbVariableLengthVectorConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx b/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
index a306a58f20fd10388332e523cd940a74ca2100c6..d599e2949ab4fa2c1e3457e956c635a1963ed3af 100644
--- a/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
+++ b/Modules/Core/Common/include/otbVariableLengthVectorConverter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVariableLengthVectorConverter_txx
-#define otbVariableLengthVectorConverter_txx
+#ifndef otbVariableLengthVectorConverter_hxx
+#define otbVariableLengthVectorConverter_hxx
 
 #include "otbVariableLengthVectorConverter.h"
 #include <complex>
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
index ca9d4d372b3896125d7d8ff00c4ccf7188930af2..fcde4929d46a61c05dcb5f3c448effb87358458d 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.h
@@ -83,7 +83,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConvertPixelBuffer.txx"
+#include "otbConvertPixelBuffer.hxx"
 #endif
 
 #endif // otbConvertPixelBuffer_h
diff --git a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
index fa18a81ca75179252de740e8920d35e1bf5e592b..0df8cff4d6e5a56dbd87d9a43d2b21554b47ebf5 100644
--- a/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
+++ b/Modules/Core/ImageBase/include/otbConvertPixelBuffer.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConvertPixelBuffer_txx
-#define otbConvertPixelBuffer_txx
+#ifndef otbConvertPixelBuffer_hxx
+#define otbConvertPixelBuffer_hxx
 #include "otbConvertPixelBuffer.h"
 
 #include "itkConvertPixelBuffer.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.h b/Modules/Core/ImageBase/include/otbExtractROI.h
index 1e3c3444bf3b582ff7409343a3d8ae7deb3bf95e..e534de8bbe808dd8435d11d320307f952cf233c7 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbExtractROI.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractROI.txx"
+#include "otbExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbExtractROI.hxx b/Modules/Core/ImageBase/include/otbExtractROI.hxx
index 968abfd481fbd73727bb7d20e75519d973e21334..7e96af168ddb0242bdb737dd90223a2b58f0fd49 100644
--- a/Modules/Core/ImageBase/include/otbExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractROI_txx
-#define otbExtractROI_txx
+#ifndef otbExtractROI_hxx
+#define otbExtractROI_hxx
 
 #include "otbExtractROI.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.h b/Modules/Core/ImageBase/include/otbExtractROIBase.h
index 864d249b2cb054e3fe4537ac110280d08bcdd0dc..ec00649f9443631272e8388d1ac2de1871d56121 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.h
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.h
@@ -181,7 +181,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractROIBase.txx"
+#include "otbExtractROIBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbExtractROIBase.hxx b/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
index 26108adf677fe834494606ae68f2d252778201ce..b205f21380a64ec0cd9753051633203ef77b4094 100644
--- a/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
+++ b/Modules/Core/ImageBase/include/otbExtractROIBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractROIBase_txx
-#define otbExtractROIBase_txx
+#ifndef otbExtractROIBase_hxx
+#define otbExtractROIBase_hxx
 
 #include "otbExtractROIBase.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ImageBase/include/otbImage.h b/Modules/Core/ImageBase/include/otbImage.h
index fade2644fa9cbb9b07a9a2d5a90519500a7a43e9..6dc3e630f8408e964ccb82ed4cc40d325873be70 100644
--- a/Modules/Core/ImageBase/include/otbImage.h
+++ b/Modules/Core/ImageBase/include/otbImage.h
@@ -271,7 +271,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImage.txx"
+#include "otbImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImage.hxx b/Modules/Core/ImageBase/include/otbImage.hxx
index 096a7259605c8dc9adabe7c9c058fdd27490332d..68de67df335d2e6e8c357c17fe2b2e4ba62e4183 100644
--- a/Modules/Core/ImageBase/include/otbImage.hxx
+++ b/Modules/Core/ImageBase/include/otbImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImage_txx
-#define otbImage_txx
+#ifndef otbImage_hxx
+#define otbImage_hxx
 
 
 #include "otbImage.h"
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
index c7ae05be2692014a03ab04b875835fe423d2b989..ab6b8108e1d6ff08a85f9e0dcf82094113fcf86d 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFunctionAdaptor.txx"
+#include "otbImageFunctionAdaptor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
index feaca84b81266fb97ab3226613ada5b7ea9dad02..01e9a092ab6703571f54f38d5ba7319ceb6b5e78 100644
--- a/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
+++ b/Modules/Core/ImageBase/include/otbImageFunctionAdaptor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFunctionAdaptor_txx
-#define otbImageFunctionAdaptor_txx
+#ifndef otbImageFunctionAdaptor_hxx
+#define otbImageFunctionAdaptor_hxx
 
 #include "otbImageFunctionAdaptor.h"
 
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
index ced97e4d6ae1f1c79b94cafe86792bbd1d3e7a92..c957d023ad0b6dac653247f3efa7fcc393d43780 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageOfVectorsToMonoChannelExtractROI.txx"
+#include "otbImageOfVectorsToMonoChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
index dc186f82125edfbdd649dc6692046b670ee009fa..60978bcf9ffc4abfb55332f5ea80f58079be369b 100644
--- a/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbImageOfVectorsToMonoChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageOfVectorsToMonoChannelExtractROI_txx
-#define otbImageOfVectorsToMonoChannelExtractROI_txx
+#ifndef otbImageOfVectorsToMonoChannelExtractROI_hxx
+#define otbImageOfVectorsToMonoChannelExtractROI_hxx
 
 #include "otbImageOfVectorsToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.h b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
index 430e0db2dec9e3af2a6896c52b8118e47c0e3607..62ff3eb9c324d334136880e26634182b8bbc63c9 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.h
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMetaImageFunction.txx"
+#include "otbMetaImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx b/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
index 5cc59208c0833ebe1459f645adb9b579c21a6fae..b70e9e064c5d44ae02af3b2b0f758402dd4a75d8 100644
--- a/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
+++ b/Modules/Core/ImageBase/include/otbMetaImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMetaImageFunction_txx
-#define otbMetaImageFunction_txx
+#ifndef otbMetaImageFunction_hxx
+#define otbMetaImageFunction_hxx
 
 #include "otbMetaImageFunction.h"
 #include "otbImageFunctionAdaptor.h"
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
index ad7a6b1dfa32c48e6cdf944a65c5c5efd9ad362f..b1bfddf3faf35c4b95d5a0ca0033ddf725930f1c 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiChannelExtractROI.txx"
+#include "otbMultiChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
index 783886e201763444c35f0b3619a1a544cdc5af89..5ceae105905fea4a61a9da16e0d639c496e92f51 100644
--- a/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiChannelExtractROI_txx
-#define otbMultiChannelExtractROI_txx
+#ifndef otbMultiChannelExtractROI_hxx
+#define otbMultiChannelExtractROI_hxx
 
 #include "otbMultiChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
index bc368622111247edda27548d04b907992cf43e0c..708160c2c8a2b0374f18e637dfb1227abbc00e40 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.h
@@ -123,7 +123,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiToMonoChannelExtractROI.txx"
+#include "otbMultiToMonoChannelExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
index 2d2ff0604798952a5a97e8d0428b0a33a897d9f3..3633007b3cf56e0427b6da86a934d37a872bfb64 100644
--- a/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
+++ b/Modules/Core/ImageBase/include/otbMultiToMonoChannelExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiToMonoChannelExtractROI_txx
-#define otbMultiToMonoChannelExtractROI_txx
+#ifndef otbMultiToMonoChannelExtractROI_hxx
+#define otbMultiToMonoChannelExtractROI_hxx
 
 #include "otbMultiToMonoChannelExtractROI.h"
 
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.h b/Modules/Core/ImageBase/include/otbVectorImage.h
index bf6ebaaacae98f3bbabf31e17c91a9faa83a120f..2c218297b0bb7220e0449b76cb6397b519ac8625 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.h
+++ b/Modules/Core/ImageBase/include/otbVectorImage.h
@@ -212,7 +212,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImage.txx"
+#include "otbVectorImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ImageBase/include/otbVectorImage.hxx b/Modules/Core/ImageBase/include/otbVectorImage.hxx
index f6123af5845fc49c321a84febdd28be828ee21bc..d40402b8fe292530a16790363f70a179ecb90217 100644
--- a/Modules/Core/ImageBase/include/otbVectorImage.hxx
+++ b/Modules/Core/ImageBase/include/otbVectorImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImage_txx
-#define otbVectorImage_txx
+#ifndef otbVectorImage_hxx
+#define otbVectorImage_hxx
 
 
 #include "otbVectorImage.h"
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
index 9e758654c9b8142bc32ab1c02f333dbf5a6d3678..b13758ea6b8f0a412bc4a1df04cf806be6e4b320 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.h
@@ -211,7 +211,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBCOInterpolateImageFunction.txx"
+#include "otbBCOInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
index 820381f28a1021edbe30a826f43879b769a16133..f91f9027623c8d60678ef6d93dd10ff0a13d97b5 100644
--- a/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbBCOInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBCOInterpolateImageFunction_txx
-#define otbBCOInterpolateImageFunction_txx
+#ifndef otbBCOInterpolateImageFunction_hxx
+#define otbBCOInterpolateImageFunction_hxx
 
 #include "otbBCOInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
index 5a4efef22b1b3c1d691c498eb21180b58fdf647c..e46d9a19996c434ef98358e08b1cc8da9c7ce6a4 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplineDecompositionImageFilter.txx"
+#include "otbBSplineDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
index aefceafbd747eefaaa9d0077ff14e6dc7e4b2337..08e85b3eab652c9847cf5fb5a30ea98470519d9c 100644
--- a/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
+++ b/Modules/Core/Interpolation/include/otbBSplineDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplineDecompositionImageFilter_txx
-#define otbBSplineDecompositionImageFilter_txx
+#ifndef otbBSplineDecompositionImageFilter_hxx
+#define otbBSplineDecompositionImageFilter_hxx
 #include "otbBSplineDecompositionImageFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
index 20fc576db7d4c3993bd8078613026836f9c4a8ad..37f20c7c38d2d985fabea469b1014c3275503a42 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.h
@@ -191,7 +191,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplineInterpolateImageFunction.txx"
+#include "otbBSplineInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
index 34c09638157290fa13e2d58fd997dc092feb4876..ae50ccf495239d02759a17ba07d683941571dd75 100644
--- a/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbBSplineInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplineInterpolateImageFunction_txx
-#define otbBSplineInterpolateImageFunction_txx
+#ifndef otbBSplineInterpolateImageFunction_hxx
+#define otbBSplineInterpolateImageFunction_hxx
 #include "otbBSplineInterpolateImageFunction.h"
 #include "itkImageLinearIteratorWithIndex.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
index 32cf44b794e8f28095309b210831f491a93e25dd..7904220cf67c871a800be0eedb9379324c6e9df2 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.h
@@ -161,7 +161,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericInterpolateImageFunction.txx"
+#include "otbGenericInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
index 08c5d98b546cb89ba9320f6670f756459d39bf00..1f51fb380e48cc151408261c4dcd5c9cb854a21c 100644
--- a/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbGenericInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericInterpolateImageFunction_txx
-#define otbGenericInterpolateImageFunction_txx
+#ifndef otbGenericInterpolateImageFunction_hxx
+#define otbGenericInterpolateImageFunction_hxx
 #include "otbGenericInterpolateImageFunction.h"
 #include "vnl/vnl_math.h"
 
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
index ce501c963218b9480c57bb0cd0a0abb43ac734ba..2c181389853839803e46621d00cd7943092765a7 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.h
@@ -324,7 +324,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProlateInterpolateImageFunction.txx"
+#include "otbProlateInterpolateImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
index c9d045293f1e01b6db3fc3ca8dc36b6c9c54dcb4..c1042a8e862e3dac147cce17694f0c2d9662c698 100644
--- a/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
+++ b/Modules/Core/Interpolation/include/otbProlateInterpolateImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProlateInterpolateImageFunction_txx
-#define otbProlateInterpolateImageFunction_txx
+#ifndef otbProlateInterpolateImageFunction_hxx
+#define otbProlateInterpolateImageFunction_hxx
 
 #include "otbProlateInterpolateImageFunction.h"
 
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.h b/Modules/Core/Interpolation/include/otbStreamingTraits.h
index bf62da25ac5b22480fd87be889913c2b48dd8ba3..48c2ffeb3b6d785fada7fa9cf9d0c39201c1b19a 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.h
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.h
@@ -122,7 +122,7 @@ public:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingTraits.txx"
+#include "otbStreamingTraits.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
index eed5e75d7be6e9b82013dad13abd027441a97314..a8960821cc2bb5be6a3f1b12e6f8efd30076c130 100644
--- a/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
+++ b/Modules/Core/Interpolation/include/otbStreamingTraits.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingTraits_txx
-#define otbStreamingTraits_txx
+#ifndef otbStreamingTraits_hxx
+#define otbStreamingTraits_hxx
 
 #include "otbStreamingTraits.h"
 
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
index 4de1c9940b714f40e870735ea126f43c996e3641..99edf48c28821bd91058bb05942298c238206c2b 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.h
@@ -190,7 +190,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWindowedSincInterpolateImageFunctionBase.txx"
+#include "otbWindowedSincInterpolateImageFunctionBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
index bda4ad2bbf08d29fa134f2f0102633366b60ba91..5b9ae7eca59b5c2a7cd4fdd3285c9e517dc5da96 100644
--- a/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
+++ b/Modules/Core/Interpolation/include/otbWindowedSincInterpolateImageFunctionBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWindowedSincInterpolateImageFunctionBase_txx
-#define otbWindowedSincInterpolateImageFunctionBase_txx
+#ifndef otbWindowedSincInterpolateImageFunctionBase_hxx
+#define otbWindowedSincInterpolateImageFunctionBase_hxx
 
 #include "otbWindowedSincInterpolateImageFunctionBase.h"
 
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
index 166517718c949739502705342887f573345f9c2f..0a1d5b748042531395e960712f27a2df3abb45b6 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.h
@@ -94,7 +94,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAttributesMapOpeningLabelMapFilter.txx"
+#include "otbAttributesMapOpeningLabelMapFilter.hxx"
 #endif
 
 #endif // otbAttributesMapOpeningLabelMapFilter_h
diff --git a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
index a0ac363b0bb5300e165f558419683cfcaca358eb..4639d40e0a9aaaf97e91f5a4080c6329c603608a 100644
--- a/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbAttributesMapOpeningLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbAttributesMapOpeningLabelMapFilter_txx
-#define otbAttributesMapOpeningLabelMapFilter_txx
+#ifndef otbAttributesMapOpeningLabelMapFilter_hxx
+#define otbAttributesMapOpeningLabelMapFilter_hxx
 
 #include "otbAttributesMapOpeningLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
index 75a56344e1c1f6861360c2ca0f5d0603c52939b5..4b1a5bd724f0f85c812433989a09a37f911d9392 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.h
@@ -214,7 +214,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandsStatisticsAttributesLabelMapFilter.txx"
+#include "otbBandsStatisticsAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
index 1de1c638d287de0d9eaa0a6da7897f04ac632b1e..51b29436e2bd565d6922cd6c73302ddd9bd6c8de 100644
--- a/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbBandsStatisticsAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandsStatisticsAttributesLabelMapFilter_txx
-#define otbBandsStatisticsAttributesLabelMapFilter_txx
+#ifndef otbBandsStatisticsAttributesLabelMapFilter_hxx
+#define otbBandsStatisticsAttributesLabelMapFilter_hxx
 
 #include "otbBandsStatisticsAttributesLabelMapFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
index 04487819d1316a8105d22c9804faa5a66fe84047..db348fc45dd6fbb2bc66bb7a1405cbb12fc836be 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.h
@@ -102,7 +102,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToLabelMapWithAttributesFilter.txx"
+#include "otbImageToLabelMapWithAttributesFilter.hxx"
 #endif
 #endif
 
diff --git a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
index a21ad1bc69e791a4cba114424d0304c31dd0f5e9..a61193322a8a6df826e0fc188fb26bb090d97e90 100644
--- a/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbImageToLabelMapWithAttributesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToLabelMapWithAttributesFilter_txx
-#define otbImageToLabelMapWithAttributesFilter_txx
+#ifndef otbImageToLabelMapWithAttributesFilter_hxx
+#define otbImageToLabelMapWithAttributesFilter_hxx
 
 #include "otbImageToLabelMapWithAttributesFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
index 25ada97feec3e31b5661e0e2a067bc5a8718c921..d32932af934cd514929f8634ad537d22e03054a1 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.h
@@ -141,7 +141,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKMeansAttributesLabelMapFilter.txx"
+#include "otbKMeansAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
index 376a478eedfe514023690dc466b6e26184df45f1..5037c74a184bc5434634b252c6fe577bb8ddef00 100644
--- a/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbKMeansAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKMeansAttributesLabelMapFilter_txx
-#define otbKMeansAttributesLabelMapFilter_txx
+#ifndef otbKMeansAttributesLabelMapFilter_hxx
+#define otbKMeansAttributesLabelMapFilter_hxx
 
 #include "otbKMeansAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
index 7afab7bc58aa5cb65d130257d6aea7ef4dbf07c9..3b6f48c296e14e138645c6ad6e7600c800a8afd3 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.h
@@ -156,7 +156,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToLabelMapWithAdjacencyFilter.txx"
+#include "otbLabelImageToLabelMapWithAdjacencyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
index 9c3cca18f50d5e07f9a8bf6e0a0fd69810435925..6c44669fc9f067ce5fea02d7d2e6ec4b9d2db3b4 100644
--- a/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelImageToLabelMapWithAdjacencyFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_txx
-#define otbLabelImageToLabelMapWithAdjacencyFilter_txx
+#ifndef otbLabelImageToLabelMapWithAdjacencyFilter_hxx
+#define otbLabelImageToLabelMapWithAdjacencyFilter_hxx
 
 #include "otbLabelImageToLabelMapWithAdjacencyFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.h b/Modules/Core/LabelMap/include/otbLabelMapSource.h
index bdc32d74aaa00a3395d4f2f4d49d0229b2bd2658..38c69995fc4dbad210465f0f7791de8af523c92e 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.h
@@ -80,7 +80,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapSource.txx"
+#include "otbLabelMapSource.hxx"
 #endif
 
 #endif // otbLabelMapSource_h
diff --git a/Modules/Core/LabelMap/include/otbLabelMapSource.hxx b/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
index 99da44f6989639e06ed8c1e96cf42ed82cc892fb..692927d3221bc88e79150ea23bff535432d224d6 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelMapSource_txx
-#define otbLabelMapSource_txx
+#ifndef otbLabelMapSource_hxx
+#define otbLabelMapSource_hxx
 
 #include "otbLabelMapSource.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
index 50dcc9f616504fdcaed77c0c03b6646c5bb60c56..f61621d85e923199212ff1e5b2ea82329a0f7d98 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.h
@@ -121,7 +121,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToAttributeImageFilter.txx"
+#include "otbLabelMapToAttributeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
index de2dd0759aa965454f8e57c1b0e3bda79ec2d78e..545770af811534d5525a8157f2aefe7fc36d3371 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToAttributeImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelMapToAttributeImageFilter_txx
-#define otbLabelMapToAttributeImageFilter_txx
+#ifndef otbLabelMapToAttributeImageFilter_hxx
+#define otbLabelMapToAttributeImageFilter_hxx
 
 #include "otbLabelMapToAttributeImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
index 6df4c11ff09b26d606a69ad657b38f01dc589343..4d3a146a1940b8372de044faa14ccee4f770277b 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.h
@@ -96,7 +96,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbLabelMapToLabelImageFilter.txx"
+#include "otbLabelMapToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
index 704515e5f890b290ee5e6693985d435d84f5bf96..2e374137d56ff4fc535df9e3c71a1b8f335e507c 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToLabelImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToLabelImageFilter_txx
-#define otbLabelMapToLabelImageFilter_txx
+#ifndef otbLabelMapToLabelImageFilter_hxx
+#define otbLabelMapToLabelImageFilter_hxx
 
 #include "otbLabelMapToLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
index e2e01969340467647c857814a001aac2d193dcc5..7adfbf08756333e049b67a2e0c4ee27d2667aa60 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToSampleListFilter.txx"
+#include "otbLabelMapToSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
index 0c58b9ff4d89c8bd7f589470424335cb4e023b06..5536892a37733a3f432aac24dd7bb36418297a08 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapToSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToSampleListFilter_txx
-#define otbLabelMapToSampleListFilter_txx
+#ifndef otbLabelMapToSampleListFilter_hxx
+#define otbLabelMapToSampleListFilter_hxx
 
 #include "otbLabelMapToSampleListFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
index d1ff1f07030c125a799091e8664cd9e7bff15ab5..1166ebd218692991f6bcd56a016cefe6d8b00489 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.h
@@ -90,7 +90,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapWithClassLabelToClassLabelImageFilter.txx"
+#include "otbLabelMapWithClassLabelToClassLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
index 8fd58ce42d3163def19002898ff0ad852fd2d583..29bda0b702dcb059ed5c5192c4aa418d156da564 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToClassLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_txx
-#define otbLabelMapWithClassLabelToClassLabelImageFilter_txx
+#ifndef otbLabelMapWithClassLabelToClassLabelImageFilter_hxx
+#define otbLabelMapWithClassLabelToClassLabelImageFilter_hxx
 
 #include "otbLabelMapWithClassLabelToClassLabelImageFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
index c0ec1bf654ceb2d5733985081733151a18e3f7c4..198667f8b5fd8daf462dedac22890ba1855f5ffc 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapWithClassLabelToLabeledSampleListFilter.txx"
+#include "otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
index 698d65d59d78a4c81df4ea7162b07b654b979c62..67fe403317b36bbbc0f97d102921800b89ba1a15 100644
--- a/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelMapWithClassLabelToLabeledSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
-#define otbLabelMapWithClassLabelToLabeledSampleListFilter_txx
+#ifndef otbLabelMapWithClassLabelToLabeledSampleListFilter_hxx
+#define otbLabelMapWithClassLabelToLabeledSampleListFilter_hxx
 
 #include "otbLabelMapWithClassLabelToLabeledSampleListFilter.h"
 #include "itkDataObject.h"
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
index dcddceaeb38859d8029dcd6c3eaa586719937652..1d7b92178eef75c680cb5bb44f3669d999355476 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.h
@@ -235,7 +235,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelObjectToPolygonFunctor.txx"
+#include "otbLabelObjectToPolygonFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
index 66566b8d2375854ddb4b13a779fa5dc97f4090b6..56d470b3e5977d41d25bcda0787b5ba42911e57c 100644
--- a/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
+++ b/Modules/Core/LabelMap/include/otbLabelObjectToPolygonFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelObjectToPolygonFunctor_txx
-#define otbLabelObjectToPolygonFunctor_txx
+#ifndef otbLabelObjectToPolygonFunctor_hxx
+#define otbLabelObjectToPolygonFunctor_hxx
 
 
 #include "otbLabelObjectToPolygonFunctor.h"
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
index 5bfb512b332b30a2347b8a2e385429e7205f6f7c..e22a5fdd96d624c250a46d0d6975a4aef7cd4615 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.h
@@ -111,7 +111,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMinMaxAttributesLabelMapFilter.txx"
+#include "otbMinMaxAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
index 976bbea70c6c9076e59b0691c1ff6f97eb23df75..347b70f721c4bb06239e9cf7aded7202af5d88a6 100644
--- a/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbMinMaxAttributesLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMinMaxAttributesLabelMapFilter_txx
-#define otbMinMaxAttributesLabelMapFilter_txx
+#ifndef otbMinMaxAttributesLabelMapFilter_hxx
+#define otbMinMaxAttributesLabelMapFilter_hxx
 
 #include "otbMinMaxAttributesLabelMapFilter.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
index d255c9c26008bf360acb5b84ae0f35a35b4fc1a9..4ec17f3c7374253bb5c40105ff1020ec8820b0fd 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeAttributesLabelMapFilter.txx"
+#include "otbNormalizeAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
index 3577e34e65a7717da14dea5cfb71d2d49ae11659..2163240d346bb4e20c9884dcb1ab5405eb14431a 100644
--- a/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbNormalizeAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeAttributesLabelMapFilter_txx
-#define otbNormalizeAttributesLabelMapFilter_txx
+#ifndef otbNormalizeAttributesLabelMapFilter_hxx
+#define otbNormalizeAttributesLabelMapFilter_hxx
 
 #include "otbNormalizeAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
index f170e49e6945a2ff375c4576010c3a4795f02382..0986f45b0b5e56e0366550e2d4d2f0b8735ce01f 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.h
@@ -311,7 +311,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShapeAttributesLabelMapFilter.txx"
+#include "otbShapeAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
index 54b9349e2c568ab249326ac0799d9f96e14f07ca..ba322f8fdba8ea429248ba3c14687611e83a005d 100644
--- a/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbShapeAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShapeAttributesLabelMapFilter_txx
-#define otbShapeAttributesLabelMapFilter_txx
+#ifndef otbShapeAttributesLabelMapFilter_hxx
+#define otbShapeAttributesLabelMapFilter_hxx
 
 #include "otbShapeAttributesLabelMapFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
index 117e5e4382593a74d6d292be5c188c33f79b1627..af8eec1e03bd5406b7a5e235db5ff2cf8f735c06 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.h
@@ -211,7 +211,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsAttributesLabelMapFilter.txx"
+#include "otbStatisticsAttributesLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
index ff4007865cc78b1f5ffcf8c63ea46a4442ceb5cb..ab497246c877b4eaf7389f6f7af9c5016dcd6ece 100644
--- a/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
+++ b/Modules/Core/LabelMap/include/otbStatisticsAttributesLabelMapFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsAttributesLabelMapFilter_txx
-#define otbStatisticsAttributesLabelMapFilter_txx
+#ifndef otbStatisticsAttributesLabelMapFilter_hxx
+#define otbStatisticsAttributesLabelMapFilter_hxx
 
 #include "otbStatisticsAttributesLabelMapFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageList.h b/Modules/Core/ObjectList/include/otbImageList.h
index f57bd483600520c45690230929171508acf79b04..422e4642e6ee81beca55dcd66f8ab0c115a55bb0 100644
--- a/Modules/Core/ObjectList/include/otbImageList.h
+++ b/Modules/Core/ObjectList/include/otbImageList.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageList.txx"
+#include "otbImageList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageList.hxx b/Modules/Core/ObjectList/include/otbImageList.hxx
index dec0ab8b3e5ce3a834ee5a6dc9a247831d432f5b..c05983383e5c23f9c991800498a850d5c02d9638 100644
--- a/Modules/Core/ObjectList/include/otbImageList.hxx
+++ b/Modules/Core/ObjectList/include/otbImageList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageList_txx
-#define otbImageList_txx
+#ifndef otbImageList_hxx
+#define otbImageList_hxx
 
 #include "otbImageList.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.h b/Modules/Core/ObjectList/include/otbImageListSource.h
index 65012ab388b7dcab80ae4678abb6ccce7b4aeaf6..c0a84d4162e212c51000a97a0330e760020e0584 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.h
+++ b/Modules/Core/ObjectList/include/otbImageListSource.h
@@ -76,6 +76,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListSource.txx"
+#include "otbImageListSource.hxx"
 #endif
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListSource.hxx b/Modules/Core/ObjectList/include/otbImageListSource.hxx
index 74d1cb6d08ca4a39cffab75deff70fe958dee6ac..b20d54ebe6ab9b4d28aeff70332c33a972ab6f3d 100644
--- a/Modules/Core/ObjectList/include/otbImageListSource.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListSource_txx
-#define otbImageListSource_txx
+#ifndef otbImageListSource_hxx
+#define otbImageListSource_hxx
 
 #include "otbImageListSource.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
index 56c067b409f95b9129bf4d19f8f0b3acf8030c2a..35a1cf6824392370c22542bdd3c3af9277aab94c 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.h
@@ -85,7 +85,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageFilter.txx"
+#include "otbImageListToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
index dd941f3f202c0db2bb2fac7b02d9fb306ba5fc82..fef2c09e0ce5183deb3fdb5e257395d40dd2af4a 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageFilter_txx
-#define otbImageListToImageFilter_txx
+#ifndef otbImageListToImageFilter_hxx
+#define otbImageListToImageFilter_hxx
 
 #include "otbImageListToImageFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
index 814df0753f1085c89cc6b1df0f73fd120fe17083..89777a6f2e94725ea2bf0b9920dcdfed312d10c2 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.h
@@ -107,7 +107,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageListApplyFilter.txx"
+#include "otbImageListToImageListApplyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
index 5a876281fe2220eab895204cdbc5e3103901ff93..14bbfe5d906c92fdca1c421373d53776c5d87afc 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListApplyFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageListApplyFilter_txx
-#define otbImageListToImageListApplyFilter_txx
+#ifndef otbImageListToImageListApplyFilter_hxx
+#define otbImageListToImageListApplyFilter_hxx
 
 #include "otbImageListToImageListApplyFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
index 1fff1873d2c9a15e4350b77991a8893f22b64aa8..d216e47d958ab086ed263a31393550e7144c1102 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.h
@@ -83,7 +83,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToImageListFilter.txx"
+#include "otbImageListToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
index df0c723bc54f09f87b43dde120fa3a04516f2491..3f81b9f494bf7e3b25acac73dd9dad91763f6bf9 100644
--- a/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToImageListFilter_txx
-#define otbImageListToImageListFilter_txx
+#ifndef otbImageListToImageListFilter_hxx
+#define otbImageListToImageListFilter_hxx
 
 #include "otbImageListToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
index 53a504983665638e0cd2305cc76d0aa8fada2a57..793781c0adc1d52c3f09772b707bb75b3b19189a 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.h
@@ -93,7 +93,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToSingleImageFilter.txx"
+#include "otbImageListToSingleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
index 3ad9e1593c214bf08def9b525a94df78a251d236..e969b6f9a2f3120e4eb5a67e9aef0f460023a001 100644
--- a/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToSingleImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageListToSingleImageFilter_txx
-#define otbImageListToSingleImageFilter_txx
+#ifndef otbImageListToSingleImageFilter_hxx
+#define otbImageListToSingleImageFilter_hxx
 
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
index 3841c8b9f7c78103eef19029cc9e972eb7551363..3afd278bff12dafcd9558873d6b8d109b13c6a5f 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.h
@@ -94,7 +94,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToVectorImageFilter.txx"
+#include "otbImageListToVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
index d8eac8e27176541803acf773c43000d29ec13935..72b455b39aa3384ca3020ab42f092839a7008edd 100644
--- a/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageListToVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToVectorImageFilter_txx
-#define otbImageListToVectorImageFilter_txx
+#ifndef otbImageListToVectorImageFilter_hxx
+#define otbImageListToVectorImageFilter_hxx
 
 #include "otbImageListToVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
index 92370fa43d128d19f0bd098429a02bacfd920e6e..37e5da8f837fb01c2f08a4ec0eadcfc75484b8eb 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.h
@@ -81,7 +81,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToImageListFilter.txx"
+#include "otbImageToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
index 36432c7590e72f3bbec789c7e386d1a2f0d0147d..8abc067c2d425fa4144161221b2446f38ed470ac 100644
--- a/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbImageToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToImageListFilter_txx
-#define otbImageToImageListFilter_txx
+#ifndef otbImageToImageListFilter_hxx
+#define otbImageToImageListFilter_hxx
 
 #include "otbImageToImageListFilter.h"
 
diff --git a/Modules/Core/ObjectList/include/otbObjectList.h b/Modules/Core/ObjectList/include/otbObjectList.h
index de9814f9348c3ffe21284c8b240b2c721f1f804e..1da4fe163c27a443f80349aec2734a1f9d96164f 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.h
+++ b/Modules/Core/ObjectList/include/otbObjectList.h
@@ -619,7 +619,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectList.txx"
+#include "otbObjectList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectList.hxx b/Modules/Core/ObjectList/include/otbObjectList.hxx
index 84f600c6fd2480db7c8dfedca12e923fa602f7da..8eb5f5c82925b5d64dc834e6f7331ee830dee5b4 100644
--- a/Modules/Core/ObjectList/include/otbObjectList.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectList_txx
-#define otbObjectList_txx
+#ifndef otbObjectList_hxx
+#define otbObjectList_hxx
 
 #include "otbObjectList.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.h b/Modules/Core/ObjectList/include/otbObjectListSource.h
index 3dbefeecdf706408da387913cca057dc6659ae2c..1f8c365e56ddec04a421793a8b7514f5dc23b2fd 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.h
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.h
@@ -201,7 +201,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectListSource.txx"
+#include "otbObjectListSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectListSource.hxx b/Modules/Core/ObjectList/include/otbObjectListSource.hxx
index 1bfa2d3a822b071074150439bc66089620532185..1879b44dcc974a61de638dd7f74518de5a958ff8 100644
--- a/Modules/Core/ObjectList/include/otbObjectListSource.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectListSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectListSource_txx
-#define otbObjectListSource_txx
+#ifndef otbObjectListSource_hxx
+#define otbObjectListSource_hxx
 
 #include "otbObjectListSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
index b906edffbdeb62452cf4b278eb766fb331aff02d..e3e2e7ad1289a5d53d0bc2a3c65ebfb794168794 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.h
@@ -122,7 +122,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectListToObjectListFilter.txx"
+#include "otbObjectListToObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
index 0db61c009da5bc468004ed9f90c1067ece900e6e..1557397fd37a8c916d6031bcc1698a3162efe039 100644
--- a/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbObjectListToObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectListToObjectListFilter_txx
-#define otbObjectListToObjectListFilter_txx
+#ifndef otbObjectListToObjectListFilter_hxx
+#define otbObjectListToObjectListFilter_hxx
 
 #include "otbObjectListToObjectListFilter.h"
 #include "itkProgressReporter.h"
@@ -80,7 +80,7 @@ ObjectListToObjectListFilter<TInputList, TOutputList>
                                           ));
   if (stopIndex > requestedElements) stopIndex = requestedElements;
 
-  //Note: check the itkImageSource.txx for the compuration done there.
+  //Note: check the itkImageSource.hxx for the compuration done there.
   // for now, there is no requested region for ObjectListFilter, so we don't
   // compute anything here.
   return threadCount;
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
index ec873d99d6b899b3cbaaff61b15572476b029648..aeb140d2e63ea466730142f6aced5cd33a1d6f66 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorObjectListBooleanFilter.txx"
+#include "otbUnaryFunctorObjectListBooleanFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
index cfd006df74e3d1379b607b1d90d6b06e117ccc7b..3bcb19729089728b9f3bd4625f5959765ff62f1a 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListBooleanFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorObjectListBooleanFilter_txx
-#define otbUnaryFunctorObjectListBooleanFilter_txx
+#ifndef otbUnaryFunctorObjectListBooleanFilter_hxx
+#define otbUnaryFunctorObjectListBooleanFilter_hxx
 
 #include "otbUnaryFunctorObjectListBooleanFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
index 8d84273489122cb908b0f78e8f11b4b9b25ac2b0..a58050a77be2325ec64dc93a0c1108f0301128f2 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorObjectListFilter.txx"
+#include "otbUnaryFunctorObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
index 5c0585e10aee656859b82c1fdb0d64ece3c9c65e..f6691f4c77d60c3d9683822bfeacaa757cb39934 100644
--- a/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbUnaryFunctorObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorObjectListFilter_txx
-#define otbUnaryFunctorObjectListFilter_txx
+#ifndef otbUnaryFunctorObjectListFilter_hxx
+#define otbUnaryFunctorObjectListFilter_hxx
 
 #include "otbUnaryFunctorObjectListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
index 150b97af5528923df4fa823aa5e09fb54ca9135a..0d518f2d77d7f32d5bc9d74f389bc627a20112cb 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.h
@@ -90,7 +90,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToImageListFilter.txx"
+#include "otbVectorImageToImageListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
index b941f7b7b23fc3c2316ce8b6e1afdad1e5d878a2..1027b7b13a29bb80b16c3ae4137cde63db0efcaf 100644
--- a/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
+++ b/Modules/Core/ObjectList/include/otbVectorImageToImageListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToImageListFilter_txx
-#define otbVectorImageToImageListFilter_txx
+#ifndef otbVectorImageToImageListFilter_hxx
+#define otbVectorImageToImageListFilter_hxx
 
 #include "otbVectorImageToImageListFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
index 98b5fff5213362e7b63a2246f2abea873527b945..1f59931ab935186724a780c901d44a4aedcee8e1 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.h
@@ -132,7 +132,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPointSetFilter.txx"
+#include "otbImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
index 884113dbb657619d43a62c13374912903f5ae8d0..3c71a6fb40fcf854679cfa95ad6d346d07cc3e45 100644
--- a/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbImageToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPointSetFilter_txx
-#define otbImageToPointSetFilter_txx
+#ifndef otbImageToPointSetFilter_hxx
+#define otbImageToPointSetFilter_hxx
 
 #include "otbImageToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.h b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
index 4065ccae0d13fd7e682c04ab8185f40ff8ff7c7e..a41683e787e00190b98d9ef6b0741955e04e3b32 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.h
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetExtractROI.txx"
+#include "otbPointSetExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx b/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
index 4975f90b1527c4d082fffe4178bd76d893ea349b..13b79dde378289e099b4b74cc681754ebaee14b0 100644
--- a/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetExtractROI_txx
-#define otbPointSetExtractROI_txx
+#ifndef otbPointSetExtractROI_hxx
+#define otbPointSetExtractROI_hxx
 
 #include "otbPointSetExtractROI.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.h b/Modules/Core/PointSet/include/otbPointSetFunction.h
index 3e278108896d19c37ce17439e3ae77cc9321663f..5774fddba8762c09ec580f0f3c98b6b5511d0ac1 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.h
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetFunction.txx"
+#include "otbPointSetFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetFunction.hxx b/Modules/Core/PointSet/include/otbPointSetFunction.hxx
index bdb7079881bc491417d0bae3e9b430f0c6e6f641..7a0d43cd6a9ee544522fb489537454145b6fd0b5 100644
--- a/Modules/Core/PointSet/include/otbPointSetFunction.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetFunction_txx
-#define otbPointSetFunction_txx
+#ifndef otbPointSetFunction_hxx
+#define otbPointSetFunction_hxx
 
 #include "otbPointSetFunction.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.h b/Modules/Core/PointSet/include/otbPointSetSource.h
index cc74ddd871d04a0b1015d02acc2fba9076baecbe..8282633b14fca68e419004105faaff2e8cbe5208 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbPointSetSource.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetSource.txx"
+#include "otbPointSetSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetSource.hxx b/Modules/Core/PointSet/include/otbPointSetSource.hxx
index 2aad45741e4fcb61f3e10ac0797fcf4dc5fdc140..a9f14ba83d26c4a2e2394ff215f1cf7bedd75635 100644
--- a/Modules/Core/PointSet/include/otbPointSetSource.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetSource_txx
-#define otbPointSetSource_txx
+#ifndef otbPointSetSource_hxx
+#define otbPointSetSource_hxx
 
 #include "otbPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
index 52923cbd5ddb7b0ca16d09d057ccd12f70aa022e..90a1629f9a0a7aa0ee9858cfc5fa18245287b4f9 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.h
@@ -85,7 +85,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToPointSetFilter.txx"
+#include "otbPointSetToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
index 3a93d570f4211cc62310cef10d790cef5bd2bf89..4fc56588a80c41601f9a9721d9fa9aab8e62f751 100644
--- a/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbPointSetToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToPointSetFilter_txx
-#define otbPointSetToPointSetFilter_txx
+#ifndef otbPointSetToPointSetFilter_hxx
+#define otbPointSetToPointSetFilter_hxx
 
 #include "otbPointSetToPointSetFilter.h"
 
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.h b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
index cfc09283aeee57d41aaf7b026f4b31afe7ea3e1a..4659e73fadf8c2b3b2eb9c2c6f4f43cb7ef52123 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.h
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.h
@@ -107,7 +107,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomPointSetSource.txx"
+#include "otbRandomPointSetSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx b/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
index 2c942dd34833b827011f465f1e0a991ed5a21ef5..9e1d08d09a1abced8a71a52c1ca6b8653bc3a0c8 100644
--- a/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
+++ b/Modules/Core/PointSet/include/otbRandomPointSetSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRandomPointSetSource_txx
-#define otbRandomPointSetSource_txx
+#ifndef otbRandomPointSetSource_hxx
+#define otbRandomPointSetSource_hxx
 
 #include "otbRandomPointSetSource.h"
 
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
index 3f158f90f36f7632aa5acffd41728867dfb1a1cc..04198cf30713c5326172ddbbf368fcd25ddf569f 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.h
@@ -100,7 +100,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbThresholdImageToPointSetFilter.txx"
+#include "otbThresholdImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
index b5ac50e908221fa8a487643eb2bf0d18abd12c60..655fd6b562e74b7e3fc545568607b51eaf457371 100644
--- a/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbThresholdImageToPointSetFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbThresholdImageToPointSetFilter_txx
-#define otbThresholdImageToPointSetFilter_txx
+#ifndef otbThresholdImageToPointSetFilter_hxx
+#define otbThresholdImageToPointSetFilter_hxx
 
 #include "otbThresholdImageToPointSetFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
index 9b1dedfa6a6f6adde74ac64c2972f03f5705d997..d254bb531375cbcc09e273104049c8ce0d7da19e 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.h
@@ -93,7 +93,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTransformPointSetFilter.txx"
+#include "otbTransformPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx b/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
index ab2c61c6ea8743c77ff936b4a7ba117da0fd2c84..46952f8631d2032274d06c125d92937693de3642 100644
--- a/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
+++ b/Modules/Core/PointSet/include/otbTransformPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTransformPointSetFilter_txx
-#define otbTransformPointSetFilter_txx
+#ifndef otbTransformPointSetFilter_hxx
+#define otbTransformPointSetFilter_hxx
 
 #include "otbTransformPointSetFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
index b113b03677305792511accc99a67246b6476420d..6578ef3bd943e4b59de4f9f3e121cc3b826b6799 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawLineSpatialObjectFilter.txx"
+#include "otbDrawLineSpatialObjectFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
index a4e90d84209a1d989196986569b371db00b13c81..e1078094b5de6ca25561386ce7a552f788410179 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDrawLineSpatialObjectFilter_txx
-#define otbDrawLineSpatialObjectFilter_txx
+#ifndef otbDrawLineSpatialObjectFilter_hxx
+#define otbDrawLineSpatialObjectFilter_hxx
 
 #include "otbDrawLineSpatialObjectFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
index 9232ed96f68718fd69591bbdfefe9e1c46afe14b..35cf3faa1b94170133cc951cc36219adcda1a621 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.h
@@ -132,7 +132,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawLineSpatialObjectListFilter.txx"
+#include "otbDrawLineSpatialObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
index ca5762b2f462c5fd4ffc8ed6600e2ea1198309d0..f03179f78dd089dd677730ad301cf720ac656da6 100644
--- a/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbDrawLineSpatialObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDrawLineSpatialObjectListFilter_txx
-#define otbDrawLineSpatialObjectListFilter_txx
+#ifndef otbDrawLineSpatialObjectListFilter_hxx
+#define otbDrawLineSpatialObjectListFilter_hxx
 
 #include "otbDrawLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
index 728546e2fdb7163aa808ca72091b153028a807e0..ebb26fa737c5bc21036880ad496047173c48deef 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.h
@@ -97,7 +97,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToLineSpatialObjectListFilter.txx"
+#include "otbImageToLineSpatialObjectListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
index 9c6a0d9cd8d7c4a36a89fcce673f750f955d0277..dbd0b023b7ecd7b8ddf2b6b3c304e55cecf0d317 100644
--- a/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbImageToLineSpatialObjectListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToLineSpatialObjectListFilter_txx
-#define otbImageToLineSpatialObjectListFilter_txx
+#ifndef otbImageToLineSpatialObjectListFilter_hxx
+#define otbImageToLineSpatialObjectListFilter_hxx
 
 #include "otbImageToLineSpatialObjectListFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
index 091e37c0a4b5d1ef81a6662cddbacdfc4ce88b48..1bc33fcb4f237740fc0a44d7337d3b272da6ca09 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.h
@@ -132,7 +132,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObject.txx"
+#include "otbLineSpatialObject.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
index 5cd5e523379c3748f42b00ef6377afef89b96c67..3e5e99c95a14ec4f89864524547f16f2f9f6c204 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObject.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObject_txx
-#define otbLineSpatialObject_txx
+#ifndef otbLineSpatialObject_hxx
+#define otbLineSpatialObject_hxx
 
 
 #include "otbLineSpatialObject.h"
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
index d3174d7ed989c9d33aaf139c57bebc72f72789cc..52dc4682fb7fd8dbed65a8a1c0fdd694f9807d89 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObjectListToPointSetFilter.txx"
+#include "otbLineSpatialObjectListToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
index 878f13ca85c146e836dd0d4e92e0aa66beb783db..a07beaabe7cc17ee2960dfc5cf7e91e72b5fdaba 100644
--- a/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbLineSpatialObjectListToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObjectListToPointSetFilter_txx
-#define otbLineSpatialObjectListToPointSetFilter_txx
+#ifndef otbLineSpatialObjectListToPointSetFilter_hxx
+#define otbLineSpatialObjectListToPointSetFilter_hxx
 
 #include "otbLineSpatialObjectListToPointSetFilter.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
index 76e0d0592f11166076fccb3f72d6b7375d07acc4..4bd45e6e048900b6b8fbf9a2a2a8382c7e567cfe 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.h
@@ -79,7 +79,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialObjectSource.txx"
+#include "otbSpatialObjectSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
index 03443b15f58e7f73cec4904ad291e29702dfae81..52653276eb157a641d417d352274050f1228a95b 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialObjectSource_txx
-#define otbSpatialObjectSource_txx
+#ifndef otbSpatialObjectSource_hxx
+#define otbSpatialObjectSource_hxx
 
 #include "otbSpatialObjectSource.h"
 
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
index ba728d927f7df1be4f35cf818c15d8689b4a57a0..f530b3f4e8876dc6317a42c0d754d54cf90705f7 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.h
@@ -163,7 +163,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialObjectToImageDrawingFilter.txx"
+#include "otbSpatialObjectToImageDrawingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
index cd29810f738088649f4f38d10a499428fa01d232..77fccfe8f18749908267b5d3e1f72ca7aa63d312 100644
--- a/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
+++ b/Modules/Core/SpatialObjects/include/otbSpatialObjectToImageDrawingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialObjectToImageDrawingFilter_txx
-#define otbSpatialObjectToImageDrawingFilter_txx
+#ifndef otbSpatialObjectToImageDrawingFilter_hxx
+#define otbSpatialObjectToImageDrawingFilter_hxx
 
 #include "otbSpatialObjectToImageDrawingFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
index 10283c7db89a51f110380291b965771e437b5eb8..a63e5c7c7cc1004103179023a6a3b3b94b6ab1e6 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfDivisionsStrippedStreamingManager.txx"
+#include "otbNumberOfDivisionsStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
index 437ac714663cbced6a0f1388d8981e8e8f3bc0f7..ce248caaff2c93821bf6b5fe5bfce0c8d266ad84 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfDivisionsStrippedStreamingManager_txx
-#define otbNumberOfDivisionsStrippedStreamingManager_txx
+#ifndef otbNumberOfDivisionsStrippedStreamingManager_hxx
+#define otbNumberOfDivisionsStrippedStreamingManager_hxx
 
 #include "otbNumberOfDivisionsStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
index 270dc471e7017e756068eecffaaa784f8f1d50d1..a0572cbe03e56f1d45a7c57b4b7eefae306c5acf 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.h
@@ -84,7 +84,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfDivisionsTiledStreamingManager.txx"
+#include "otbNumberOfDivisionsTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
index 16212ca3654c18a7010e9bce487dfd8df0465155..ae2f3a31bc5370c90f0cb3103bdf175aab75ce4a 100644
--- a/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfDivisionsTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfDivisionsTiledStreamingManager_txx
-#define otbNumberOfDivisionsTiledStreamingManager_txx
+#ifndef otbNumberOfDivisionsTiledStreamingManager_hxx
+#define otbNumberOfDivisionsTiledStreamingManager_hxx
 
 #include "otbNumberOfDivisionsTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
index 6426c858b62e6de2aa328a051d11adb2b91a3cd3..6bd16c833a60c8022d5180573e43738c2566401b 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.h
@@ -89,7 +89,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNumberOfLinesStrippedStreamingManager.txx"
+#include "otbNumberOfLinesStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
index 64f12ae90a792060f40ecc2e7c4e70ae58dd1a18..c7a78ed14dbc323a7bf2c9f355b4998b2eb6904b 100644
--- a/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbNumberOfLinesStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNumberOfLinesStrippedStreamingManager_txx
-#define otbNumberOfLinesStrippedStreamingManager_txx
+#ifndef otbNumberOfLinesStrippedStreamingManager_hxx
+#define otbNumberOfLinesStrippedStreamingManager_hxx
 
 #include "otbNumberOfLinesStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
index f319c00c46c63034eb5d973f1d22af0c465473c0..8a98ff6bd3f84b366f4b796bfb6427457e87667e 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.h
@@ -98,7 +98,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentFilterStreamingDecorator.txx"
+#include "otbPersistentFilterStreamingDecorator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
index 1d1596c794147399858f3b5686292fb8f28e04db..c86b6feaa9fa2820daba155b5f2cbd7caeefb4a8 100644
--- a/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
+++ b/Modules/Core/Streaming/include/otbPersistentFilterStreamingDecorator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentFilterStreamingDecorator_txx
-#define otbPersistentFilterStreamingDecorator_txx
+#ifndef otbPersistentFilterStreamingDecorator_hxx
+#define otbPersistentFilterStreamingDecorator_hxx
 
 #include "otbPersistentFilterStreamingDecorator.h"
 
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
index 2ddeccf21547d0f37b79972354a7f5a078406892..f4533fa6dbe2df9c08556767d9ddcb29a051a1a0 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.h
@@ -103,7 +103,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenAdaptativeStreamingManager.txx"
+#include "otbRAMDrivenAdaptativeStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
index 743d5de28151ab5a78646e113ff5217b7b1296b1..03b3b3a0c589486981b3c3256e7349779d8d322d 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenAdaptativeStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenAdaptativeStreamingManager_txx
-#define otbRAMDrivenAdaptativeStreamingManager_txx
+#ifndef otbRAMDrivenAdaptativeStreamingManager_hxx
+#define otbRAMDrivenAdaptativeStreamingManager_hxx
 
 #include "otbRAMDrivenAdaptativeStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
index 332c2610d29417bbc27bd05df00831d4f8f03762..d4dc1a8b8a0f6abd44d56a08ef724b7fad335e31 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.h
@@ -101,7 +101,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenStrippedStreamingManager.txx"
+#include "otbRAMDrivenStrippedStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
index 1eb39cbc5a49afd89918304806ac0cdc4f8bc5e2..3bb770ad7f35ccdf252bd67f70decc7cb496e185 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenStrippedStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenStrippedStreamingManager_txx
-#define otbRAMDrivenStrippedStreamingManager_txx
+#ifndef otbRAMDrivenStrippedStreamingManager_hxx
+#define otbRAMDrivenStrippedStreamingManager_hxx
 
 #include "otbRAMDrivenStrippedStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
index d5b40a858c5790102815ad80135984cdc79ddb02..19883b4577d30b93f4638749b8fbdf923ff51215 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.h
@@ -97,7 +97,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAMDrivenTiledStreamingManager.txx"
+#include "otbRAMDrivenTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
index c094cc90a0f7534adfc8f5d492e79f54400a6fff..e9034910dc5161eab1a77f65759b7bb3795e782c 100644
--- a/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbRAMDrivenTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAMDrivenTiledStreamingManager_txx
-#define otbRAMDrivenTiledStreamingManager_txx
+#ifndef otbRAMDrivenTiledStreamingManager_hxx
+#define otbRAMDrivenTiledStreamingManager_hxx
 
 #include "otbRAMDrivenTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
index d01a475cf1822aa92958c98fcfd403e8f84f9c93..562ee55994b2822ca246f98394437ba55ffd6716 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.h
@@ -200,7 +200,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingImageVirtualWriter.txx"
+#include "otbStreamingImageVirtualWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
index 7336993ed392de64e980c05a7178fdc4cbe66ca7..25994d53f6f9c57c513637372ca444811f9c6249 100644
--- a/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
+++ b/Modules/Core/Streaming/include/otbStreamingImageVirtualWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingImageVirtualWriter_txx
-#define otbStreamingImageVirtualWriter_txx
+#ifndef otbStreamingImageVirtualWriter_hxx
+#define otbStreamingImageVirtualWriter_hxx
 #include "otbStreamingImageVirtualWriter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.h b/Modules/Core/Streaming/include/otbStreamingManager.h
index 860fa455ec9975ab02afab4d673a610fd6ccdb15..a73908415ffe404e15f97e0fa8c4c0a1fd1bbb60 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbStreamingManager.h
@@ -128,7 +128,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingManager.txx"
+#include "otbStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbStreamingManager.hxx b/Modules/Core/Streaming/include/otbStreamingManager.hxx
index 9d2f3ddbd8243ed40946058cafe96d6060d2926d..7d7cfb7e3eaea6d6694efd4dccbb69bcdf71f83a 100644
--- a/Modules/Core/Streaming/include/otbStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingManager_txx
-#define otbStreamingManager_txx
+#ifndef otbStreamingManager_hxx
+#define otbStreamingManager_hxx
 
 #include "otbStreamingManager.h"
 #include "otbConfigurationManager.h"
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
index a4286febb0361ccb687d85cdf4d81cd665d61656..f9b84aa2a89043c8ef06551d981a2dd7caa922a3 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.h
@@ -90,7 +90,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileDimensionTiledStreamingManager.txx"
+#include "otbTileDimensionTiledStreamingManager.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
index e89e3986cb6c44d1295eaf96a8252670ca959db1..d3d9184c65fa9b03063b7eb25170dcdf5051faaf 100644
--- a/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
+++ b/Modules/Core/Streaming/include/otbTileDimensionTiledStreamingManager.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileDimensionTiledStreamingManager_txx
-#define otbTileDimensionTiledStreamingManager_txx
+#ifndef otbTileDimensionTiledStreamingManager_hxx
+#define otbTileDimensionTiledStreamingManager_hxx
 
 #include "otbTileDimensionTiledStreamingManager.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.h b/Modules/Core/Transform/include/otbCompositeTransform.h
index a152662542dd312d8955814ea3e71463dc8843a5..de5274c63bf9dbe7b9fbfdf704384134296c6c45 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.h
+++ b/Modules/Core/Transform/include/otbCompositeTransform.h
@@ -145,7 +145,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCompositeTransform.txx"
+#include "otbCompositeTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbCompositeTransform.hxx b/Modules/Core/Transform/include/otbCompositeTransform.hxx
index 76ff270d4517bbcd4e6aa27ce80a2fc2721c72dd..e95cf9abbe6ad130137aca8f3fabe3ecbf76497c 100644
--- a/Modules/Core/Transform/include/otbCompositeTransform.hxx
+++ b/Modules/Core/Transform/include/otbCompositeTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCompositeTransform_txx
-#define otbCompositeTransform_txx
+#ifndef otbCompositeTransform_hxx
+#define otbCompositeTransform_hxx
 
 #include "otbCompositeTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.h b/Modules/Core/Transform/include/otbForwardSensorModel.h
index 29d22c055182c389dcb964ebcc007f80f76bda7a..f58e9cc2e06909cc9672739ecebf94581b5f0630 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.h
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.h
@@ -93,7 +93,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbForwardSensorModel.txx"
+#include "otbForwardSensorModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbForwardSensorModel.hxx b/Modules/Core/Transform/include/otbForwardSensorModel.hxx
index e7f11bd3923e002e04236f88f72d00adba3356dc..710b8522baf3579aaa1dbb9a8e7e5d137d525e0a 100644
--- a/Modules/Core/Transform/include/otbForwardSensorModel.hxx
+++ b/Modules/Core/Transform/include/otbForwardSensorModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbForwardSensorModel_txx
-#define otbForwardSensorModel_txx
+#ifndef otbForwardSensorModel_hxx
+#define otbForwardSensorModel_hxx
 
 #include "otbForwardSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.h b/Modules/Core/Transform/include/otbGenericMapProjection.h
index a41106563ac19a2fa8bd6148903ab846c40495f8..01a1fda7e67fdadb7c9c8711b2a6e3e68447f03d 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.h
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.h
@@ -126,7 +126,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericMapProjection.txx"
+#include "otbGenericMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGenericMapProjection.hxx b/Modules/Core/Transform/include/otbGenericMapProjection.hxx
index 9d25594acd0e606441bb343cee90c85ee16e630a..9538333e358b4697bc439e7c8d60c8c8043709ed 100644
--- a/Modules/Core/Transform/include/otbGenericMapProjection.hxx
+++ b/Modules/Core/Transform/include/otbGenericMapProjection.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericMapProjection_txx
-#define otbGenericMapProjection_txx
+#ifndef otbGenericMapProjection_hxx
+#define otbGenericMapProjection_hxx
 
 #include "otbGenericMapProjection.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.h b/Modules/Core/Transform/include/otbGenericRSTransform.h
index 433d99955ddddc888af26f7d5dd1cc1b36249a47..e18309fac3e243046fbf154c307a04f339325bbb 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.h
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.h
@@ -223,7 +223,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRSTransform.txx"
+#include "otbGenericRSTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGenericRSTransform.hxx b/Modules/Core/Transform/include/otbGenericRSTransform.hxx
index 879cba0d6db7f8a277819b9db2ce020387a96cd3..85027522d3ac2811da9b4dcb8ae64307a9147f8a 100644
--- a/Modules/Core/Transform/include/otbGenericRSTransform.hxx
+++ b/Modules/Core/Transform/include/otbGenericRSTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRSTransform_txx
-#define otbGenericRSTransform_txx
+#ifndef otbGenericRSTransform_hxx
+#define otbGenericRSTransform_hxx
 
 #include "otbGenericRSTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.h b/Modules/Core/Transform/include/otbGeocentricTransform.h
index fd9ed8975e165c395b751e7d571abc1ebf7f5d45..3993231905b02e9df77237ccd4104eee737299f5 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.h
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.h
@@ -82,7 +82,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeocentricTransform.txx"
+#include "otbGeocentricTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbGeocentricTransform.hxx b/Modules/Core/Transform/include/otbGeocentricTransform.hxx
index 6e55426b5f7e09a8155e4a98789e712cb4d5733b..de3732df65ba86789b74e421c76ce91c8bcbd4f9 100644
--- a/Modules/Core/Transform/include/otbGeocentricTransform.hxx
+++ b/Modules/Core/Transform/include/otbGeocentricTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeocentricTransform_txx
-#define otbGeocentricTransform_txx
+#ifndef otbGeocentricTransform_hxx
+#define otbGeocentricTransform_hxx
 
 #include "otbGeocentricTransform.h"
 
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
index 6a36ced78bad1627febc1a991b37b7b0fc9444da..b8e1b0f536d8aa473bcbca565c1214b8b61b1b97 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.h
@@ -192,7 +192,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToGenericRSOutputParameters.txx"
+#include "otbImageToGenericRSOutputParameters.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
index ece487e037a2e91c598a0cb27b59786112b67402..3a5293cb2d0faf6baa3cb1c6c6f6a69c494a57ad 100644
--- a/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
+++ b/Modules/Core/Transform/include/otbImageToGenericRSOutputParameters.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToGenericRSOutputParameters_txx
-#define otbImageToGenericRSOutputParameters_txx
+#ifndef otbImageToGenericRSOutputParameters_hxx
+#define otbImageToGenericRSOutputParameters_hxx
 
 
 #include "otbImageToGenericRSOutputParameters.h"
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
index 01ab403dc3e38a976b49290f326bf9985dbca87f..b9931b46a08097ee12a98113e3c5f0b90c5ab3ee 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.h
@@ -137,7 +137,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInverseLogPolarTransform.txx"
+#include "otbInverseLogPolarTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx b/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
index 086965210f7cef0b012068a53cc1f99f4b6b8a7f..4859dc052642160b7d4add53f7bfb0910fe964e7 100644
--- a/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
+++ b/Modules/Core/Transform/include/otbInverseLogPolarTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInverseLogPolarTransform_txx
-#define otbInverseLogPolarTransform_txx
+#ifndef otbInverseLogPolarTransform_hxx
+#define otbInverseLogPolarTransform_hxx
 
 #include "otbInverseLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.h b/Modules/Core/Transform/include/otbInverseSensorModel.h
index c76405f7eb4ee96b64e7c71e27c7b605e7eae88d..75fbde40f382f91c0d1c0e0412a4675845e6209a 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.h
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.h
@@ -95,7 +95,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInverseSensorModel.txx"
+#include "otbInverseSensorModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbInverseSensorModel.hxx b/Modules/Core/Transform/include/otbInverseSensorModel.hxx
index 9c967e7cc2d30b73635a049b2574c896f1e87a9f..5679ae7debf56dcabd7b005214478d46d5e482b9 100644
--- a/Modules/Core/Transform/include/otbInverseSensorModel.hxx
+++ b/Modules/Core/Transform/include/otbInverseSensorModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInverseSensorModel_txx
-#define otbInverseSensorModel_txx
+#ifndef otbInverseSensorModel_hxx
+#define otbInverseSensorModel_hxx
 
 #include "otbInverseSensorModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.h b/Modules/Core/Transform/include/otbLogPolarTransform.h
index c9894eafa51f328fe89e04a3177b4ef4a4dc7805..0bd4c6d528e2c66ce1486d8e58075c88b5fb22c6 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.h
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.h
@@ -141,7 +141,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLogPolarTransform.txx"
+#include "otbLogPolarTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbLogPolarTransform.hxx b/Modules/Core/Transform/include/otbLogPolarTransform.hxx
index 9b1d54915d1148f6f5f57c5cdd15550a15e9064e..f49f3f13d8c74310c9725a717fda11687ca07a9b 100644
--- a/Modules/Core/Transform/include/otbLogPolarTransform.hxx
+++ b/Modules/Core/Transform/include/otbLogPolarTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLogPolarTransform_txx
-#define otbLogPolarTransform_txx
+#ifndef otbLogPolarTransform_hxx
+#define otbLogPolarTransform_hxx
 
 #include "otbLogPolarTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.h b/Modules/Core/Transform/include/otbSensorModelBase.h
index e3c4f313a54f9c2986a6b7c5c4d69b2560d3a625..ddab6a0bbffa139562ee0afb6d70b32418dc944b 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.h
+++ b/Modules/Core/Transform/include/otbSensorModelBase.h
@@ -111,7 +111,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSensorModelBase.txx"
+#include "otbSensorModelBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbSensorModelBase.hxx b/Modules/Core/Transform/include/otbSensorModelBase.hxx
index e324e86a4811fd221971a39f412c456f4ebb40aa..541c74949e0509ee8d818ce35abf967856a673a0 100644
--- a/Modules/Core/Transform/include/otbSensorModelBase.hxx
+++ b/Modules/Core/Transform/include/otbSensorModelBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSensorModelBase_txx
-#define otbSensorModelBase_txx
+#ifndef otbSensorModelBase_hxx
+#define otbSensorModelBase_hxx
 
 #include "otbSensorModelBase.h"
 
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
index dea4315b01a0351699ec3e5d2b8b612e79f1d9db..ce77efe8ac79ee75ded984babf2286f4c025d724 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingWarpImageFilter.txx"
+#include "otbStreamingWarpImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
index 211bf8f3a3fead4df4cf1eaa6683d6af6a68866b..c6146d9552b7eb84222b8867fef0b46bd8f7ecc6 100644
--- a/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
+++ b/Modules/Core/Transform/include/otbStreamingWarpImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingWarpImageFilter_txx
-#define otbStreamingWarpImageFilter_txx
+#ifndef otbStreamingWarpImageFilter_hxx
+#define otbStreamingWarpImageFilter_hxx
 
 #include "otbStreamingWarpImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.h b/Modules/Core/VectorDataBase/include/otbDataNode.h
index 2ee30191beb504e069725d79ace1c048735b0500..660827d5ad1d0021654de63faa12b4218181f778 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.h
@@ -325,7 +325,7 @@ private:
 } // end namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNode.txx"
+#include "otbDataNode.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNode.hxx b/Modules/Core/VectorDataBase/include/otbDataNode.hxx
index a31ddfbc5b8b72af56ed379aecc2bb45293cc648..f5473f24722efbe8b5d1085303d99e53fac1cbb1 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNode.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNode.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNode_txx
-#define otbDataNode_txx
+#ifndef otbDataNode_hxx
+#define otbDataNode_hxx
 
 #include "otbDataNode.h"
 #include "otbMetaDataKey.h"
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
index 0dcf7dff7a88694ad40c0ad7c3ff95ed09922bc1..544465953852c3db27ede7fab4f83be9d680409b 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.h
@@ -206,7 +206,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNodeImageFunction.txx"
+#include "otbDataNodeImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
index 681c4ccf21c590a3c2158bc9fa073289a19224dc..419e3c8df1fdde08e969156887aac8775799bad5 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNodeImageFunction_txx
-#define otbDataNodeImageFunction_txx
+#ifndef otbDataNodeImageFunction_hxx
+#define otbDataNodeImageFunction_hxx
 
 #include "otbDataNodeImageFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
index 0be2c90bcdc3419c018c55153c090784fa2d5577..182898a8777c71977e4c590c14093cf85e66ef00 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.h
@@ -106,7 +106,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDataNodeVectorDataFunction.txx"
+#include "otbDataNodeVectorDataFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
index fc09a14f7a2c7c3790817c8cc08613bfe6e91f43..037c2784fd0b79cf816a271c4b7993972dd0b0e3 100644
--- a/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
+++ b/Modules/Core/VectorDataBase/include/otbDataNodeVectorDataFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDataNodeVectorDataFunction_txx
-#define otbDataNodeVectorDataFunction_txx
+#ifndef otbDataNodeVectorDataFunction_hxx
+#define otbDataNodeVectorDataFunction_hxx
 
 #include "otbDataNodeVectorDataFunction.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
index c7839f8b6d9c2700df94060a0ea13cfda4772c0c..330335a6fc363e6f761277809aaa7f1b315a69ca 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.h
@@ -138,7 +138,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolyLineParametricPathWithValue.txx"
+#include "otbPolyLineParametricPathWithValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
index 48df17969f0cb1f7bcd6ca8e2592d0d7b152048f..d56e726d558eff28993d8a4ad75a85e6194a79e2 100644
--- a/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
+++ b/Modules/Core/VectorDataBase/include/otbPolyLineParametricPathWithValue.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolyLineParametricPathWithValue_txx
-#define otbPolyLineParametricPathWithValue_txx
+#ifndef otbPolyLineParametricPathWithValue_hxx
+#define otbPolyLineParametricPathWithValue_hxx
 
 #include "otbPolyLineParametricPathWithValue.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.h b/Modules/Core/VectorDataBase/include/otbPolygon.h
index f6db4f70f9309ef3d5688eb231a0eb10052f8109..abc4ad7ac0bef9367bd10024048039aa8e4734b6 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.h
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.h
@@ -160,6 +160,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygon.txx"
+#include "otbPolygon.hxx"
 #endif
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbPolygon.hxx b/Modules/Core/VectorDataBase/include/otbPolygon.hxx
index 3eb5d8c3930308128a236dbc1f35c03119556f82..ce58be44fde10cf8bb65d930969b68c73c0e15db 100644
--- a/Modules/Core/VectorDataBase/include/otbPolygon.hxx
+++ b/Modules/Core/VectorDataBase/include/otbPolygon.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygon_txx
-#define otbPolygon_txx
+#ifndef otbPolygon_hxx
+#define otbPolygon_hxx
 
 #include "otbPolygon.h"
 
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.h b/Modules/Core/VectorDataBase/include/otbVectorData.h
index b4a1757c00c106c787713dcf6e4dfaf2ee414bbf..77a1c19c312908353312021ec70e33feeb82a0e3 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorData.txx"
+#include "otbVectorData.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbVectorData.hxx b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
index 9e84ca091241724ff3132f7199d7541e990d6f34..bbb2df515e96c1aa2b4ef2133219d3717788f414 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorData.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorData.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorData_txx
-#define otbVectorData_txx
+#ifndef otbVectorData_hxx
+#define otbVectorData_hxx
 
 #include "otbVectorData.h"
 #include "itkPreOrderTreeIterator.h"
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
index a89fa4665b06f0bfe7484ecaf05fcb6159654452..fee18b413d0b65d7981db5109cf580c2b6878672 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.h
@@ -104,7 +104,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataProperties.txx"
+#include "otbVectorDataProperties.hxx"
 #endif
 
 #endif
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
index dfbc33ebd6d3e52bc32c66b359009feac1e2e54f..27f849899fefcc0bab4b915f94d615c9c0215b91 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataProperties.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataProperties_txx
-#define otbVectorDataProperties_txx
+#ifndef otbVectorDataProperties_hxx
+#define otbVectorDataProperties_hxx
 
 #include "otbVectorDataProperties.h"
 #include <algorithm>
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
index 7572c713c1994ba230b2c8b4a2967ba2e0b23c7b..528d8ed4b40e83cdf44f6a55f247d1921b4f507a 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataSource.txx"
+#include "otbVectorDataSource.hxx"
 #endif
 
 #endif // otbVectorDataSource_h
diff --git a/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx b/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
index 2a8f3d40e68a8c4f6c28b1b7410af611f59de55b..b602ea48fade6ecf5d03d9f9162d88c0dc40d06d 100644
--- a/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
+++ b/Modules/Core/VectorDataBase/include/otbVectorDataSource.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataSource_txx
-#define otbVectorDataSource_txx
+#ifndef otbVectorDataSource_hxx
+#define otbVectorDataSource_hxx
 
 #include "otbVectorDataSource.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
index f49a55fb553f6f2182bf4a6700b7e0094daf9b1d..f6b5ecfa62bb1c66fe4b52d30c06e435279dce63 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.h
@@ -86,7 +86,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCloudDetectionFilter.txx"
+#include "otbCloudDetectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
index d24eb24d62593daa26670cbb56c269544c88b320..c66f84924ebec475cd1574b0147fca7df83f5c6c 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
+++ b/Modules/Detection/CloudDetection/include/otbCloudDetectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCloudDetectionFilter_txx
-#define otbCloudDetectionFilter_txx
+#ifndef otbCloudDetectionFilter_hxx
+#define otbCloudDetectionFilter_hxx
 
 #include "otbCloudDetectionFilter.h"
 
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
index 914137fd85e44814aa82030d7d91ce6d71e5812a..066d2dd47e45978a66d579ebc230fe6b01d469a2 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCloudEstimatorFilter.txx"
+#include "otbCloudEstimatorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
index 1b17acfa3dbce07d745115eabc985620f5d41cca..71fe001707accab73c03de5b3132dd89ddc2b145 100644
--- a/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
+++ b/Modules/Detection/CloudDetection/include/otbCloudEstimatorFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCloudEstimatorFilter_txx
-#define otbCloudEstimatorFilter_txx
+#ifndef otbCloudEstimatorFilter_hxx
+#define otbCloudEstimatorFilter_hxx
 
 #include "otbCloudEstimatorFilter.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
index 274e4f76d1cac822048709abd203bf775a4c0600..1afc7a66692aab25bc8fddc90e0ad98edafce340 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.h
@@ -373,7 +373,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDescriptorsListSampleGenerator.txx"
+#include "otbDescriptorsListSampleGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
index a6390c070f21ef99fe744067f6e265d0c3e0fc9b..47c11bb229db801e0014f288017415f842b6c3a3 100644
--- a/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbDescriptorsListSampleGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDescriptorsListSampleGenerator_txx
-#define otbDescriptorsListSampleGenerator_txx
+#ifndef otbDescriptorsListSampleGenerator_hxx
+#define otbDescriptorsListSampleGenerator_hxx
 
 #include "otbDescriptorsListSampleGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
index 95653d542573d8997ac6421678ea6381e9fdb09d..ef9faf92de8790edb296f65fd6f16f9e0a879014 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserMomentsIFFactory.txx"
+#include "otbFlusserMomentsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
index ae50adff9a330d23ce349fdd5ecac063e0afdc15..337fef095c7eac0dcf955cc7dbf506cffca8ddf9 100644
--- a/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbFlusserMomentsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserMomentsIFFactory_txx
-#define otbFlusserMomentsIFFactory_txx
+#ifndef otbFlusserMomentsIFFactory_hxx
+#define otbFlusserMomentsIFFactory_hxx
 
 #include "otbFlusserMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
index 1c5291859ba13c52afaf3dc7ed80fca71a47bfb6..cca84eb5c7839809ec6a344947fd63134977cd9f 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.h
@@ -92,7 +92,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFourierMellinDescriptorsIFFactory.txx"
+#include "otbFourierMellinDescriptorsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
index 0de242a51a8d2264d75dd2e9ea93ae3265b6860b..4ed3cccd7dfd8bad176fadb043614bc4a8b42882 100644
--- a/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbFourierMellinDescriptorsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFourierMellinDescriptorsIFFactory_txx
-#define otbFourierMellinDescriptorsIFFactory_txx
+#ifndef otbFourierMellinDescriptorsIFFactory_hxx
+#define otbFourierMellinDescriptorsIFFactory_hxx
 
 #include "otbFourierMellinDescriptorsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
index 827425433334a751641353117725beea6ccd7bf4..8826d9d11fba1d4c347d9ac7967842812abf5f26 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.h
@@ -94,7 +94,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHaralickTexturesIFFactory.txx"
+#include "otbHaralickTexturesIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
index de2d4929f1fb5525770196eac3f26e97e32dea7c..bb24f8146059ab9fb5a01568f2f24b2f76ef6294 100644
--- a/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbHaralickTexturesIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHaralickTexturesIFFactory_txx
-#define otbHaralickTexturesIFFactory_txx
+#ifndef otbHaralickTexturesIFFactory_hxx
+#define otbHaralickTexturesIFFactory_hxx
 
 #include "otbHaralickTexturesIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
index ebe68953a0d33bd8ccdac61af5c7f9fa46f350ef..ea8045afcf42038178fcb3cd0d21153a56f25495 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabeledSampleLocalizationGenerator.txx"
+#include "otbLabeledSampleLocalizationGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
index 0045af00e45b7cf5f68c0ee0774acbc66767f7e6..6de63961c112d0836c10997fb39c0069bdd7c254 100644
--- a/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbLabeledSampleLocalizationGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabeledSampleLocalizationGenerator_txx
-#define otbLabeledSampleLocalizationGenerator_txx
+#ifndef otbLabeledSampleLocalizationGenerator_hxx
+#define otbLabeledSampleLocalizationGenerator_hxx
 
 #include "otbLabeledSampleLocalizationGenerator.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
index cbbf8d133e3c40c7a71f33986204fddc98e9451a..4bc4fd7b2eeadd5295ff3b8b14f5d57296ffbe97 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHistogramIFFactory.txx"
+#include "otbLocalHistogramIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
index a251d3c0308e2779c71bbe173763002958bf5e25..f00052d61a8c0d21b7f467bdaecf172623de0b2d 100644
--- a/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbLocalHistogramIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHistogramIFFactory_txx
-#define otbLocalHistogramIFFactory_txx
+#ifndef otbLocalHistogramIFFactory_hxx
+#define otbLocalHistogramIFFactory_hxx
 
 #include "otbLocalHistogramIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
index 52dbaa8b6c498bf6d90c6bba80983c37c29a319d..e9038a93f489d1164bb1f8aac01b66c37c288504 100644
--- a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
+++ b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.h
@@ -387,7 +387,7 @@ public:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbObjectDetectionClassifier.txx"
+#include "otbObjectDetectionClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
index 884cf3f07645b43b1dd0b6f93ce1c9a92ff4b9a6..27f12b54d4360368e0330e58d721b2fb0523d25a 100644
--- a/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbObjectDetectionClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbObjectDetectionClassifier_txx
-#define otbObjectDetectionClassifier_txx
+#ifndef otbObjectDetectionClassifier_hxx
+#define otbObjectDetectionClassifier_hxx
 
 #include "otbObjectDetectionClassifier.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
index 945fc56218c7ad0a3fbece4d9df33e6fe12054e3..d05ee02301406e93e13be20b3f2760ea1422167e 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.h
@@ -93,7 +93,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsIFFactory.txx"
+#include "otbRadiometricMomentsIFFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
index 39ca90d588e8e7c76e53417cbebc5d02954bb423..77108870f813c86fa8f15aea37377a605a35aacf 100644
--- a/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbRadiometricMomentsIFFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsIFFactory_txx
-#define otbRadiometricMomentsIFFactory_txx
+#ifndef otbRadiometricMomentsIFFactory_hxx
+#define otbRadiometricMomentsIFFactory_hxx
 
 #include "otbRadiometricMomentsIFFactory.h"
 
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
index 02af7640de8c2e0034d29d734c909cf35f39e114..8dc32a8e9571fc4f5620295f42c7eed7fc7c4d28 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.h
@@ -190,7 +190,7 @@ private:
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStandardMetaImageFunctionBuilder.txx"
+#include "otbStandardMetaImageFunctionBuilder.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
index e54db83fed0a79eb2949ab0a101e82e95dc59615..1307e3bf9ee52ffcbdd0e28a439e7c193a128694 100644
--- a/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
+++ b/Modules/Detection/ObjectDetection/include/otbStandardMetaImageFunctionBuilder.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStandardMetaImageFunctionBuilder_txx
-#define otbStandardMetaImageFunctionBuilder_txx
+#ifndef otbStandardMetaImageFunctionBuilder_hxx
+#define otbStandardMetaImageFunctionBuilder_hxx
 
 #include "otbStandardMetaImageFunctionBuilder.h"
 
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
index d39a63c75004c1511fadea59ec84a8d39a92317d..7dfe47acd944838879147c08c5e2b4d1516df7f0 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.h
@@ -88,7 +88,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBreakAngularPathListFilter.txx"
+#include "otbBreakAngularPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
index d7a72743e8d1eb53933b62ffb3e39590944a4fbc..902592407e9987d7d476c8cc7c4344e3b34527a0 100644
--- a/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbBreakAngularPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBreakAngularPathListFilter_txx
-#define otbBreakAngularPathListFilter_txx
+#ifndef otbBreakAngularPathListFilter_hxx
+#define otbBreakAngularPathListFilter_hxx
 
 #include "otbBreakAngularPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
index 0ef02b0c814729f3c09ed40e59efcea2ca1dd648..d0847581f6b13f3582664c700b2c7ce8bd6427d0 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.h
@@ -249,7 +249,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRoadExtractionFilter.txx"
+#include "otbGenericRoadExtractionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
index 32d2638ea98e9874e1f29761f3cf685922ed4c68..4623513a206bc3ed24cf844f4b41cdb9929186da 100644
--- a/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbGenericRoadExtractionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRoadExtractionFilter_txx
-#define otbGenericRoadExtractionFilter_txx
+#ifndef otbGenericRoadExtractionFilter_hxx
+#define otbGenericRoadExtractionFilter_hxx
 
 #include "otbGenericRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
index 7b1d94539aabe025ff5ccc0fe142c509357fa0d0..983052715c95d8fa1da68281133ebbe4a0bd37f9 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathListAlignFilter.txx"
+#include "otbImageToPathListAlignFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
index 459b09310f7322a71d252756955835d74f7daaf8..632bba0fe8f6f2ba29d7294ae2fd48bd92941e3b 100644
--- a/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbImageToPathListAlignFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPathListAlignFilter_txx
-#define otbImageToPathListAlignFilter_txx
+#ifndef otbImageToPathListAlignFilter_hxx
+#define otbImageToPathListAlignFilter_hxx
 
 #include "otbImageToPathListAlignFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
index 5930c35d5aae1efa384aba64b8c7f2553e6b531d..771313b24d80c29019c3d4e87b97e951b0206e73 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.h
@@ -99,7 +99,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLikelihoodPathListFilter.txx"
+#include "otbLikelihoodPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
index 99e40bc8f3674161a56488ed136c6ec3c896801b..d1c8a3d360bb5551b1b78511dcd3f4df133cb8c6 100644
--- a/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbLikelihoodPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLikelihoodPathListFilter_txx
-#define otbLikelihoodPathListFilter_txx
+#ifndef otbLikelihoodPathListFilter_hxx
+#define otbLikelihoodPathListFilter_hxx
 
 #include "otbLikelihoodPathListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
index d0fe805cf78896de148aa23db26791dc1f53f090..6d8dc0197920574a312f474cd3cf259ca7452754 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.h
@@ -123,7 +123,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLinkPathListFilter.txx"
+#include "otbLinkPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
index 631dba20b584fc25308b4f0e3c09d928d4b0b71d..32b9450f7a4fa08f09ad6d0ae2d0a39bc1c1126c 100644
--- a/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbLinkPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLinkPathListFilter_txx
-#define otbLinkPathListFilter_txx
+#ifndef otbLinkPathListFilter_hxx
+#define otbLinkPathListFilter_hxx
 
 #include "otbLinkPathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
index ab10ba835241d714632653b6e76b3e9d5dbfa049..152095678fbd8ae9ebb4aa2e81711fe310a43db2 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbModulusAndDirectionImageToImageFilter.txx"
+#include "otbModulusAndDirectionImageToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
index aed6e93c4b5fc089b4fab3dc4b0f006071b4b01a..1ff4f8916458a2899d29114c8882c806386e16ce 100644
--- a/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbModulusAndDirectionImageToImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbModulusAndDirectionImageToImageFilter_txx
-#define otbModulusAndDirectionImageToImageFilter_txx
+#ifndef otbModulusAndDirectionImageToImageFilter_hxx
+#define otbModulusAndDirectionImageToImageFilter_hxx
 
 #include "otbModulusAndDirectionImageToImageFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
index 2f82bf2dbb3b2445f7937915dc5bde639dbb179c..9e39bae2e1b832df18c5c253932f7e240692fe0d 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.h
@@ -105,7 +105,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeighborhoodScalarProductFilter.txx"
+#include "otbNeighborhoodScalarProductFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
index 7c26c7476f5914fab967e436eb43eee1fc1f9eec..a6a80d6eaf49f50d8c6aee61da3ae6edbfea0440 100644
--- a/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbNeighborhoodScalarProductFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeighborhoodScalarProductFilter_txx
-#define otbNeighborhoodScalarProductFilter_txx
+#ifndef otbNeighborhoodScalarProductFilter_hxx
+#define otbNeighborhoodScalarProductFilter_hxx
 
 #include "otbNeighborhoodScalarProductFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
index adbae3394a652b1324284e5563a4f0811bd9529c..49dc64059f2c89edca9178cf8d3c6b56adb86fc9 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.h
@@ -155,7 +155,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbParallelLinePathListFilter.txx"
+#include "otbParallelLinePathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
index c6a8b83bd0fa31da23c5b92f94a5a731a7601101..95aa5a5e5082b4dca6a23d09580a292e92845dc9 100644
--- a/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbParallelLinePathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbParallelLinePathListFilter_txx
-#define otbParallelLinePathListFilter_txx
+#ifndef otbParallelLinePathListFilter_hxx
+#define otbParallelLinePathListFilter_hxx
 
 #include "otbParallelLinePathListFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
index 5259b4e0b2bb6805c29825096ecce960207a3e0f..367bf27190b9a81521100e648ca6f7f04691fab2 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.h
@@ -165,7 +165,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRoadExtractionFilter.txx"
+#include "otbRoadExtractionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
index 6b120eaf6be6aa70e866003424f0936def3b3cda..3bfea872d06d99fb172cad9cdab0fb6ef73367b1 100644
--- a/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbRoadExtractionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRoadExtractionFilter_txx
-#define otbRoadExtractionFilter_txx
+#ifndef otbRoadExtractionFilter_hxx
+#define otbRoadExtractionFilter_hxx
 
 #include "otbRoadExtractionFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
index 1d2c6bfe01ec5f254e37e25578c9215b162629a9..0fd5526edb40f6c59faae1b9339cd66a784add16 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.h
@@ -136,7 +136,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRoadDescriptionFilter.txx"
+#include "otbVectorDataToRoadDescriptionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
index 17849a42e9c4a56a6f92ada090afd7e3dc1d5adb..bbe91a89077033d5cfac5ed6f86769aebd280012 100644
--- a/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
+++ b/Modules/Detection/RoadExtraction/include/otbVectorDataToRoadDescriptionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRoadDescriptionFilter_txx
-#define otbVectorDataToRoadDescriptionFilter_txx
+#ifndef otbVectorDataToRoadDescriptionFilter_hxx
+#define otbVectorDataToRoadDescriptionFilter_hxx
 
 #include "otbVectorDataToRoadDescriptionFilter.h"
 
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
index 03ff84dfdef4df5aae2f25cb27f21f675b3ea900..d4fdf9c0e228b9241318e9749474c885fa604508 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.h
@@ -262,7 +262,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUrbanAreaDetectionImageFilter.txx"
+#include "otbUrbanAreaDetectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
index 70c9775412287fdcf95a4f220d89015309ab5368..721ef1553887e7646fbffc67d97d9b451ebe7e77 100644
--- a/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
+++ b/Modules/Detection/UrbanArea/include/otbUrbanAreaDetectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUrbanAreaDetectionImageFilter_txx
-#define otbUrbanAreaDetectionImageFilter_txx
+#ifndef otbUrbanAreaDetectionImageFilter_hxx
+#define otbUrbanAreaDetectionImageFilter_hxx
 
 #include "otbUrbanAreaDetectionImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.h b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
index 9fae4a897f5044f73f87cb74a91e16b1557cfc56..d9ccf8eddb7adf45aa20f0d0ad0a5d106a291a5d 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHarrisImageFilter.txx"
+#include "otbHarrisImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx b/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
index e3a39d4b2620ee32786ebc77dca9dc3d2f05f539..7b0795e59ad675476f4dc4b1c26d791915c5c539 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
+++ b/Modules/Feature/Corner/include/otbHarrisImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHarrisImageFilter_txx
-#define otbHarrisImageFilter_txx
+#ifndef otbHarrisImageFilter_hxx
+#define otbHarrisImageFilter_hxx
 
 #include "otbHarrisImageFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
index 39eaa3bce2c8d5e23039fd9358492b95556ac54e..867285d770f94a49fba9a8a1da5f3ab040bccec9 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHarrisImageToPointSetFilter.txx"
+#include "otbHarrisImageToPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
index d9cc6edd1f282c803f51835121729358dae03a60..609b96ecd3e71067c7828f6f0cea8ad61d8b1ea3 100644
--- a/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
+++ b/Modules/Feature/Corner/include/otbHarrisImageToPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHarrisImageToPointSetFilter_txx
-#define otbHarrisImageToPointSetFilter_txx
+#ifndef otbHarrisImageToPointSetFilter_hxx
+#define otbHarrisImageToPointSetFilter_hxx
 
 #include "otbHarrisImageToPointSetFilter.h"
 
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
index e8d4c6c0a851b3b1e177cd9e3326b71bab375361..77905f8c5d5f097e368e0f37ac75956053068db3 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.h
@@ -157,7 +157,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSpatialObjectListToRightAnglePointSetFilter.txx"
+#include "otbLineSpatialObjectListToRightAnglePointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
index 3cc3f5a5ef535b6fc5615f69475f08b96e74c1f1..704408cd77446bf9269a6b90b049d630c58b9346 100644
--- a/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
+++ b/Modules/Feature/Corner/include/otbLineSpatialObjectListToRightAnglePointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_txx
-#define otbLineSpatialObjectListToRightAnglePointSetFilter_txx
+#ifndef otbLineSpatialObjectListToRightAnglePointSetFilter_hxx
+#define otbLineSpatialObjectListToRightAnglePointSetFilter_hxx
 
 #include "otbLineSpatialObjectListToRightAnglePointSetFilter.h"
 #include "itkLineIterator.h"
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
index b07920e67cceffba19818a50df1bd728152a4f40..5de73247de2237b0f7e46cbc1e5e9ef2fc8c5f90 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.h
@@ -110,7 +110,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRightAngleVectorDataFilter.txx"
+#include "otbVectorDataToRightAngleVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
index a6ee8f224f782401dc361988ae9a5b2467e7f772..9b8c19e6ba9839794097ff7ffe2c17ae62332047 100644
--- a/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
+++ b/Modules/Feature/Corner/include/otbVectorDataToRightAngleVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRightAngleVectorDataFilter_txx
-#define otbVectorDataToRightAngleVectorDataFilter_txx
+#ifndef otbVectorDataToRightAngleVectorDataFilter_hxx
+#define otbVectorDataToRightAngleVectorDataFilter_hxx
 
 #include "otbVectorDataToRightAngleVectorDataFilter.h"
 #include "otbVectorData.h"
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
index a1f07c482d09fdce8c125b9f07f6caaa8e00f404..82cfa22d227d8f53b096648bb16cd8fdbcc60c8a 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.h
@@ -121,7 +121,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKeyPointDensityImageFilter.txx"
+#include "otbKeyPointDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
index e08c7e52bbd8f7063498a2a4f413b66f29b4cb11..22b02cba98feae1862a4b2b4c810a87240534e37 100644
--- a/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
+++ b/Modules/Feature/Density/include/otbKeyPointDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKeyPointDensityImageFilter_txx
-#define otbKeyPointDensityImageFilter_txx
+#ifndef otbKeyPointDensityImageFilter_hxx
+#define otbKeyPointDensityImageFilter_hxx
 
 #include "otbKeyPointDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
index 2080f6f2a7dec3bdb79c1ac82cc3df5fa44c2cf4..0c5d9ddb604a431b4b4f02374a1cc95f78d0e582 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.h
@@ -83,7 +83,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityEpanechnikovFunction.txx"
+#include "otbPointSetDensityEpanechnikovFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
index f6e3f64d340634b7123794c2c6706408a1539967..129eac74aaad07ff46520d51b1d56c613bd7e6d4 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityEpanechnikovFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityEpanechnikovFunction_txx
-#define otbPointSetDensityEpanechnikovFunction_txx
+#ifndef otbPointSetDensityEpanechnikovFunction_hxx
+#define otbPointSetDensityEpanechnikovFunction_hxx
 
 #include "otbPointSetDensityEpanechnikovFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.h b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
index 271fdf3e5f93ce7fd6e1733030bd05bea1caf601..4650ae5906db948ffde7dbf1b6b6e72319be2341 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.h
@@ -82,7 +82,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityFunction.txx"
+#include "otbPointSetDensityFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
index 971217acf600d0f864c00ce5690a3fc38244866e..cb8511508b55ca8201eb566de373058ad29faafe 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityFunction_txx
-#define otbPointSetDensityFunction_txx
+#ifndef otbPointSetDensityFunction_hxx
+#define otbPointSetDensityFunction_hxx
 
 #include "otbPointSetDensityFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
index f4ec551e79bec944efc86c24973b2b606d326ed1..d09bf7f041a0fdf79f245ab8ab856a351f8a3921 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.h
@@ -83,7 +83,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetDensityGaussianFunction.txx"
+#include "otbPointSetDensityGaussianFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
index f50606123674457fd4b5a6ecc9162aec0f261d46..6f5762dfd4bd47bf5f0a02702d4ea6221f1fe638 100644
--- a/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
+++ b/Modules/Feature/Density/include/otbPointSetDensityGaussianFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetDensityGaussianFunction_txx
-#define otbPointSetDensityGaussianFunction_txx
+#ifndef otbPointSetDensityGaussianFunction_hxx
+#define otbPointSetDensityGaussianFunction_hxx
 
 #include "otbPointSetDensityGaussianFunction.h"
 #include "otbMath.h"
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
index bd07312edd2c0b45ae79fa74acc57ad4d00e77cd..15206e3065432ee3d423431615d410c79fee72ae 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.h
@@ -113,7 +113,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToDensityImageFilter.txx"
+#include "otbPointSetToDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
index 09c672b71555e2a5c95f5f786dc24f38e3789afd..487114368ee74c682780596d4c7a4d45767a7d8b 100644
--- a/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
+++ b/Modules/Feature/Density/include/otbPointSetToDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToDensityImageFilter_txx
-#define otbPointSetToDensityImageFilter_txx
+#ifndef otbPointSetToDensityImageFilter_hxx
+#define otbPointSetToDensityImageFilter_hxx
 
 #include "otbPointSetToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
index 8c7474ec8a6069fa546b0b6a098ba6d49edbd6e0..f1dd2b9ff406730af220ea7f114926c2e9678b1d 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.h
@@ -169,7 +169,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbForwardFourierMellinTransformImageFilter.txx"
+#include "otbForwardFourierMellinTransformImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
index 9d48d66ff2b2b05216781442a8623f8d158fd47a..3d52de5b85fb94c8e58c97c13dcb1b61875188b8 100644
--- a/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbForwardFourierMellinTransformImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbForwardFourierMellinTransformImageFilter_txx
-#define otbForwardFourierMellinTransformImageFilter_txx
+#ifndef otbForwardFourierMellinTransformImageFilter_hxx
+#define otbForwardFourierMellinTransformImageFilter_hxx
 
 #include "otbForwardFourierMellinTransformImageFilter.h"
 #include "itkImageDuplicator.h"
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
index 0a78af0f056fecff15aa5e01e24b93c0ca6e8f36..477dd88f80b13eb53f4a5ee05f59f9c0589ffe67 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.h
@@ -149,7 +149,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFourierMellinDescriptorsImageFunction.txx"
+#include "otbFourierMellinDescriptorsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
index cb243ca5fbce4874a6517f802d38c6feb6da124c..3285ba91939868c19d879d0915e6a37fd9097bc8 100644
--- a/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
+++ b/Modules/Feature/Descriptors/include/otbFourierMellinDescriptorsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFourierMellinDescriptorsImageFunction_txx
-#define otbFourierMellinDescriptorsImageFunction_txx
+#ifndef otbFourierMellinDescriptorsImageFunction_hxx
+#define otbFourierMellinDescriptorsImageFunction_hxx
 
 #include "otbFourierMellinDescriptorsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
index 82d0b64555e0d02f33f408bfa482b23b62411bdf..1df3a0951c843b51fa233f7b4f3765cecc268672 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.h
@@ -151,7 +151,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramOfOrientedGradientCovariantImageFunction.txx"
+#include "otbHistogramOfOrientedGradientCovariantImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
index 63df3b5de85cf71dfa40b9aa23d432cdb30ab61d..5c7f668ebcfa607211e873aceb67a2ef5424b233 100644
--- a/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
+++ b/Modules/Feature/Descriptors/include/otbHistogramOfOrientedGradientCovariantImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_txx
-#define otbHistogramOfOrientedGradientCovariantImageFunction_txx
+#ifndef otbHistogramOfOrientedGradientCovariantImageFunction_hxx
+#define otbHistogramOfOrientedGradientCovariantImageFunction_hxx
 
 #include "otbHistogramOfOrientedGradientCovariantImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
index 009f7091946896ad4fcd1895c38820f4a07f20f5..20c9b8ff939b942bc27e31adf5f2d99665693fbd 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.h
@@ -155,7 +155,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToHessianDeterminantImageFilter.txx"
+#include "otbImageToHessianDeterminantImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
index 249db9334fdf72463a1718d4d0b2cf0b7420f23f..920b3e1cef8d97f028cd62e3efbb1c75adce9814 100644
--- a/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToHessianDeterminantImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageToHessianDeterminantImageFilter_txx
-#define otbImageToHessianDeterminantImageFilter_txx
+#ifndef otbImageToHessianDeterminantImageFilter_hxx
+#define otbImageToHessianDeterminantImageFilter_hxx
 
 #include "otbImageToHessianDeterminantImageFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
index e4386292c1b29d21e3f418750f60f5d66f14d97b..24380e2065de6b4458e017cd06c0ef61cc0bc9c2 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.h
@@ -398,7 +398,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToSIFTKeyPointSetFilter.txx"
+#include "otbImageToSIFTKeyPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
index e34a5a8ba4de886670793a0fb20fce5907bf176b..f2eba3fa16277e9cae46120d69d35008ef7f84e9 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToSIFTKeyPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToSIFTKeyPointSetFilter_txx
-#define otbImageToSIFTKeyPointSetFilter_txx
+#ifndef otbImageToSIFTKeyPointSetFilter_hxx
+#define otbImageToSIFTKeyPointSetFilter_hxx
 
 #include "otbImageToSIFTKeyPointSetFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
index 0dd8d10791fbfce1beaafef1e78081712e8dd2ac..47dd1750a46dfbaeb4bf37b680cd1b062cff7b0d 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.h
@@ -245,7 +245,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToSURFKeyPointSetFilter.txx"
+#include "otbImageToSURFKeyPointSetFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
index 4221e4ba0c7bbc1215715cf7ab07ae6387c67ba5..d787e1c9c0d338a94861095ce60d544d4df4854c 100644
--- a/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbImageToSURFKeyPointSetFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToSURFKeyPointSetFilter_txx
-#define otbImageToSURFKeyPointSetFilter_txx
+#ifndef otbImageToSURFKeyPointSetFilter_hxx
+#define otbImageToSURFKeyPointSetFilter_hxx
 
 #include "otbImageToSURFKeyPointSetFilter.h"
 #include "itkCenteredRigid2DTransform.h"
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
index d5851c125e82d5cd96831e3b6a9f27fad635f850..f99d530bc2ef2f4eaabc8b54f8a9816e3ac44e8e 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.h
@@ -132,6 +132,6 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKeyPointSetsMatchingFilter.txx"
+#include "otbKeyPointSetsMatchingFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
index e4719fb19693e9277a1809fb9a2f106ce27f10c2..66a458cc1c4ca8b2873dcb462f0bcdbcc84e974e 100644
--- a/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbKeyPointSetsMatchingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKeyPointSetsMatchingFilter_txx
-#define otbKeyPointSetsMatchingFilter_txx
+#ifndef otbKeyPointSetsMatchingFilter_hxx
+#define otbKeyPointSetsMatchingFilter_hxx
 
 #include "otbKeyPointSetsMatchingFilter.h"
 
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
index ff1e7ef2b51bad6812563f7f75b5664514e8b5d9..339b539d2867615944ff44473de2e6b0c8250e56 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.h
@@ -110,7 +110,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSiftFastImageFilter.txx"
+#include "otbSiftFastImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
index 6f7d96db40a58469b0212816ade65637883ba730..816a4aaa90a295dc63dd92f1461d44337f1e6c2f 100644
--- a/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
+++ b/Modules/Feature/Descriptors/include/otbSiftFastImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSiftFastImageFilter_txx
-#define otbSiftFastImageFilter_txx
+#ifndef otbSiftFastImageFilter_hxx
+#define otbSiftFastImageFilter_hxx
 
 #include "otbSiftFastImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
index b05a3de7987ef2b806302d17a2a49a8067753889..eb74194ef0c2d7dab9a9dab82f0a675ec2546718 100644
--- a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.h
@@ -105,7 +105,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAsymmetricFusionOfLineDetectorImageFilter.txx"
+#include "otbAsymmetricFusionOfLineDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
index 982187302353a9a5864445e2e9238fbd9b0ca67c..ee169f461553d90a15b7e6cd1d23a9f436539fd7 100644
--- a/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbAsymmetricFusionOfLineDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAsymmetricFusionOfLineDetectorImageFilter_txx
-#define otbAsymmetricFusionOfLineDetectorImageFilter_txx
+#ifndef otbAsymmetricFusionOfLineDetectorImageFilter_hxx
+#define otbAsymmetricFusionOfLineDetectorImageFilter_hxx
 
 #include "otbAsymmetricFusionOfLineDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
index 9bdddd6390266acc523479afd4ae4c6f1521037b..75169f5d2b6b4004b8f9cd2dbbbcce4f0ba7ecd5 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.h
@@ -125,7 +125,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEdgeDensityImageFilter.txx"
+#include "otbEdgeDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
index 8730e98affdd337172d206497941d9679426bd02..e72023a2dc54440e2f8d2b8c4db3ead96839f671 100644
--- a/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbEdgeDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEdgeDensityImageFilter_txx
-#define otbEdgeDensityImageFilter_txx
+#ifndef otbEdgeDensityImageFilter_hxx
+#define otbEdgeDensityImageFilter_hxx
 
 #include "otbEdgeDensityImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
index d0c50c4707735adf3f942659b98949f909acf33b..0b71e7c65063e4fa07431a5ba9b2a8d78ebb9e70 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEdgeDetectorImageFilter.txx"
+#include "otbEdgeDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
index 861166ede922d57f2a2bf9e60fcdd44c2b45f602..733b9e80b53b2c2052d537413a187042bb2410d7 100644
--- a/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbEdgeDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEdgeDetectorImageFilter_txx
-#define otbEdgeDetectorImageFilter_txx
+#ifndef otbEdgeDetectorImageFilter_hxx
+#define otbEdgeDetectorImageFilter_hxx
 
 #include "otbEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
index fe557e5224a9c360a8cd600e5092ec238201afc3..ad458f04413dfab59a3ed27baa4fec9675a6a857 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.h
@@ -155,7 +155,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbExtractSegmentsImageFilter.txx"
+#include "otbExtractSegmentsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
index 592da7d72654056782b220d9ff83c22fa3182a87..2f609d13c556be3a2edc740bfd61752154ae79e9 100644
--- a/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbExtractSegmentsImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbExtractSegmentsImageFilter_txx
-#define otbExtractSegmentsImageFilter_txx
+#ifndef otbExtractSegmentsImageFilter_hxx
+#define otbExtractSegmentsImageFilter_hxx
 
 #include "otbExtractSegmentsImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
index 758e33dd45bf8316627411954f867c869979f688..bd3c95f4c3269b0016d83dddc2fe511fc1548b74 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.h
@@ -239,7 +239,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHoughTransform2DLinesImageFilter.txx"
+#include "otbHoughTransform2DLinesImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
index 893e1829c7a6840c34881eb3a6881bf2ee99f487..f2256c66014ad2df84f0a90bba7ef832f29a9e3a 100644
--- a/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbHoughTransform2DLinesImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHoughTransform2DLinesImageFilter_txx
-#define otbHoughTransform2DLinesImageFilter_txx
+#ifndef otbHoughTransform2DLinesImageFilter_hxx
+#define otbHoughTransform2DLinesImageFilter_hxx
 
 #include "otbHoughTransform2DLinesImageFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
index abac114da0d4a335494a8cc62c702687efe37109..53ffa028799ff8d39fb907846bb75d86cf31610a 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineCorrelationDetectorImageFilter.txx"
+#include "otbLineCorrelationDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
index 81b08ff5cbf1e63e9cc70791f235e34c3f9cb687..6c4da8b6e44188a0e8b89b1d123014daed4bf99a 100644
--- a/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLineCorrelationDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineCorrelationDetectorImageFilter_txx
-#define otbLineCorrelationDetectorImageFilter_txx
+#ifndef otbLineCorrelationDetectorImageFilter_hxx
+#define otbLineCorrelationDetectorImageFilter_hxx
 
 #include "otbLineCorrelationDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
index cbd7713119100a0a249f71d2fa5f2ea278d2c692..204589dce09958942aefaeca2820eec76bdfc3dd 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineDetectorImageFilterBase.txx"
+#include "otbLineDetectorImageFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
index b5ca1a26612733719c8415a53bfdd1c9f5ea6380..1f9c512baeee96c026b3c6f14e86925508ebb51c 100644
--- a/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
+++ b/Modules/Feature/Edge/include/otbLineDetectorImageFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineDetectorImageFilterBase_txx
-#define otbLineDetectorImageFilterBase_txx
+#ifndef otbLineDetectorImageFilterBase_hxx
+#define otbLineDetectorImageFilterBase_hxx
 
 #include "otbLineDetectorImageFilterBase.h"
 
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
index 6a77da7f3bd04738c7827d16062b44d77364bd58..ee30972f2c2a811218a9ac9deaeba4734ec97599 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineRatioDetectorImageFilter.txx"
+#include "otbLineRatioDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
index c8f8ec7d6685565d6ecd132d61678a899111859b..638656418e7a6c40365c19c253e40ee7ba76e983 100644
--- a/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLineRatioDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineRatioDetectorImageFilter_txx
-#define otbLineRatioDetectorImageFilter_txx
+#ifndef otbLineRatioDetectorImageFilter_hxx
+#define otbLineRatioDetectorImageFilter_hxx
 
 #include "otbLineRatioDetectorImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.h b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
index 4cc70ff2cfa50221d4fc6d18d1ada9103a760284..9e335d2e8b0f829a6f29cdb6b814f2341167fbd7 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.h
@@ -286,7 +286,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineSegmentDetector.txx"
+#include "otbLineSegmentDetector.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx b/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
index b2a181823aceda312d894d7774b29f6a936997d0..1d81fbfa319fd4d8e746dd4982edbda80d76aa03 100644
--- a/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
+++ b/Modules/Feature/Edge/include/otbLineSegmentDetector.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineSegmentDetector_txx
-#define otbLineSegmentDetector_txx
+#ifndef otbLineSegmentDetector_hxx
+#define otbLineSegmentDetector_hxx
 
 #include "otbLineSegmentDetector.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.h b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
index 365febc98f4970d3ba1e8841f1bdd6d3afcaca53..ae3493aa3060161d969dd5e4a52d9a875eaa2f61 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.h
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.h
@@ -167,7 +167,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHoughFilter.txx"
+#include "otbLocalHoughFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx b/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
index b6a21b20f2e078f308d1af840690944d5096bc1c..5c11092c8d1abfbe565506d0f28a55928fb243b7 100644
--- a/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
+++ b/Modules/Feature/Edge/include/otbLocalHoughFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHoughFilter_txx
-#define otbLocalHoughFilter_txx
+#ifndef otbLocalHoughFilter_hxx
+#define otbLocalHoughFilter_hxx
 
 #include "otbLocalHoughFilter.h"
 #include "otbImage.h"
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
index cf7e0cf03e4d62d6ff366bf8d42802f125d7b2c8..76bbd311b69770ac5ddb81673b2b3cfa0e935bda 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.h
@@ -107,7 +107,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentVectorizationImageFilter.txx"
+#include "otbPersistentVectorizationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
index 07fe9cf2b366ef2ab4dd5f800ca6096e948d1b6b..ca33dad9df8927a92a7b4d74a1e656c1dcb80bb9 100644
--- a/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbPersistentVectorizationImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentVectorizationImageFilter_txx
-#define otbPersistentVectorizationImageFilter_txx
+#ifndef otbPersistentVectorizationImageFilter_hxx
+#define otbPersistentVectorizationImageFilter_hxx
 
 #include "otbPersistentVectorizationImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
index 2da9dac793be32162e3c8d3b93b9de4789a14db1..2c7fcf936face113c37986a10caf8c50a073eae8 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPixelSuppressionByDirectionImageFilter.txx"
+#include "otbPixelSuppressionByDirectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
index 807a04901c54a6e22b69708a34d9bcd3b5a5af83..c6f0824955ac7344204185bda6a11734685894cb 100644
--- a/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbPixelSuppressionByDirectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPixelSuppressionByDirectionImageFilter_txx
-#define otbPixelSuppressionByDirectionImageFilter_txx
+#ifndef otbPixelSuppressionByDirectionImageFilter_hxx
+#define otbPixelSuppressionByDirectionImageFilter_hxx
 
 #include "otbPixelSuppressionByDirectionImageFilter.h"
 
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
index fc250afcf31d90a6798d875f4d62e0c3896f763d..2601c28516971efcfb2008a6c6c6c55a09774ff1 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.h
@@ -112,7 +112,7 @@ public:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingLineSegmentDetector.txx"
+#include "otbStreamingLineSegmentDetector.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
index 7b1a1115686df2f98cf84815ad999698a93c2618..395d6e2e61491500d0db925709a9b50f6e6babbf 100644
--- a/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
+++ b/Modules/Feature/Edge/include/otbStreamingLineSegmentDetector.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingLineSegmentDetector_txx
-#define otbStreamingLineSegmentDetector_txx
+#ifndef otbStreamingLineSegmentDetector_hxx
+#define otbStreamingLineSegmentDetector_hxx
 
 #include "otbStreamingLineSegmentDetector.h"
 
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
index 37393478a323de1f82cf381df9b9286b763ec41e..40b5d84fcafa30313c37a189f6da5d36e63fa420 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTouziEdgeDetectorImageFilter.txx"
+#include "otbTouziEdgeDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
index 8f80efc20018234a3bf13da7ca95f8e9fddb691b..d6bda2c7e485a78fd6ed7ea03565578d784b13b7 100644
--- a/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
+++ b/Modules/Feature/Edge/include/otbTouziEdgeDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTouziEdgeDetectorImageFilter_txx
-#define otbTouziEdgeDetectorImageFilter_txx
+#ifndef otbTouziEdgeDetectorImageFilter_hxx
+#define otbTouziEdgeDetectorImageFilter_hxx
 
 #include "otbTouziEdgeDetectorImageFilter.h"
 
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
index 6c1b29f6828842e5d22c45e899ccfc7c9feb6689..9379b905e64eacf61aaf344e3c0e64af15bdade2 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.h
@@ -117,7 +117,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComplexMomentPathFunction.txx"
+#include "otbComplexMomentPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
index e4f5c28b6c9c20875580c5b9a92358430dc0087d..564842094da59cf279e872970b98eabcca9d166f 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbComplexMomentPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComplexMomentPathFunction_txx
-#define otbComplexMomentPathFunction_txx
+#ifndef otbComplexMomentPathFunction_hxx
+#define otbComplexMomentPathFunction_hxx
 
 #include "otbComplexMomentPathFunction.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
index 42b10edd4fb1982597161a008af2bf7d4628ddbf..dcbc4e7abfb7745359ae8550a6f1e22eec3206a9 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.h
@@ -138,7 +138,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComplexMomentsImageFunction.txx"
+#include "otbComplexMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
index 731f7ec363b4ed36c10da2c0dce4d7c34e5b84f1..495d5381001fb8a3c733a2d0703efdf975ed8eb7 100644
--- a/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbComplexMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComplexMomentsImageFunction_txx
-#define otbComplexMomentsImageFunction_txx
+#ifndef otbComplexMomentsImageFunction_hxx
+#define otbComplexMomentsImageFunction_hxx
 
 #include "otbComplexMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
index 4b8bf182889c41394e166296abd02c1774019926..3b08a1e644fd2ae969a744753d0725ae88139fc5 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.h
@@ -146,7 +146,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserMomentsImageFunction.txx"
+#include "otbFlusserMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
index 2caf81f8d51e07ac2abdb005c1bd4b69a6291f3b..d6a281010dc22f89face07fc6952ecdb6afbc1f8 100644
--- a/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbFlusserMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserMomentsImageFunction_txx
-#define otbFlusserMomentsImageFunction_txx
+#ifndef otbFlusserMomentsImageFunction_hxx
+#define otbFlusserMomentsImageFunction_hxx
 
 #include "otbFlusserMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.h b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
index 9955d55334890030245eadc9749153849bd865c2..e72c3a9a3d68f4c73e13f54d9cd87f6515564da3 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.h
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.h
@@ -115,7 +115,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlusserPathFunction.txx"
+#include "otbFlusserPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx b/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
index 7fc0f74bfe07791f39e10d4c858abf5daf00098a..0c73d58388c3328a7b64563b074bb290a0a471c9 100644
--- a/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbFlusserPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFlusserPathFunction_txx
-#define otbFlusserPathFunction_txx
+#ifndef otbFlusserPathFunction_hxx
+#define otbFlusserPathFunction_hxx
 
 #include "otbFlusserPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
index 0f344ccee673a4a3023ff8f0deb65f9b59e04570..abdf6184e023fa26a0af6fbeeb70960bcb9bfa4e 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.h
@@ -142,7 +142,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHuMomentsImageFunction.txx"
+#include "otbHuMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
index abc21c1f2b4a7224183e1b172ecc706bcf1a07f1..95aca0605de8a54557caaae3266dd686ec24f04e 100644
--- a/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbHuMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHuMomentsImageFunction_txx
-#define otbHuMomentsImageFunction_txx
+#ifndef otbHuMomentsImageFunction_hxx
+#define otbHuMomentsImageFunction_hxx
 
 #include "otbHuMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.h b/Modules/Feature/Moments/include/otbHuPathFunction.h
index 1174935d27ed878ef6b980a570973071b933c0a5..a113fd2f096669caebc5ef0a433a9771a9639b17 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.h
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.h
@@ -112,7 +112,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHuPathFunction.txx"
+#include "otbHuPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbHuPathFunction.hxx b/Modules/Feature/Moments/include/otbHuPathFunction.hxx
index f390206f73559f555aa506f346540cd29b891ca9..b217ba49fa0ac0f457c93266a394ed11b4372249 100644
--- a/Modules/Feature/Moments/include/otbHuPathFunction.hxx
+++ b/Modules/Feature/Moments/include/otbHuPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHuPathFunction_txx
-#define otbHuPathFunction_txx
+#ifndef otbHuPathFunction_hxx
+#define otbHuPathFunction_hxx
 
 #include "otbHuPathFunction.h"
 #include "otbComplexMomentPathFunction.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
index 72ef9176c6660d2dba553d32a8af15e0254d8508..abe2a5209d0f195c0467f98147a5588436d5a1f7 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.h
@@ -108,7 +108,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsImageFilter.txx"
+#include "otbRadiometricMomentsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
index 5c4275f31bce73c4565648382c2887e72b954c3a..235726c006b1554ecf3a0f43e549934d51b62edc 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsImageFilter_txx
-#define otbRadiometricMomentsImageFilter_txx
+#ifndef otbRadiometricMomentsImageFilter_hxx
+#define otbRadiometricMomentsImageFilter_hxx
 
 #include "otbRadiometricMomentsImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
index 23a70bcb0de48164394b81ac36f475953a36adfa..d020e7298806fb2db09527d3172c4b3dcba4c9da 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.h
@@ -128,7 +128,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometricMomentsImageFunction.txx"
+#include "otbRadiometricMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
index faaf35966057ed4b447abd22e6122e13de7fe0d6..c43769787029e96d219e8fe9855d7348b58bac09 100644
--- a/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbRadiometricMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometricMomentsImageFunction_txx
-#define otbRadiometricMomentsImageFunction_txx
+#ifndef otbRadiometricMomentsImageFunction_hxx
+#define otbRadiometricMomentsImageFunction_hxx
 
 #include "otbRadiometricMomentsImageFunction.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
index 96d50a31da409032b72bbd9bc354e8405c82c580..18bd8ad1763ab3ab4b65cc1ad39cb035b86d5ba9 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.h
@@ -124,7 +124,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRealMomentsImageFunction.txx"
+#include "otbRealMomentsImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
index 4a6d0d05766eaac14e7c7aef96fcb8808ed6f0af..5e6f75b1108c6f5aaf262e41d6c4afb4bfdf4d2e 100644
--- a/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
+++ b/Modules/Feature/Moments/include/otbRealMomentsImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRealMomentsImageFunction_txx
-#define otbRealMomentsImageFunction_txx
+#ifndef otbRealMomentsImageFunction_hxx
+#define otbRealMomentsImageFunction_hxx
 
 #include "otbRealMomentsImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
index dd1bef6975a6f8a6a7f83b1615440432488121a7..9d773ca236d5f7dde6b53b5c60b83a030cf0ea8d 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAddCarvingPathFilter.txx"
+#include "otbAddCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
index 506f894347ff4f8a4e5f9bf23754bf20a7de116a..bfdaebef1cadfdcb61a30c2bfbc160a7bbeb582f 100644
--- a/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbAddCarvingPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbAddCarvingPathFilter_txx
-#define otbAddCarvingPathFilter_txx
+#ifndef otbAddCarvingPathFilter_hxx
+#define otbAddCarvingPathFilter_hxx
 
 #include "otbAddCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
index 47e68f6a0ff6b49c4f90aff36c7238728df7cc3d..2143bf729f727885a95388df7c459470b355c71c 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.h
@@ -110,7 +110,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToCarvingPathFilter.txx"
+#include "otbImageToCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
index 70bbb0be7c803628d74293246ff368679b887b02..414351d4d6598fcd567f74dd13c981d6efd7ce0d 100644
--- a/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbImageToCarvingPathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToCarvingPathFilter_txx
-#define otbImageToCarvingPathFilter_txx
+#ifndef otbImageToCarvingPathFilter_hxx
+#define otbImageToCarvingPathFilter_hxx
 
 #include "otbImageToCarvingPathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
index 93bc57457b003f57151f6e3606ee3827bf0be949..a5d18c8d1ffdc3ff4e8dfa97ae0a2902ddb1c644 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRemoveCarvingPathFilter.txx"
+#include "otbRemoveCarvingPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
index 5052be60db0810c7898812ff3459c9c1654e6c85..840ce9e73826320bc59f7014dbf06cd70bff8395 100644
--- a/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
+++ b/Modules/Feature/SeamCarving/include/otbRemoveCarvingPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbRemoveCarvingPathFilter_txx
-#define otbRemoveCarvingPathFilter_txx
+#ifndef otbRemoveCarvingPathFilter_hxx
+#define otbRemoveCarvingPathFilter_hxx
 
 #include "otbRemoveCarvingPathFilter.h"
 #include "itkMacro.h"
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
index 08be9dbeddaee018285b88239278a3b8774df93b..a0d9879115a0d4214b3f39947817e8870d93afb3 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.h
@@ -191,7 +191,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGreyLevelCooccurrenceIndexedList.txx"
+#include "otbGreyLevelCooccurrenceIndexedList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
index 477ad9cab333442e91c2c361d3bc1eb08b55aebd..77a7bba6bf83f93a12406a454b90ba3371ec61ef 100644
--- a/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
+++ b/Modules/Feature/Textures/include/otbGreyLevelCooccurrenceIndexedList.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbGreyLevelCooccurrenceIndexedList_txx
-#define otbGreyLevelCooccurrenceIndexedList_txx
+#ifndef otbGreyLevelCooccurrenceIndexedList_hxx
+#define otbGreyLevelCooccurrenceIndexedList_hxx
 
 #include "otbGreyLevelCooccurrenceIndexedList.h"
 
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
index fbbdbbc872e9e4b723e1ed865cef9a9849b042b1..b52de36f9514cae5df45ab810bc4bae7d08d896b 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.h
@@ -233,7 +233,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHaralickTexturesImageFunction.txx"
+#include "otbHaralickTexturesImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
index b5dce464fe7aaa51b99965db521f1862027b4fc0..896b7939c6a867938907e6ae89de56f20e0ea5d5 100644
--- a/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
+++ b/Modules/Feature/Textures/include/otbHaralickTexturesImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHaralickTexturesImageFunction_txx
-#define otbHaralickTexturesImageFunction_txx
+#ifndef otbHaralickTexturesImageFunction_hxx
+#define otbHaralickTexturesImageFunction_hxx
 
 #include "otbHaralickTexturesImageFunction.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
index b05eace44b39b1a9811fbfa28d652fc919e98499..403431c4ca8c7e04692e699b50576f82eebf5976 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.h
@@ -238,7 +238,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSFSTexturesImageFilter.txx"
+#include "otbSFSTexturesImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
index c52d07d491ff84446d7c6671fba7c47e0b1a3833..eb0dd44ce3f5b25b18271a70c7c647e9130b18cc 100644
--- a/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
+++ b/Modules/Feature/Textures/include/otbSFSTexturesImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSFSTexturesImageFilter_txx
-#define otbSFSTexturesImageFilter_txx
+#ifndef otbSFSTexturesImageFilter_hxx
+#define otbSFSTexturesImageFilter_hxx
 
 #include "otbSFSTexturesImageFilter.h"
 
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
index 4b6b233f9b47cafa01a8137dac4d695c11427ea7..e03748dc54cbe3539f34ae37b549127755ec418b 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.h
@@ -257,7 +257,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToAdvancedTexturesFilter.txx"
+#include "otbScalarImageToAdvancedTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
index 447170e096198e7cd6d335549a90331ec99b2655..20dad10abfc4e5d2ea300009812e381155989a4e 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToAdvancedTexturesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToAdvancedTexturesFilter_txx
-#define otbScalarImageToAdvancedTexturesFilter_txx
+#ifndef otbScalarImageToAdvancedTexturesFilter_hxx
+#define otbScalarImageToAdvancedTexturesFilter_hxx
 
 #include "otbScalarImageToAdvancedTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
index 64943649a07bcb646d8c3a44be94abadc5de3710..5ab564b9c4c0ded6c3bf08d124d8dfd1308b9340 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.h
@@ -242,7 +242,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToHigherOrderTexturesFilter.txx"
+#include "otbScalarImageToHigherOrderTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
index 8ca02b8e8932611298e7de1eb9f174666c89e7ed..167bc209754b1467e6d2e8d14aa207335b105c62 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToHigherOrderTexturesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToHigherOrderTexturesFilter_txx
-#define otbScalarImageToHigherOrderTexturesFilter_txx
+#ifndef otbScalarImageToHigherOrderTexturesFilter_hxx
+#define otbScalarImageToHigherOrderTexturesFilter_hxx
 
 #include "otbScalarImageToHigherOrderTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
index 62bcff4a850b13801d49908053ee9a5405126086..b19c4b61481cd51a45e0d1bbedc24cefdad80ff4 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.h
@@ -146,7 +146,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToPanTexTextureFilter.txx"
+#include "otbScalarImageToPanTexTextureFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
index 85f393bb9ad72cad38402deefded6a3f149d11bc..a679cce10b097b2f731e165a4408809262a97f73 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToPanTexTextureFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarImageToPanTexTextureFilter_txx
-#define otbScalarImageToPanTexTextureFilter_txx
+#ifndef otbScalarImageToPanTexTextureFilter_hxx
+#define otbScalarImageToPanTexTextureFilter_hxx
 
 #include "otbScalarImageToPanTexTextureFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
index f6471ec1c590cc0658f78e5f64061cf7b86cddff..e39d3b58edf958683269e4e1039e3633137d89ed 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.h
@@ -256,7 +256,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarImageToTexturesFilter.txx"
+#include "otbScalarImageToTexturesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
index 229dd4da1f1ac3a812483a2d9228b05f4165f92b..1057373d7baadc905359c8e1b086d13172a030a2 100644
--- a/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
+++ b/Modules/Feature/Textures/include/otbScalarImageToTexturesFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbScalarImageToTexturesFilter_txx
-#define otbScalarImageToTexturesFilter_txx
+#ifndef otbScalarImageToTexturesFilter_hxx
+#define otbScalarImageToTexturesFilter_hxx
 
 #include "otbScalarImageToTexturesFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.h b/Modules/Feature/Textures/include/otbTextureImageFunction.h
index a5bf535619a4f23d9a00ab2ad264467d1fc3ff7a..e072f34e78fda518287ddffd0fec414aa3060be9 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.h
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbTextureImageFunction.txx"
+# include "otbTextureImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Feature/Textures/include/otbTextureImageFunction.hxx b/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
index ea9fc35e4b384b99143fd51f33d37f3b1ee46769..7c886cb65ce6ec47b3245862aa38640f0f606044 100644
--- a/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
+++ b/Modules/Feature/Textures/include/otbTextureImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTextureImageFunction_txx
-#define otbTextureImageFunction_txx
+#ifndef otbTextureImageFunction_hxx
+#define otbTextureImageFunction_hxx
 
 #include "otbTextureImageFunction.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
index 47495938a1eaf43f9ce6d04b0538f3883387e062..ba29141bfb27996d4ea05d178e5ce22249654a55 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
index 8cc83055d041ce69fd6005a434e632c7dc5f8c2d..de66fde4e0c1656fc31c71d8c56021c79897af59 100644
--- a/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
-#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodJoinHistogramImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodJoinHistogramImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
index f51d0fd63847267d0fe8068320756e969a231e7f..31ab0126933ae6d6194c78b8e7269f6d26a35ef8 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.h
@@ -181,7 +181,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerDistanceImageFilter.txx"
+#include "otbKullbackLeiblerDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
index 3e5bdf3e57dca2daa31c9093b2dfb1810d12bb7f..e3f873005757443aa8ccaea8869b3952d21183fb 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerDistanceImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKullbackLeiblerDistanceImageFilter_txx
-#define otbKullbackLeiblerDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerDistanceImageFilter_hxx
+#define otbKullbackLeiblerDistanceImageFilter_hxx
 
 #include "otbKullbackLeiblerDistanceImageFilter.h"
 #include <vector>
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
index ee680d2eddd2fada1200e2acbc2fa7b9b9d205dc..b3afb8c382e677d8e64be6722d4785f2dcb89279 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.h
@@ -198,7 +198,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerProfileImageFilter.txx"
+#include "otbKullbackLeiblerProfileImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
index 75fa419841dfbf277f01efeafe7192c904fe267e..2539453c2e90b04dab703eec31623c2d8888be12 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerProfileImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKullbackLeiblerProfileImageFilter_txx
-#define otbKullbackLeiblerProfileImageFilter_txx
+#ifndef otbKullbackLeiblerProfileImageFilter_hxx
+#define otbKullbackLeiblerProfileImageFilter_hxx
 
 #include <vector>
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
index 209d6e8b174d1dcdeb5e28159555b6a2955d686e..a24d9bf8ffe98a324b5417bce03d019d1db293d4 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.h
@@ -163,7 +163,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKullbackLeiblerSupervizedDistanceImageFilter.txx"
+#include "otbKullbackLeiblerSupervizedDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
index 58c8485b23839aa1a999899d392ee01cf2f30104..58c169e892fabe4a0a4c7f23c71cb5c34dfd9f52 100644
--- a/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbKullbackLeiblerSupervizedDistanceImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_txx
-#define otbKullbackLeiblerSupervizedDistanceImageFilter_txx
+#ifndef otbKullbackLeiblerSupervizedDistanceImageFilter_hxx
+#define otbKullbackLeiblerSupervizedDistanceImageFilter_hxx
 
 #include "otbKullbackLeiblerSupervizedDistanceImageFilter.h"
 
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
index a89729f0ab63f55b1bc0625387b61e1d61b02277..0f761cd7758bf4a7da5bca74368dea050d047c05 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.h
@@ -179,7 +179,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultivariateAlterationDetectorImageFilter.txx"
+#include "otbMultivariateAlterationDetectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
index 6506c91cca9d35a6b36fc43e429c1f1ad1980dbf..5caa2b0012d4da3e2f98c11aa5304e31993b7ec2 100644
--- a/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
+++ b/Modules/Filtering/ChangeDetection/include/otbMultivariateAlterationDetectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultivariateAlterationDetectorImageFilter_txx
-#define otbMultivariateAlterationDetectorImageFilter_txx
+#ifndef otbMultivariateAlterationDetectorImageFilter_hxx
+#define otbMultivariateAlterationDetectorImageFilter_hxx
 
 #include "otbMultivariateAlterationDetectorImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
index 39d5f44fcd63d571640dd2d7615e51779c42f868..97736c319357281d2d9cc0a6d45f9d2e689b3d45 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.h
@@ -74,7 +74,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReliefColormapFunctor.txx"
+#include "otbReliefColormapFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
index 673607d9695cbb7939333608717cadc9d415cacf..502703ebd3648077a3a55eec7bc75998523d30db 100644
--- a/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
+++ b/Modules/Filtering/ColorMap/include/otbReliefColormapFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReliefColormapFunctor_txx
-#define otbReliefColormapFunctor_txx
+#ifndef otbReliefColormapFunctor_hxx
+#define otbReliefColormapFunctor_hxx
 
 #include "otbReliefColormapFunctor.h"
 
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
index 1282cda0b671b360d3d3966bc170c50ce9906b67..d71152df1c40bfcde447e2a399db46df840a9ada 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.h
@@ -171,7 +171,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbScalarToRainbowRGBPixelFunctor.txx"
+#include "otbScalarToRainbowRGBPixelFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
index f31937ac5fa9c97be06efbcb96959c985e857cf8..b21e4e2ae2d208a4ddd46d756d47b0a3901f0c99 100644
--- a/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
+++ b/Modules/Filtering/ColorMap/include/otbScalarToRainbowRGBPixelFunctor.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbScalarToRainbowRGBPixelFunctor_txx
-#define otbScalarToRainbowRGBPixelFunctor_txx
+#ifndef otbScalarToRainbowRGBPixelFunctor_hxx
+#define otbScalarToRainbowRGBPixelFunctor_hxx
 
 #include "otbScalarToRainbowRGBPixelFunctor.h"
 
diff --git a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
index c735725382971d33b31273edcffcda0316184db0..89deb206440993133ec4b36a099e8026b5418185 100644
--- a/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
+++ b/Modules/Filtering/Contrast/include/otbApplyGainFilter.h
@@ -138,7 +138,7 @@ private :
 }  // End namespace otb
   
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbApplyGainFilter.txx"
+#include "otbApplyGainFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx b/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
index 28bd851c0dbc83959e497147b413fb4cc8ad224b..4036de756b19d2ccc2e6b556e3478bb5297a81c8 100644
--- a/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbApplyGainFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbApplyGainFilter_txx
-#define otbApplyGainFilter_txx
+#ifndef otbApplyGainFilter_hxx
+#define otbApplyGainFilter_hxx
 
 #include "otbApplyGainFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
index edd5167a9b901f069f0f63658f12255d8037a697..d8fe0d2c66353d22bf1c5ee224479ec774acb8c5 100644
--- a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
+++ b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.h
@@ -179,7 +179,7 @@ private :
 }  // End namespace otb
   
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCLHistogramEqualizationFilter.txx"
+#include "otbCLHistogramEqualizationFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
index f5cbebd96ba57b459509f3434e8d26ff61497f5b..d2f945b1408a032e4e01183a4c3ad09a03ff99af 100644
--- a/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbCLHistogramEqualizationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCLHistogramEqualizationFilter_txx
-#define otbCLHistogramEqualizationFilter_txx
+#ifndef otbCLHistogramEqualizationFilter_hxx
+#define otbCLHistogramEqualizationFilter_hxx
 
 #include "otbCLHistogramEqualizationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
index 5a4c088dbc517565006fbc0c33492c8b9ebfdacd..0dd3c07c998d94661d98b83a88c534be9d6d9c56 100644
--- a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
+++ b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.h
@@ -122,7 +122,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComputeGainLutFilter.txx"
+#include "otbComputeGainLutFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
index ccf1b857528fb6cd5d85512545a9eacad24fc895..2491a7a1608279d6872dee559c0b78e2ea12ccdd 100644
--- a/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbComputeGainLutFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComputeGainLutFilter_txx
-#define otbComputeGainLutFilter_txx
+#ifndef otbComputeGainLutFilter_hxx
+#define otbComputeGainLutFilter_hxx
 
 #include "otbComputeGainLutFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
index 2f54203b2458a43ebb39c8dcad41e94ae4569a03..5068cae0ab82336f90a67989ff4c58a7e22e9850 100644
--- a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
+++ b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.h
@@ -154,7 +154,7 @@ private:
 }  // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbComputeHistoFilter.txx"
+#include "otbComputeHistoFilter.hxx"
 #endif
   
 #endif
diff --git a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
index c29b223c648ba16b16caac2ec38431474898d233..1360b66030d2d6748341066c342f7093190735a1 100644
--- a/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
+++ b/Modules/Filtering/Contrast/include/otbComputeHistoFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbComputeHistoFilter_txx
-#define otbComputeHistoFilter_txx
+#ifndef otbComputeHistoFilter_hxx
+#define otbComputeHistoFilter_hxx
 
 #include "otbComputeHistoFilter.h"
 
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
index f7c9c1206e08680ef83c0380d6e0124c9116b071..b664e67143d5d30c06b30b162ec5a04644818cb9 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConvolutionImageFilter.txx"
+#include "otbConvolutionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
index 95abd812757b75f058415d34366a0d94ec40e1bf..09934d80b65372364017b23fd7a5cea41116053a 100644
--- a/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
+++ b/Modules/Filtering/Convolution/include/otbConvolutionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConvolutionImageFilter_txx
-#define otbConvolutionImageFilter_txx
+#ifndef otbConvolutionImageFilter_hxx
+#define otbConvolutionImageFilter_hxx
 #include "otbConvolutionImageFilter.h"
 
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
index edd770eb4bb191a468909dbb689123a242fdec76..546ba8229ac54fc96c52352f8c708278e2e30f2f 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.h
@@ -149,7 +149,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaborFilterGenerator.txx"
+#include "otbGaborFilterGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
index 8e22f2fa6d700bb513d71f7decfb8203c40519ec..03cea48f91c442d00512f11f01052fdee60d4bef 100644
--- a/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
+++ b/Modules/Filtering/Convolution/include/otbGaborFilterGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaborFilterGenerator_txx
-#define otbGaborFilterGenerator_txx
+#ifndef otbGaborFilterGenerator_hxx
+#define otbGaborFilterGenerator_hxx
 
 #include "otbGaborFilterGenerator.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
index d806a1782b3bd63b2d95c64b2a48a4e695e68c54..4c51f8c72de49113a2fa374436e4af02ff2a3271 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.h
@@ -179,7 +179,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOverlapSaveConvolutionImageFilter.txx"
+#include "otbOverlapSaveConvolutionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
index cf17fc776aed2f153f2c1cc0740fe30556f18e3c..0c2ce7774d484efc6a2047350ce73b9c5b1b1389 100644
--- a/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
+++ b/Modules/Filtering/Convolution/include/otbOverlapSaveConvolutionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOverlapSaveConvolutionImageFilter_txx
-#define otbOverlapSaveConvolutionImageFilter_txx
+#ifndef otbOverlapSaveConvolutionImageFilter_hxx
+#define otbOverlapSaveConvolutionImageFilter_hxx
 
 #include "itkConfigure.h"
 
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
index 110850719e3582fb0deee6134410290cb7789be0..7778236afb116ab14bc64410c03110fac60a9073 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.h
@@ -165,7 +165,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDEMCaracteristicsExtractor.txx"
+#include "otbDEMCaracteristicsExtractor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
index a8fd3e49f25cb5276b3d57a502b3b3927669cfe1..227381aff1101b0f4c024d22ebb276248a105c36 100644
--- a/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
+++ b/Modules/Filtering/DEM/include/otbDEMCaracteristicsExtractor.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDEMCaracteristicsExtractor_txx
-#define otbDEMCaracteristicsExtractor_txx
+#ifndef otbDEMCaracteristicsExtractor_hxx
+#define otbDEMCaracteristicsExtractor_hxx
 
 #include "otbDEMCaracteristicsExtractor.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
index 7b9866c51c52e77f2a2acf5a2141d2152fcc9d62..3f6d97d971f9e03167a6b3c97b8f9521a6f4c010 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.h
@@ -201,7 +201,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDEMToImageGenerator.txx"
+#include "otbDEMToImageGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
index 140fd20416acd50bd9b706a8228068fb740cb8ed..87f197cca9ef7034d688548aec2f1e75f5e7204b 100644
--- a/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
+++ b/Modules/Filtering/DEM/include/otbDEMToImageGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDEMToImageGenerator_txx
-#define otbDEMToImageGenerator_txx
+#ifndef otbDEMToImageGenerator_hxx
+#define otbDEMToImageGenerator_hxx
 
 #include "otbDEMToImageGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
index 5dd2c46622753be63784a0922939aaf453399503..83c722186381bdc74f034d87f08d33b5b226ec67 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.h
@@ -105,7 +105,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionBinaryImageFilter.txx"
+#include "otbAngularProjectionBinaryImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
index bd4ee67c120ce5da62e1584133728c57fc87e909..768f895475e5f403c821c57cb4288adfd9d4d610 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionBinaryImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionBinaryImageFilter_txx
-#define otbAngularProjectionBinaryImageFilter_txx
+#ifndef otbAngularProjectionBinaryImageFilter_hxx
+#define otbAngularProjectionBinaryImageFilter_hxx
 #include "otbAngularProjectionBinaryImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
index 4a8a4f906cf1b462e15f2079ce6b74f974a76165..d253c2e342fcb42c1116cafaba4006c850f6301c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.h
@@ -108,7 +108,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionImageFilter.txx"
+#include "otbAngularProjectionImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
index bb9195c9c0b2cc31e96ddda62ea156ad7cd77fe4..b4885472d422b03f96e24d007e8c902a2ec4fc9b 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionImageFilter_txx
-#define otbAngularProjectionImageFilter_txx
+#ifndef otbAngularProjectionImageFilter_hxx
+#define otbAngularProjectionImageFilter_hxx
 #include "otbAngularProjectionImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
index 9a8bdd9e4f2cfb3a9a4b5ec8147717e67d4ae34b..de6eea92eb8425738a9cce3a0667ab373be23ae8 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.h
@@ -142,7 +142,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAngularProjectionSetImageFilter.txx"
+#include "otbAngularProjectionSetImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
index 7bbda45c4f979a3d74364495079c85301386b13f..126c38b4d4242a14656492b5a053ecc97e08599f 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbAngularProjectionSetImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAngularProjectionSetImageFilter_txx
-#define otbAngularProjectionSetImageFilter_txx
+#ifndef otbAngularProjectionSetImageFilter_hxx
+#define otbAngularProjectionSetImageFilter_hxx
 #include "otbAngularProjectionSetImageFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
index 54287e49afce8b4a903806ee71d1aa9164bd2335..a7be9ed88be05e5346e3326cca8ba10879f70c0c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.h
@@ -115,7 +115,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEstimateInnerProductPCAImageFilter.txx"
+#include "otbEstimateInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
index 3bf3fcdcf61290068821755bcd65916f33b72e26..d02f8cc5a7d225ff88dfbcbe8dc741b484873632 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbEstimateInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEstimateInnerProductPCAImageFilter_txx
-#define otbEstimateInnerProductPCAImageFilter_txx
+#ifndef otbEstimateInnerProductPCAImageFilter_hxx
+#define otbEstimateInnerProductPCAImageFilter_hxx
 
 #include "otbEstimateInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
index 064032466a5923cc736da7ac7979ff3775311e58..0d037136fa20d879a8082a61544559dc1654a0f7 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.h
@@ -199,7 +199,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFastICAImageFilter.txx"
+#include "otbFastICAImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
index d0a793bb8c64e7cb6edf61a1a0756568916ec2fe..e3c432eb2569896e9ad0234268d0647aeea21aec 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFastICAImageFilter_txx
-#define otbFastICAImageFilter_txx
+#ifndef otbFastICAImageFilter_hxx
+#define otbFastICAImageFilter_hxx
 
 #include "otbFastICAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
index 30be138c35fafc88a7ad0b1ca80d54856d376946..c49130b3e6bd7104186ddcf40188345fac306980 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.h
@@ -123,7 +123,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFastICAInternalOptimizerVectorImageFilter.txx"
+#include "otbFastICAInternalOptimizerVectorImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
index d27232d588bbe35fd971860e30e0028c443b4db7..532e649979cda35711f583923a7d77215ac54373 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbFastICAInternalOptimizerVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFastICAInternalOptimizerVectorImageFilter_txx
-#define otbFastICAInternalOptimizerVectorImageFilter_txx
+#ifndef otbFastICAInternalOptimizerVectorImageFilter_hxx
+#define otbFastICAInternalOptimizerVectorImageFilter_hxx
 #include "otbFastICAInternalOptimizerVectorImageFilter.h"
 
 #include <itkMacro.h>
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
index c0cdfd353c6be6b85f6c3c7042fdd0387db04cbe..59b921cb4eda0b75a5f38dca4018ce0aa33fc1ef 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.h
@@ -167,7 +167,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbInnerProductPCAImageFilter.txx"
+#include "otbInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
index 10f098ee6b546bee946f272f971c64ebd7924a4d..c54bc7f31e029733ce2473899f522ffba02bdfff 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbInnerProductPCAImageFilter_txx
-#define otbInnerProductPCAImageFilter_txx
+#ifndef otbInnerProductPCAImageFilter_hxx
+#define otbInnerProductPCAImageFilter_hxx
 
 #include "otbInnerProductPCAImageFilter.h"
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
index 5fb0c7812ae5a8b0673adf525e1ddb37371cfa50..189f853a3a286f98bec765a2fc4170efb1e6382c 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.h
@@ -210,7 +210,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMNFImageFilter.txx"
+#include "otbMNFImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
index 5f6317bc240d660150eda14920d11ad870752bd9..e9a03578e61a53f48f144c1579779fccad071577 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMNFImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMNFImageFilter_txx
-#define otbMNFImageFilter_txx
+#ifndef otbMNFImageFilter_hxx
+#define otbMNFImageFilter_hxx
 #include "otbMNFImageFilter.h"
 
 #include "itkMacro.h"
@@ -500,6 +500,6 @@ MNFImageFilter< TInputImage, TOutputImage, TNoiseImageFilter, TDirectionOfTransf
 
 } // end of namespace otb
 
-#endif // otbMNFImageFilter_txx
+#endif // otbMNFImageFilter_hxx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
index d9fa6f3c7216a344d3fb1a90784812f87dc40000..7690839a5713333409e8175b1fcc7c455e4fabde 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.h
@@ -168,7 +168,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaximumAutocorrelationFactorImageFilter.txx"
+#include "otbMaximumAutocorrelationFactorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
index 27bd86488be66477fafecd80355978e37237617c..ed6b2a476ee91944142e78023efce158b9131a82 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbMaximumAutocorrelationFactorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaximumAutocorrelationFactorImageFilter_txx
-#define otbMaximumAutocorrelationFactorImageFilter_txx
+#ifndef otbMaximumAutocorrelationFactorImageFilter_hxx
+#define otbMaximumAutocorrelationFactorImageFilter_hxx
 
 #include "otbMaximumAutocorrelationFactorImageFilter.h"
 #include "otbMultiChannelExtractROI.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
index 791d9cc993a9b09c941ae74f11b9d33a1130e6dd..77108d35682f95c59af8627b4c710e6f2debd7a0 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.h
@@ -98,7 +98,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNAPCAImageFilter.txx"
+#include "otbNAPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
index bedbf28d7e800b7fa6c681a44bcd6a1283dd985f..b4edb9b64955f615f9a2ef49b48671dba9c520cb 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNAPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNAPCAImageFilter_txx
-#define otbNAPCAImageFilter_txx
+#ifndef otbNAPCAImageFilter_hxx
+#define otbNAPCAImageFilter_hxx
 #include "otbNAPCAImageFilter.h"
 
 #include "itkMacro.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
index ed2e9055c980ad5b1b2a7f233faf15da68f2a5cf..8634a8803c93394e3835ba7ca0eaabc4a96eedbb 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.h
@@ -123,7 +123,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeInnerProductPCAImageFilter.txx"
+#include "otbNormalizeInnerProductPCAImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
index 4b3cb027f1a8ea6f66d9aa43e8c2d4ca432e2e5e..c3df8ebd49720766e50ec2302b1646ae558b95f6 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbNormalizeInnerProductPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeInnerProductPCAImageFilter_txx
-#define otbNormalizeInnerProductPCAImageFilter_txx
+#ifndef otbNormalizeInnerProductPCAImageFilter_hxx
+#define otbNormalizeInnerProductPCAImageFilter_hxx
 
 #include "otbNormalizeInnerProductPCAImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
index 4b64ed6c909d5d37def509122907339d981df6b2..93255c3d9c7e52af483901789b5ab069e1b323a5 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.h
@@ -216,7 +216,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAImageFilter.txx"
+#include "otbPCAImageFilter.hxx"
 #endif
 
 #endif // otbPCAImageFilter_h
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
index 722630fb2b12414658a63754a007ae041f5d2952..1d645a225dae1b927684af1348cd9a3196d073a1 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbPCAImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPCAImageFilter_txx
-#define otbPCAImageFilter_txx
+#ifndef otbPCAImageFilter_hxx
+#define otbPCAImageFilter_hxx
 #include "otbPCAImageFilter.h"
 
 #include "itkMacro.h"
@@ -481,6 +481,6 @@ PCAImageFilter< TInputImage, TOutputImage, TDirectionOfTransformation >
 
 } // end of namespace otb
 
-#endif // otbPCAImageFilter_txx
+#endif // otbPCAImageFilter_hxx
 
 
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
index c419eb0937c25c411039c53aac426d1dff49a05c..b31ab79a0b8f2cde931f99e2270c6915f1121439 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.h
@@ -135,7 +135,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSparseWvltToAngleMapperListFilter.txx"
+#include "otbSparseWvltToAngleMapperListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
index 70a12f8d31dde198148c0a3e79ce44ff1e061333..0c034e24877da4bc08871d0c6bd711937d79e866 100644
--- a/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
+++ b/Modules/Filtering/DimensionalityReduction/include/otbSparseWvltToAngleMapperListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSparseWvltToAngleMapperListFilter_txx
-#define otbSparseWvltToAngleMapperListFilter_txx
+#ifndef otbSparseWvltToAngleMapperListFilter_hxx
+#define otbSparseWvltToAngleMapperListFilter_hxx
 #include "otbSparseWvltToAngleMapperListFilter.h"
 
 #include <vnl/vnl_math.h>
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
index be6ed177f372bb0d660275ba6a0104518c446bfc..4003d83c8fdbf2d9c91597d7f231c8db94bafa65 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.h
@@ -162,7 +162,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
index a451d910ef72bc6d01ecffd2d4a6c3af34b130c2..a378f335664c796207009c551f71f237fda7f3d3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodImageFilter_txx
-#define otbBinaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
index 716ddffc5f9084ec0dc9cd724b9d2ae7e7258bc7..43e809b825c4603ef78d4b5e8f830926443fd845 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.h
@@ -151,7 +151,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryFunctorNeighborhoodVectorImageFilter.txx"
+#include "otbBinaryFunctorNeighborhoodVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
index d3c17f5dfc3dabb0c594591db88106b8c3403af9..106a270bb0b25e7d97ae2cdb70bcb445d7a6a1f4 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryFunctorNeighborhoodVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_txx
-#define otbBinaryFunctorNeighborhoodVectorImageFilter_txx
+#ifndef otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
+#define otbBinaryFunctorNeighborhoodVectorImageFilter_hxx
 
 #include "otbBinaryFunctorNeighborhoodVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
index 2bff0830a2c90e8a24665d799579f77671df1e1d..c8ed0191387501b6c54128d4252daa79e3dab4e6 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbBinaryImageDensityFunction.txx"
+# include "otbBinaryImageDensityFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
index 03df3697217207af3e4b780fdcb0e2d580913fd0..1091d353376e7b71b99ffbf15ec49320b8af5d14 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageDensityFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbBinaryImageDensityFunction_txx
-#define otbBinaryImageDensityFunction_txx
+#ifndef otbBinaryImageDensityFunction_hxx
+#define otbBinaryImageDensityFunction_hxx
 
 #include "otbBinaryImageDensityFunction.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
index d92770582b2d6b5ffb03a094dec816e9025ac5c2..fff4c754703d144fb2cdb9aea8c8c2746b740e2a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.h
@@ -88,7 +88,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryImageMinimalBoundingRegionCalculator.txx"
+#include "otbBinaryImageMinimalBoundingRegionCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
index 653edcdd6bd54abeecc0ef3af9ad67b7e1223f68..9599fdddafad3e298a09926632c605e1e53b18ee 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageMinimalBoundingRegionCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryImageMinimalBoundingRegionCalculator_txx
-#define otbBinaryImageMinimalBoundingRegionCalculator_txx
+#ifndef otbBinaryImageMinimalBoundingRegionCalculator_hxx
+#define otbBinaryImageMinimalBoundingRegionCalculator_hxx
 
 #include "otbBinaryImageMinimalBoundingRegionCalculator.h"
 #include "itkImageSliceConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
index c4643f0fe926f5253b4f5fbf980bed2fb28385f2..284f373d33019d1a81f8f8832525b522fe6bc876 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.h
@@ -102,7 +102,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBinaryImageToDensityImageFilter.txx"
+#include "otbBinaryImageToDensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
index b7dbfbdb516881f8f68e77d863bdbe2f85f3b61c..fce404674ae70b9e8aabe4b8ac0d88a9a3e69448 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBinaryImageToDensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBinaryImageToDensityImageFilter_txx
-#define otbBinaryImageToDensityImageFilter_txx
+#ifndef otbBinaryImageToDensityImageFilter_hxx
+#define otbBinaryImageToDensityImageFilter_hxx
 
 #include "otbBinaryImageToDensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
index 1bd82ea6ddbf899a3c94e17e3da7d281ee9f18c0..81b44f3a73a300d5dee99628f2c076e1fae01cf3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.h
@@ -117,7 +117,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoxAndWhiskerImageFilter.txx"
+#include "otbBoxAndWhiskerImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
index adf2a0157857fe3ade25d71e122c766e841f8215..6329fc7cbc616cbfe1af158c9994c8c112ae8b7c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbBoxAndWhiskerImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoxAndWhiskerImageFilter_txx
-#define otbBoxAndWhiskerImageFilter_txx
+#ifndef otbBoxAndWhiskerImageFilter_hxx
+#define otbBoxAndWhiskerImageFilter_hxx
 
 #include <vector>
 #include <algorithm>
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
index 513067e457afe38abb03d6ab6d538b2c0fcf8b88..0239a072245c4c52a3ff9a04db15c3c26aea0d98 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.h
@@ -86,7 +86,7 @@ private:
 } // End of namespace OTB
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbChangeInformationImageFilter.txx"
+#include "otbChangeInformationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
index c4453be60830ef3ae148e57d6ebc94cf0ce27046..f468a4c4c9136f9ec56e0d1bd8cba05c0faf22af 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeInformationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbChangeInformationImageFilter_txx
-#define otbChangeInformationImageFilter_txx
+#ifndef otbChangeInformationImageFilter_hxx
+#define otbChangeInformationImageFilter_hxx
 
 #include "otbChangeInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
index 61b28b941595d3abf1cf9552b51c89155237ff09..1ccd64c49470b01f7c736d1cb1d521a9704445f2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbChangeLabelImageFilter.txx"
+#include "otbChangeLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
index f77931d96eb61159222a015f7b54718f2c5e12f3..9e89f90a77eff3d65b1d1cc2f03bf930d748e186 100644
--- a/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbChangeLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbChangeLabelImageFilter_txx
-#define otbChangeLabelImageFilter_txx
+#ifndef otbChangeLabelImageFilter_hxx
+#define otbChangeLabelImageFilter_hxx
 
 #include "otbChangeLabelImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
index 478eb952220a8cf08eed6b8550114d2053ba2ccd..ff96f83908e63708e93c0cabe8a937544bc64255 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClampImageFilter.txx"
+#include "otbClampImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
index b1ac37e2e3df315e4b2e402f9034a73ef25a4665..e7c78d0ead1e43cd502f1b676c1c562b646d87a5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbClampImageFilter_txx
-#define otbClampImageFilter_txx
+#ifndef otbClampImageFilter_hxx
+#define otbClampImageFilter_hxx
 
 #include "otbClampImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
index 2703b00568c8d2dd47bc9e91483e59b16ce8b0e5..57c3b7c3cf418cbb3da2d28d1832c6637ff33ea5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.h
@@ -145,7 +145,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClampVectorImageFilter.txx"
+#include "otbClampVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
index 6c8377af30ca45acf41183ad98e5b6cbe8ea4df7..438df2397fd6aa3f9c2c9081e4cfd17eb2e22cd8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbClampVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbClampVectorImageFilter_txx
-#define otbClampVectorImageFilter_txx
+#ifndef otbClampVectorImageFilter_hxx
+#define otbClampVectorImageFilter_hxx
 
 #include "otbClampVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
index 16fd357f767b6f84767ec8d75a53b9aa78c770c1..4c3a747ab43b5d3b676c1917a690cf6b25053aa5 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateScalarValueImageFilter.txx"
+#include "otbConcatenateScalarValueImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
index c248ff00de6503f7ae616e9e9209ddb695230092..07be0e4712acc38e791027e1ba6769361e2fc3ea 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateScalarValueImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateScalarValueImageFilter_txx
-#define otbConcatenateScalarValueImageFilter_txx
+#ifndef otbConcatenateScalarValueImageFilter_hxx
+#define otbConcatenateScalarValueImageFilter_hxx
 
 #include "otbConcatenateScalarValueImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
index 4b3ca239f29a50bb460e0bc73c9a2259b03091ac..266e5689dbecd75b676adb20f2fcadfd744b6cdd 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.h
@@ -109,6 +109,6 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateVectorImageFilter.txx"
+#include "otbConcatenateVectorImageFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
index 868b1f82a70f627a0bce1376501edc8fae43850b..6e7ae0596a5b62bd89650a6874881659783234ca 100644
--- a/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbConcatenateVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateVectorImageFilter_txx
-#define otbConcatenateVectorImageFilter_txx
+#ifndef otbConcatenateVectorImageFilter_hxx
+#define otbConcatenateVectorImageFilter_hxx
 
 #include "otbConcatenateVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
index 3fe2d4f77a78dbb1a9c3500f82ec9838a6fe98cb..452027fe34bf0079297998f7323fb32cae7e2622 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.h
@@ -101,7 +101,7 @@ protected:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEuclideanDistanceMetricWithMissingValuePow2.txx"
+#include "otbEuclideanDistanceMetricWithMissingValuePow2.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
index 22e30334d5428c14017c099564cfad4451f40920..053afd50a160b6d3007668c6c0e1baae0637ce4c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbEuclideanDistanceMetricWithMissingValuePow2.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_txx
-#define otbEuclideanDistanceMetricWithMissingValuePow2_txx
+#ifndef otbEuclideanDistanceMetricWithMissingValuePow2_hxx
+#define otbEuclideanDistanceMetricWithMissingValuePow2_hxx
 
 #include "otbEuclideanDistanceMetricWithMissingValuePow2.h"
 #include "itkMeasurementVectorTraits.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
index 3a703c921a1a0878431e3e99c68dac43938e564a..b066bfb6130df3168b2a32424eeddb0a5f668bc2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.h
@@ -116,7 +116,7 @@ double FlexibleDistanceWithMissingValue<TVector>::Beta = 2.0;
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFlexibleDistanceWithMissingValue.txx"
+#include "otbFlexibleDistanceWithMissingValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
index 530107c381227a0534fcca9613cba7ea8c912dc3..80649d8abae360bc9096160cd5750158a5275b94 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbFlexibleDistanceWithMissingValue.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbFlexibleDistanceWithMissingValue_txx
-#define otbFlexibleDistanceWithMissingValue_txx
+#ifndef otbFlexibleDistanceWithMissingValue_hxx
+#define otbFlexibleDistanceWithMissingValue_hxx
 
 #include "otbFlexibleDistanceWithMissingValue.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
index 3491ffa70638396c9bd270bc1301285f5d5ec8d1..e7058153076582fc07abc33b57ecfbcd1fb3ce7f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.h
@@ -155,7 +155,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFunctionWithNeighborhoodToImageFilter.txx"
+#include "otbFunctionWithNeighborhoodToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
index fcf6697cb14a2df691b756580daca7915406489e..c273425f3133f5f015a91c6309fdd960009482de 100644
--- a/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbFunctionWithNeighborhoodToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFunctionWithNeighborhoodToImageFilter_txx
-#define otbFunctionWithNeighborhoodToImageFilter_txx
+#ifndef otbFunctionWithNeighborhoodToImageFilter_hxx
+#define otbFunctionWithNeighborhoodToImageFilter_hxx
 
 #include "otbFunctionWithNeighborhoodToImageFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
index 8acc6ecbf418fb734d6669b8c3106a561d99555a..ad8cc78e00ab6e5bed6da74f5ea0a5b738efdd1d 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.h
@@ -216,7 +216,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGridResampleImageFilter.txx"
+#include "otbGridResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
index a8cad22025b8054548f5ef5b5367f3a4a0a8c082..df609b6a8c136fabc7270a8c5fbe73e049518459 100644
--- a/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbGridResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGridResampleImageFilter_txx
-#define otbGridResampleImageFilter_txx
+#ifndef otbGridResampleImageFilter_hxx
+#define otbGridResampleImageFilter_hxx
 
 #include "otbGridResampleImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h b/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
index 5f63908f5d2ca0584370c92ac5a7bdb1ef557010..c3ed65d6508c05555962fbb588084cdec3c951b8 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMaskedIteratorDecorator.h
@@ -128,7 +128,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskedIteratorDecorator.txx"
+#include "otbMaskedIteratorDecorator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
index db2bd2da37dcc206e43b6ca08e67f8f566282768..8535271c4333ead6f1b4fb9770e4dddc9f6c495e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.h
@@ -145,7 +145,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMatrixImageFilter.txx"
+#include "otbMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
index f1be743978e7ac8092d4995197c1526d515d9c49..2d5a0e20ca78ffdcdc852312e03575a44b8764d1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbMatrixImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMatrixImageFilter_txx
-#define otbMatrixImageFilter_txx
+#ifndef otbMatrixImageFilter_hxx
+#define otbMatrixImageFilter_hxx
 
 #include "otbMatrixImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
index 5bd1a876c62f49bec2555a456ba874ee1575d7b5..40b3149dd98f7956e07dd81bbbd3fcbf7e5e127f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNRIBandImagesToOneNComplexBandsImage.txx"
+#include "otbNRIBandImagesToOneNComplexBandsImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
index b10623b27b7e1345b7d414020363daaa2b124cfd..3dcfa2d4f172ef84fe1bbda5940b8afef47e8703 100644
--- a/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbNRIBandImagesToOneNComplexBandsImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNRIBandImagesToOneNComplexBandsImage_txx
-#define otbNRIBandImagesToOneNComplexBandsImage_txx
+#ifndef otbNRIBandImagesToOneNComplexBandsImage_hxx
+#define otbNRIBandImagesToOneNComplexBandsImage_hxx
 
 #include "otbNRIBandImagesToOneNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
index 07ee23869343fc4530b53820c17d58c20abb65d5..5ce3c6994d28a8364af1f3c07ddfb52779cfa9bd 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOneRIBandImageToOneComplexBandImage.txx"
+#include "otbOneRIBandImageToOneComplexBandImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
index fee16d1c714df342132367e0189d4bf1931aa3b4..648ed0eb75d2e4296946df8c707a83e24649a6b9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbOneRIBandImageToOneComplexBandImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOneRIBandImageToOneComplexBandImage_txx
-#define otbOneRIBandImageToOneComplexBandImage_txx
+#ifndef otbOneRIBandImageToOneComplexBandImage_hxx
+#define otbOneRIBandImageToOneComplexBandImage_hxx
 
 #include "otbOneRIBandImageToOneComplexBandImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
index 10e25c7f38cf295bd85b8bb1e6d98609070aaa0c..899f6819188781f5587266eb7d83e5093a5dad2a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.h
@@ -119,7 +119,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPerBandVectorImageFilter.txx"
+#include "otbPerBandVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
index d551fea721a2c6bcd30ed0ce7b936064c00b2a9a..d63c6e9cd0520d9ea96ad12e73fc559e19300d2c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbPerBandVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPerBandVectorImageFilter_txx
-#define otbPerBandVectorImageFilter_txx
+#ifndef otbPerBandVectorImageFilter_hxx
+#define otbPerBandVectorImageFilter_hxx
 
 #include "otbPerBandVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
index 346a34f2ffb09ce39ed05f1a3ca4fd0cdda4a3d1..127a16288908c02cc8d7b42cd30f949b757f962c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.h
@@ -266,7 +266,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPrintableImageFilter.txx"
+#include "otbPrintableImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
index fb17ea44e705e50b4ad5181010b67488a6770666..1ecc701de4305549e5c447b97d10e29fe76fd99c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbPrintableImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPrintableImageFilter_txx
-#define otbPrintableImageFilter_txx
+#ifndef otbPrintableImageFilter_hxx
+#define otbPrintableImageFilter_hxx
 
 #include "otbPrintableImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
index 5924b31d006987addf5fd8114362acea8d61cf6a..ae74603e1fdbbc3a5afad153deb7d0415cf487ae 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.h
@@ -220,7 +220,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShiftScaleVectorImageFilter.txx"
+#include "otbShiftScaleVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
index 0f32bad76277d3d6b14464e2ef2c2ea7ad38b1e5..97bb3c84bc87dc97013c6d654d2204ab1b3900d1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbShiftScaleVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShiftScaleVectorImageFilter_txx
-#define otbShiftScaleVectorImageFilter_txx
+#ifndef otbShiftScaleVectorImageFilter_hxx
+#define otbShiftScaleVectorImageFilter_hxx
 
 #include "otbShiftScaleVectorImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
index 3efa48850e52636f42685b8281f8c0ba0e814ad3..c5d7e7ee4ec98a2ff7269a917d6cea7b45a2c3e2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.h
@@ -111,7 +111,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralAngleDistanceImageFilter.txx"
+#include "otbSpectralAngleDistanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
index a3d3308042a34f9a6a695d4e1c67f72c5d391a24..138bc5caf68339fff12da010580ccea114a157cc 100644
--- a/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbSpectralAngleDistanceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralAngleDistanceImageFilter_txx
-#define otbSpectralAngleDistanceImageFilter_txx
+#ifndef otbSpectralAngleDistanceImageFilter_hxx
+#define otbSpectralAngleDistanceImageFilter_hxx
 
 #include "otbSpectralAngleDistanceImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
index 48eec84de72bb837091c64674f81f6c5dfa93078..a21d06af0734a11b38d6cb001a8e70c53fb5c47f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.h
@@ -228,7 +228,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingInnerProductVectorImageFilter.txx"
+#include "otbStreamingInnerProductVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
index f3b0d7db692a805e2270d5fca643651613729228..6832e46636cd2a2710391b1733d595ee9d66f5a7 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingInnerProductVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingInnerProductVectorImageFilter_txx
-#define otbStreamingInnerProductVectorImageFilter_txx
+#ifndef otbStreamingInnerProductVectorImageFilter_hxx
+#define otbStreamingInnerProductVectorImageFilter_hxx
 #include "otbStreamingInnerProductVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
index 6f03f9b757c897149889b3b0e5ec09461825e136..1b16426c8f8ce7828be9c0cc976f4fcc3c8e0c85 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.h
@@ -284,7 +284,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMatrixTransposeMatrixImageFilter.txx"
+#include "otbStreamingMatrixTransposeMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
index 80e2dafd50b828165054b71a7d6f0cc1629490e1..1f4937692c297883b40dcf38c899d2bb124ce029 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingMatrixTransposeMatrixImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMatrixTransposeMatrixImageFilter_txx
-#define otbStreamingMatrixTransposeMatrixImageFilter_txx
+#ifndef otbStreamingMatrixTransposeMatrixImageFilter_hxx
+#define otbStreamingMatrixTransposeMatrixImageFilter_hxx
 
 #include "otbStreamingMatrixTransposeMatrixImageFilter.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
index 19c15d4e6ce3514332bcbd908ee03b0497526f52..58f3b902637708783a81f72c3d1412bea13a1b4e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.h
@@ -201,7 +201,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingResampleImageFilter.txx"
+#include "otbStreamingResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
index 003425a9e3dddf0168b4390168b34dea493e6e0c..f02c31b010b43358635de7c2943799350d832ec6 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingResampleImageFilter_txx
-#define otbStreamingResampleImageFilter_txx
+#ifndef otbStreamingResampleImageFilter_hxx
+#define otbStreamingResampleImageFilter_hxx
 
 #include "otbStreamingResampleImageFilter.h"
 #include "itkProgressAccumulator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
index 972c2efe6cbe424b2db27b8c1882d9a6f47822e4..73bc7e7719f78250926a853bcd5b62ad4ddbe78c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.h
@@ -333,7 +333,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingShrinkImageFilter.txx"
+#include "otbStreamingShrinkImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
index 124f20e116d73ceddb3a065e54ba882f10809750..903dba1f18d3489b2edc7420bf1636aa672b454b 100644
--- a/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbStreamingShrinkImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingShrinkImageFilter_txx
-#define otbStreamingShrinkImageFilter_txx
+#ifndef otbStreamingShrinkImageFilter_hxx
+#define otbStreamingShrinkImageFilter_hxx
 
 #include "otbStreamingShrinkImageFilter.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
index 886e9bb811265932d5128cdbad868ae684fa1ab3..19aea6ea50dd77ac134461134c0cda328a1e7ea2 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.h
@@ -134,7 +134,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbThresholdVectorImageFilter.txx"
+#include "otbThresholdVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
index e15671051c0903a564a0e6db4c763a5c21a63795..5de3d800048b3fc756c67f302da19ca9815ca14a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbThresholdVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbThresholdVectorImageFilter_txx
-#define otbThresholdVectorImageFilter_txx
+#ifndef otbThresholdVectorImageFilter_hxx
+#define otbThresholdVectorImageFilter_hxx
 
 #include "otbThresholdVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
index 5cd29f76ab56ebed4f81e35b08c2d7b708900715..df01fbdbb1d79d48cc728ad796d7d02da9bd618e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.h
@@ -125,7 +125,7 @@ RegionType InputRegionToOutputRegion(unsigned int tileIndex, const RegionType &
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileImageFilter.txx"
+#include "otbTileImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
index 3a67aa469e4229a782c7d3db49c972c0b5b40daf..cb93986d56ff27be8d63e32eb4e8da36c1e58b81 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbTileImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileImageFilter_txx
-#define otbTileImageFilter_txx
+#ifndef otbTileImageFilter_hxx
+#define otbTileImageFilter_hxx
 
 #include "otbTileImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
index 67a727f2aa924935ca2b411d7a08821f1611cb0b..0d1b365925ec715171b17613514069a49636ed8f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.h
@@ -90,7 +90,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTwoNRIBandsImageToNComplexBandsImage.txx"
+#include "otbTwoNRIBandsImageToNComplexBandsImage.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
index 032074b135d18abd267be37b6d4feb4511612036..41422675eb189e87fea628343d7c5c98d4d46749 100644
--- a/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbTwoNRIBandsImageToNComplexBandsImage.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTwoNRIBandsImageToNComplexBandsImage_txx
-#define otbTwoNRIBandsImageToNComplexBandsImage_txx
+#ifndef otbTwoNRIBandsImageToNComplexBandsImage_hxx
+#define otbTwoNRIBandsImageToNComplexBandsImage_hxx
 
 #include "otbTwoNRIBandsImageToNComplexBandsImage.h"
 
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
index 811362868c53688c9afd64ba7fb24d49fc7cac8c..d54b63bb33049026998dedaa50c96043d3efb18c 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.h
@@ -153,7 +153,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
index 872b89801db6fd8d025d4e216583394b34e003d1..0f5ab33e28407f8c9d3703ea30a8ba21c1c4a715 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodImageFilter_txx
-#define otbUnaryFunctorNeighborhoodImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
index c46e4ed2bc44068694de823446f0635083518a21..03bb9e77cb894f36b94a62208674c3b8eeed0f8f 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h
@@ -169,7 +169,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.txx"
+#include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
index 52e9091042a4fc18b59750f64a9664dc4677d5ea..bdd8309470c0b20020732cfe0e491e85a8f833a9 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorNeighborhoodWithOffsetImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
-#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_txx
+#ifndef otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
+#define otbUnaryFunctorNeighborhoodWithOffsetImageFilter_hxx
 
 #include "otbUnaryFunctorNeighborhoodWithOffsetImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
index a6c5562dde6f6da6e57ea7fa23e779f9011fcdac..063b56ad002347b2a1bc872cabe88311053b89c3 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.h
@@ -140,7 +140,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryFunctorWithIndexImageFilter.txx"
+#include "otbUnaryFunctorWithIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
index 468da5f854da6c4355c7abcdcb50fba77bc312f1..6dbe19ef5b026a262a9379f902203e16641bab04 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryFunctorWithIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryFunctorWithIndexImageFilter_txx
-#define otbUnaryFunctorWithIndexImageFilter_txx
+#ifndef otbUnaryFunctorWithIndexImageFilter_hxx
+#define otbUnaryFunctorWithIndexImageFilter_hxx
 
 #include "otbUnaryFunctorWithIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
index f2519e2a59e64f256cbebcd4e33971b7c20e39f3..803dba3832c0f13835d9485eb0fa037afc7bcbba 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnaryImageFunctorWithVectorImageFilter.txx"
+#include "otbUnaryImageFunctorWithVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
index 2da18d31ef83c3bf164ba1386373100e861be94c..56319cf93ffc59f22702ff6fb67c7b8b33eed711 100644
--- a/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbUnaryImageFunctorWithVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnaryImageFunctorWithVectorImageFilter_txx
-#define otbUnaryImageFunctorWithVectorImageFilter_txx
+#ifndef otbUnaryImageFunctorWithVectorImageFilter_hxx
+#define otbUnaryImageFunctorWithVectorImageFilter_hxx
 
 #include "otbUnaryImageFunctorWithVectorImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
index 5f2bcc51f44649a618297880793f6bddc30e3307..923dcb2428ea212f9faccd18a36ee59c364f4e4e 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.h
@@ -96,7 +96,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageTo3DScalarImageFilter.txx"
+#include "otbVectorImageTo3DScalarImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
index 835c69de352c920ff003a7435e5d6745bfb6d946..f2f95199754da2c52f129256ba7cd7c083dfa70a 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorImageTo3DScalarImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageTo3DScalarImageFilter_txx
-#define otbVectorImageTo3DScalarImageFilter_txx
+#ifndef otbVectorImageTo3DScalarImageFilter_hxx
+#define otbVectorImageTo3DScalarImageFilter_hxx
 
 #include "otbVectorImageTo3DScalarImageFilter.h"
 #include "itkImageRegionConstIterator.h"
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
index a8ac2d4d5518915d1333e9d10f3d10cd9b6ad4e0..aec014512d71be463ed770e0c3bae14e8214cda1 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.h
@@ -294,7 +294,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorRescaleIntensityImageFilter.txx"
+#include "otbVectorRescaleIntensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
index fd477b0404863090e2c7504b81db866ed0d572db..2fde9765cec5fc26aeeb024ec8f205aa88848eaa 100644
--- a/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
+++ b/Modules/Filtering/ImageManipulation/include/otbVectorRescaleIntensityImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorRescaleIntensityImageFilter_txx
-#define otbVectorRescaleIntensityImageFilter_txx
+#ifndef otbVectorRescaleIntensityImageFilter_hxx
+#define otbVectorRescaleIntensityImageFilter_hxx
 
 #include "otbVectorRescaleIntensityImageFilter.h"
 #include "itkSampleToHistogramFilter.h"
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
index f92b1995aa5d69706ea601fdf380c8c29328e6a8..b06261f81357974ab46ccdfe460a419d52b0f919 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.h
@@ -129,7 +129,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFrostImageFilter.txx"
+#include "otbFrostImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
index a20e20bf7c92709ab4b0b6a36b42f08c730a0f10..ba9be08cf6094f01078b65ad99ff578bdbe897e4 100644
--- a/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbFrostImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFrostImageFilter_txx
-#define otbFrostImageFilter_txx
+#ifndef otbFrostImageFilter_hxx
+#define otbFrostImageFilter_hxx
 
 #include "otbFrostImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
index a8ff3d28f843152070bb777ea5c563728d46385b..da49c1ff7768bed1755859e04f4a2ea24d4c06d1 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGammaMAPImageFilter.txx"
+#include "otbGammaMAPImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
index fe8f34ad4f5192ea502405afc4751d8490177671..9020b330daebab1f17515aeda7dfee7c8a2910c7 100644
--- a/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbGammaMAPImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGammaMAPImageFilter_txx
-#define otbGammaMAPImageFilter_txx
+#ifndef otbGammaMAPImageFilter_hxx
+#define otbGammaMAPImageFilter_hxx
 
 #include "otbGammaMAPImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
index a5d6cfb7387bfbaeeb4180bf430b6e74716c5b80..d4a2f484685740cb8c6cc59a9b546564a219b52e 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKuanImageFilter.txx"
+#include "otbKuanImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
index 0e4a1a06db37b1c33520f2c26b39d50c6cf41c09..986673d4ea4e34d8481552cd4488437776d63c58 100644
--- a/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbKuanImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKuanImageFilter_txx
-#define otbKuanImageFilter_txx
+#ifndef otbKuanImageFilter_hxx
+#define otbKuanImageFilter_hxx
 
 #include "otbKuanImageFilter.h"
 
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
index f46d13da445dd6911b8da1ad6193f3b4f3bfb955..96cb6ebb0e35d6846e4ab16a1e4658b478139083 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLeeImageFilter.txx"
+#include "otbLeeImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
index fd1b764df9ad310030494acd0cf4c4e92f80af78..d04bcd1d164611b111d1e2c73c1c330116d0f4f2 100644
--- a/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
+++ b/Modules/Filtering/ImageNoise/include/otbLeeImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLeeImageFilter_txx
-#define otbLeeImageFilter_txx
+#ifndef otbLeeImageFilter_hxx
+#define otbLeeImageFilter_hxx
 
 #include "otbLeeImageFilter.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
index fdba89c8dd13df5b1d97eb9cfddbf1a496bd3e81..570c69b89cacac0b737bc61edcabe363dc5d6cec 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.h
@@ -157,7 +157,7 @@ private :
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandMathImageFilter.txx"
+#include "otbBandMathImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
index 919894cc95ca74f603d885179acdc8f5c0158343..03e95cae402f12ceb4f324dc8a2c8444d8ad560b 100644
--- a/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
+++ b/Modules/Filtering/MathParser/include/otbBandMathImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandMathImageFilter_txx
-#define otbBandMathImageFilter_txx
+#ifndef otbBandMathImageFilter_hxx
+#define otbBandMathImageFilter_hxx
 #include "otbBandMathImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
index e2c92563194f373c031b3b6d6c22154cdc160556..2a7646c8a092941b58d1f053ca5a057da301f7e9 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.h
@@ -142,7 +142,7 @@ private:
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskMuParserFilter.txx"
+#include "otbMaskMuParserFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
index e079cf3890b23252506814a574a98eaddc620c1b..76016aa7b3b3708782c694848994632b01389dbc 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaskMuParserFilter_txx
-#define otbMaskMuParserFilter_txx
+#ifndef otbMaskMuParserFilter_hxx
+#define otbMaskMuParserFilter_hxx
 
 #include "otbMaskMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
index 7a3d09a24dccdf56c951a9d93018310bd65ad3be..53af2d4e6bd5fa2b3d671ae2b99f02bd60fa82ed 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.h
@@ -127,7 +127,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMaskMuParserFunctor.txx"
+#include "otbMaskMuParserFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
index 843ace100cc80c4c0dd27545f941d83080250f46..06493dd5a3470bec6ee39d93ba7dbae860e07577 100644
--- a/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
+++ b/Modules/Filtering/MathParser/include/otbMaskMuParserFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMaskMuParserFunctor_txx
-#define otbMaskMuParserFunctor_txx
+#ifndef otbMaskMuParserFunctor_hxx
+#define otbMaskMuParserFunctor_hxx
 
 #include "otbMaskMuParserFunctor.h"
 
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
index 19d01c5b66abdc971e6bf9b2a6677fedb1210285..6f246ab623f5cf05b13c53111399f9f864f583cb 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.h
@@ -119,7 +119,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbParserConditionDataNodeFeatureFunction.txx"
+#include "otbParserConditionDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
index f50287189bf062f8e85537b1187ccf68b9e19619..43b045b9719b0343ba89ef7df6a2156e05853d02 100644
--- a/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/MathParser/include/otbParserConditionDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbParserConditionDataNodeFeatureFunction_txx
-#define otbParserConditionDataNodeFeatureFunction_txx
+#ifndef otbParserConditionDataNodeFeatureFunction_hxx
+#define otbParserConditionDataNodeFeatureFunction_hxx
 
 #include "otbParserConditionDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
index a0ff07fbc80c99c05473884a2feb56dd1b2c71ef..a167750575fc6485d46d87f58ea40ecb78172df0 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.h
@@ -195,7 +195,7 @@ private :
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBandMathXImageFilter.txx"
+#include "otbBandMathXImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
index 11da024a2be740df77acbf5fd42d442987de1420..7ffd792316a5045bef14b88b44354d8a42600c9f 100644
--- a/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
+++ b/Modules/Filtering/MathParserX/include/otbBandMathXImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBandMathXImageFilter_txx
-#define otbBandMathXImageFilter_txx
+#ifndef otbBandMathXImageFilter_hxx
+#define otbBandMathXImageFilter_hxx
 #include "otbBandMathXImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
index 5a72c260d4a3533165f6fdb9ec08c0dab811b8fc..999e100c8746285b686404efb06d645028093dd8 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.h
@@ -135,7 +135,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidAnalysisFilter.txx"
+#include "otbMorphologicalPyramidAnalysisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
index 4aa682c6e0ec3b2f45228388b010f0797b72dd4e..d2c37353d4bbc4726525bfb58a028e79f1ea8e4b 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidAnalysisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidAnalysisFilter_txx
-#define otbMorphologicalPyramidAnalysisFilter_txx
+#ifndef otbMorphologicalPyramidAnalysisFilter_hxx
+#define otbMorphologicalPyramidAnalysisFilter_hxx
 
 #include "otbMorphologicalPyramidAnalysisFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
index 6aa85ba70b2f152fb0997dab99cb2e71bf2cc2f2..6edbe1cd54fda48d39e2a7bdfa50591607cf65d5 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.h
@@ -167,7 +167,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidMRToMSConverter.txx"
+#include "otbMorphologicalPyramidMRToMSConverter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
index 6fa0e2b0f3ac7acc7e7f7ccc6360f4141af2ef84..18a91c271741ebf279d630372f8816316a9a10f8 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidMRToMSConverter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidMRToMSConverter_txx
-#define otbMorphologicalPyramidMRToMSConverter_txx
+#ifndef otbMorphologicalPyramidMRToMSConverter_hxx
+#define otbMorphologicalPyramidMRToMSConverter_hxx
 
 #include "otbMorphologicalPyramidMRToMSConverter.h"
 #include "otbMorphologicalPyramidResampler.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
index f28d291f72de4b13460673f719add9e51371c6cd..63f25cc1a56819d9d2a094c237d93a47034f1879 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.h
@@ -98,7 +98,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidResampler.txx"
+#include "otbMorphologicalPyramidResampler.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
index b1fad675a31606f2a78aaf95ff497c7169bf010a..34b06a3efd02553552a2acef1f0a5e0f3a93d429 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidResampler.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidResampler_txx
-#define otbMorphologicalPyramidResampler_txx
+#ifndef otbMorphologicalPyramidResampler_hxx
+#define otbMorphologicalPyramidResampler_hxx
 #include "otbMorphologicalPyramidResampler.h"
 #include "itkResampleImageFilter.h"
 #include "itkScalableAffineTransform.h"
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
index 5312f55b0a29fc1ca49818f67e9d83247b9a1ed5..ab2ed3d1e3666dbae0f71e30786de10caea22c10 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.h
@@ -159,7 +159,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSegmentationFilter.txx"
+#include "otbMorphologicalPyramidSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
index 4ab21bbb820e48fc8775d8038c96a02ae8a824cd..f88df626140147c89b2aed6943499edf4467e2f7 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSegmentationFilter_txx
-#define otbMorphologicalPyramidSegmentationFilter_txx
+#ifndef otbMorphologicalPyramidSegmentationFilter_hxx
+#define otbMorphologicalPyramidSegmentationFilter_hxx
 
 #include "otbMorphologicalPyramidSegmentationFilter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
index 5fe12ac1f5313e0607d13180c4b917efbb9ad494..97e9da6e0f60c85db94421f2e7fb1e4ee2a1eac6 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.h
@@ -153,7 +153,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSegmenter.txx"
+#include "otbMorphologicalPyramidSegmenter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
index b49ed4f71dc504befdaf416f3065c94b0f9c8038..39fe80b75d8555e349ebcf4ee02ec9642a867477 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSegmenter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSegmenter_txx
-#define otbMorphologicalPyramidSegmenter_txx
+#ifndef otbMorphologicalPyramidSegmenter_hxx
+#define otbMorphologicalPyramidSegmenter_hxx
 
 #include "otbMorphologicalPyramidSegmenter.h"
 
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
index 3b83773a44d2a2b649528c9cff7c396f85723436..d83839f98bbba80c90d435c749a4f673db244ad6 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.h
@@ -138,7 +138,7 @@ protected:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalPyramidSynthesisFilter.txx"
+#include "otbMorphologicalPyramidSynthesisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
index cc30b52dd347b5759a081633e08ee94df77fb114..457bf87a59d3fabdaf24ec75d3693f3b45dd60d2 100644
--- a/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
+++ b/Modules/Filtering/MorphologicalPyramid/include/otbMorphologicalPyramidSynthesisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalPyramidSynthesisFilter_txx
-#define otbMorphologicalPyramidSynthesisFilter_txx
+#ifndef otbMorphologicalPyramidSynthesisFilter_hxx
+#define otbMorphologicalPyramidSynthesisFilter_hxx
 
 #include "otbMorphologicalPyramidSynthesisFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.h b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
index ce29df46dcb01ae076e76b44a7a58ffe336d2958..1d53bba8a0afb0fdc469352fc3669c30887c14ee 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.h
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.h
@@ -87,7 +87,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbCompacityPathFunction.txx"
+#include "otbCompacityPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx b/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
index ed5ed934672fc7e16b9df7311ce6a22813af0085..22509246b3b8cda99584f0184e90f0c9c9c3e447 100644
--- a/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbCompacityPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbCompacityPathFunction_txx
-#define otbCompacityPathFunction_txx
+#ifndef otbCompacityPathFunction_hxx
+#define otbCompacityPathFunction_hxx
 
 #include "otbCompacityPathFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.h b/Modules/Filtering/Path/include/otbDrawPathFilter.h
index 567da4af3983c5f16634c8ac3407bafc85537f33..99abaf820432e63dff646b3d63a33d147633ebf6 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.h
@@ -105,7 +105,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawPathFilter.txx"
+#include "otbDrawPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbDrawPathFilter.hxx b/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
index 3b89464200f3e4292533b6321a1004ee1bb79d2f..5162886847f80a2090dc9e0cecec20d7e3ccc18d 100644
--- a/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbDrawPathFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbDrawPathFilter_txx
-#define otbDrawPathFilter_txx
+#ifndef otbDrawPathFilter_hxx
+#define otbDrawPathFilter_hxx
 
 #include "otbDrawPathFilter.h"
 #include "otbDrawPathListFilter.h"
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.h b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
index 5851f388b83d08e9e017408cd205180c89e8c67b..bce7b8ffae09ecdaf795540d135a32778c17368d 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDrawPathListFilter.txx"
+#include "otbDrawPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx b/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
index 364d284cc25638ff496cd16c9f996323f19ee3c7..c649e573702fc11aaa2156df64456c7c9cfb7236 100644
--- a/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbDrawPathListFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbDrawPathListFilter_txx
-#define otbDrawPathListFilter_txx
+#ifndef otbDrawPathListFilter_hxx
+#define otbDrawPathListFilter_hxx
 
 #include "otbDrawPathListFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
index bc0f8c7306933317abf73c1cf8d6b0a6ff4d7f99..18b31663c4c0967d639695868fea63530c88372a 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.h
@@ -115,7 +115,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFittingPolygonListFilter.txx"
+#include "otbImageFittingPolygonListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
index 2b7fa336c2e0ed0faae239c08151d310a3a9d03e..3bb795ebb971beaca12478dcf533262bb7ed3781 100644
--- a/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageFittingPolygonListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFittingPolygonListFilter_txx
-#define otbImageFittingPolygonListFilter_txx
+#ifndef otbImageFittingPolygonListFilter_hxx
+#define otbImageFittingPolygonListFilter_hxx
 
 #include "otbImageFittingPolygonListFilter.h"
 #include "otbPolyLineImageConstIterator.h"
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
index 2a69f0d20c5594079384e80afa506912ab21bff7..8047a632ade15fb3c64911d2d7a91e5a905b1320 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.h
@@ -101,7 +101,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToEdgePathFilter.txx"
+#include "otbImageToEdgePathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
index 839ca6baaaa2ba83efd84ca3c963bd8e0bc84ef7..069e52454cae56ab5d022395d3e0b37618da8a91 100644
--- a/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToEdgePathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToEdgePathFilter_txx
-#define otbImageToEdgePathFilter_txx
+#ifndef otbImageToEdgePathFilter_hxx
+#define otbImageToEdgePathFilter_hxx
 
 #include "otbImageToEdgePathFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.h b/Modules/Filtering/Path/include/otbImageToPathFilter.h
index 8e09616793253a73ee262c8f5ea63d2e672f1f5d..55b01e668f94d8c16e4842c26af947d81470e219 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathFilter.txx"
+#include "otbImageToPathFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToPathFilter.hxx b/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
index 40bd6ab6dc8b8da4b56a998d7aed8d8ffaeb2c89..404e811ac4c58736ecd1a56d9a58bb07727c8dd7 100644
--- a/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToPathFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToPathFilter_txx
-#define otbImageToPathFilter_txx
+#ifndef otbImageToPathFilter_hxx
+#define otbImageToPathFilter_hxx
 
 #include "otbImageToPathFilter.h"
 
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.h b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
index b42a23f6fcfa6d53bbdb4fd7af9c41affbf400a5..ab0585a9881db274cc87e1622bd5f4d806cd51e4 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToPathListFilter.txx"
+#include "otbImageToPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx b/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
index 21d3cfd9d6804700bd52e271629787c5a3ff9c12..ed9172d39ad112be4f3eab60394677163ea75ae8 100644
--- a/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbImageToPathListFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbImageToPathListFilter_txx
-#define otbImageToPathListFilter_txx
+#ifndef otbImageToPathListFilter_hxx
+#define otbImageToPathListFilter_hxx
 
 #include "otbImageToPathListFilter.h"
 #include "itkProcessObject.h"
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.h b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
index c83caf644164a9b2f089c2001d265675741b0a69..c020aea9897203f602524ec8eb551d81e4b97a80 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.h
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.h
@@ -83,7 +83,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOrientationPathFunction.txx"
+#include "otbOrientationPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx b/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
index 5d0edb2657cba5ed7cff274f24b25595b9688aa7..c3224044f0c096c089a28c334b00e78885301320 100644
--- a/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbOrientationPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOrientationPathFunction_txx
-#define otbOrientationPathFunction_txx
+#ifndef otbOrientationPathFunction_hxx
+#define otbOrientationPathFunction_hxx
 
 #include "otbOrientationPathFunction.h"
 #include "otbPathFunction.h"
diff --git a/Modules/Filtering/Path/include/otbPathFunction.h b/Modules/Filtering/Path/include/otbPathFunction.h
index 2d9adf7b23bf84cac06b852c03b850479682e7b3..76f5a8a07880ab343ae3d02397d54081a5c430ff 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.h
+++ b/Modules/Filtering/Path/include/otbPathFunction.h
@@ -94,7 +94,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPathFunction.txx"
+#include "otbPathFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathFunction.hxx b/Modules/Filtering/Path/include/otbPathFunction.hxx
index 739e2809b09ad209328f7ff54a5855747fc42f07..36bfaf26eb854d204d609064da4fa1414ef6c4d6 100644
--- a/Modules/Filtering/Path/include/otbPathFunction.hxx
+++ b/Modules/Filtering/Path/include/otbPathFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPathFunction_txx
-#define otbPathFunction_txx
+#ifndef otbPathFunction_hxx
+#define otbPathFunction_hxx
 
 #include "otbPathFunction.h"
 
diff --git a/Modules/Filtering/Path/include/otbPathListSource.h b/Modules/Filtering/Path/include/otbPathListSource.h
index df9f28e9cbd574cf76cb96ae719a76645a8ad8e3..36147e4ef5dea8be7ee3a084fa89bb691f79b6e5 100644
--- a/Modules/Filtering/Path/include/otbPathListSource.h
+++ b/Modules/Filtering/Path/include/otbPathListSource.h
@@ -183,7 +183,7 @@ private:
 } // end namespace otb
 
 // #ifndef OTB_MANUAL_INSTANTIATION
-// #include "otbPathListSource.txx"
+// #include "otbPathListSource.hxx"
 // #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
index e5f99af968f345d7687ab52f7f41b8601472cc8a..02aa723b32ad1174010f75c3b9d402d4b10b7f0e 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.h
@@ -133,7 +133,7 @@ private:
 } // end of namespace OTB
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPathListToHistogramGenerator.txx"
+#include "otbPathListToHistogramGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
index 32f6f0ae8ff6dad9a88344c1f0715bb53be2f1bc..de57dabc2014ab20b279531cdb93d31273e74e6a 100644
--- a/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
+++ b/Modules/Filtering/Path/include/otbPathListToHistogramGenerator.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbPathListToHistogramGenerator_txx
-#define otbPathListToHistogramGenerator_txx
+#ifndef otbPathListToHistogramGenerator_hxx
+#define otbPathListToHistogramGenerator_hxx
 
 #include "otbPathListToHistogramGenerator.h"
 
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
index 80e443aeacac48df0a447523ed4efb57bd0ad90d..f2008129ecc4cfe6c0e3dea870ad518a99f4c336 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.h
@@ -119,7 +119,7 @@ protected: //made protected so other iterators can access
 
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolyLineImageConstIterator.txx"
+#include "otbPolyLineImageConstIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
index f450b79ca9af5ef1ed6d4938ff165d702e9f48d3..0beaac96e612e8949e1104dc41f0fb81c7087670 100644
--- a/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
+++ b/Modules/Filtering/Path/include/otbPolyLineImageConstIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolyLineImageConstIterator_txx
-#define otbPolyLineImageConstIterator_txx
+#ifndef otbPolyLineImageConstIterator_hxx
+#define otbPolyLineImageConstIterator_hxx
 
 #include "otbPolyLineImageConstIterator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
index df0444b81e79bae6ff86f83989ba481e2c117fd4..03151a5058ac3e4d0545b0a8aca92a03ed737601 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRegionImageToRectangularPathListFilter.txx"
+#include "otbRegionImageToRectangularPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
index abb678bebee4c3b00a24c2db31cb6679962b896e..2b80dd220f994486ef160c6a234ccc95afe48173 100644
--- a/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbRegionImageToRectangularPathListFilter.hxx
@@ -19,10 +19,10 @@
  */
 
 
-// Adapted from otbImageToPathListAlignFilter.txx
+// Adapted from otbImageToPathListAlignFilter.hxx
 
-#ifndef otbRegionImageToRectangularPathListFilter_txx
-#define otbRegionImageToRectangularPathListFilter_txx
+#ifndef otbRegionImageToRectangularPathListFilter_hxx
+#define otbRegionImageToRectangularPathListFilter_hxx
 
 #include <iostream>
 #include <exception>
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
index 1a9c4f650a492d9855c06ac418acae5ca157a049..07b613193b577cd8ab5455076bda91141cb10575 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.h
@@ -144,7 +144,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorizationPathListFilter.txx"
+#include "otbVectorizationPathListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
index 37ea20dc8631ae458c427d90d702ff01e8c2e818..c40876431c30583797bfa0d6565d176f2abe7259 100644
--- a/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
+++ b/Modules/Filtering/Path/include/otbVectorizationPathListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorizationPathListFilter_txx
-#define otbVectorizationPathListFilter_txx
+#ifndef otbVectorizationPathListFilter_hxx
+#define otbVectorizationPathListFilter_hxx
 
 #include "otbVectorizationPathListFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
index 1cdc209f182974573c6c55568c87aa49259f079a..b60bdad793e1fd09a3b410077b3be8fa56607d4b 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.h
@@ -229,7 +229,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiChannelsPolarimetricSynthesisFilter.txx"
+#include "otbMultiChannelsPolarimetricSynthesisFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
index 923a07fadbd8b726196a977730765abc87581652..cf21df1e13eb34005d6049c87f6ffa237ca1cfec 100644
--- a/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbMultiChannelsPolarimetricSynthesisFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiChannelsPolarimetricSynthesisFilter_txx
-#define otbMultiChannelsPolarimetricSynthesisFilter_txx
+#ifndef otbMultiChannelsPolarimetricSynthesisFilter_hxx
+#define otbMultiChannelsPolarimetricSynthesisFilter_hxx
 
 #include <complex>
 
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
index 3747ec06173497f4ad1f238e66aaa839f5884b08..b4a12784ea744b5f4dba72e2edce88616a6bf5e8 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinclairImageFilter.txx"
+#include "otbSinclairImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
index 3c43f0dd63e42329e2da5248220934055aaaf53f..201ef1c0f6a096cf82c3ee7d3d060f8b8316d5c3 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSinclairImageFilter_txx
-#define otbSinclairImageFilter_txx
+#ifndef otbSinclairImageFilter_hxx
+#define otbSinclairImageFilter_hxx
 
 #include "otbSinclairImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
index bd914e23278b5bacee88ce2c9b002ccff7df64df..1ccee11854fa4c7e003baa5330905027221d8d52 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.h
@@ -125,7 +125,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinclairReciprocalImageFilter.txx"
+#include "otbSinclairReciprocalImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
index 2b31f8c3ea5f8b3bd18aa635f806bf7ba2956f6f..37549c96926854a4581898db6439b12cc89d4516 100644
--- a/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
+++ b/Modules/Filtering/Polarimetry/include/otbSinclairReciprocalImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSinclairReciprocalImageFilter_txx
-#define otbSinclairReciprocalImageFilter_txx
+#ifndef otbSinclairReciprocalImageFilter_hxx
+#define otbSinclairReciprocalImageFilter_hxx
 
 #include "otbSinclairReciprocalImageFilter.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
index 06d7ec3966e8843089d3be2079116388a34107e6..5264162a1a5c76c198a1556b873243ca764d5980 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.h
@@ -72,7 +72,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEckert4MapProjection.txx"
+#include "otbEckert4MapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx b/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
index d3b6dedc56f37696442d68f22154b6af233ede6e..df670921e94ee58253cd7f6d8d57ffddac392b2e 100644
--- a/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbEckert4MapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbEckert4MapProjection_txx
-#define otbEckert4MapProjection_txx
+#ifndef otbEckert4MapProjection_hxx
+#define otbEckert4MapProjection_hxx
 
 #include "otbEckert4MapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
index 5a8a8f1995a9eaf105072b78550e0714b92284c5..aaeae07cf080c940fc159a7f85fad00c059e1c66 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.h
@@ -225,7 +225,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGCPsToRPCSensorModelImageFilter.txx"
+#include "otbGCPsToRPCSensorModelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
index 0285686096212754210ed5b18e3ee47d6cb3b72f..fe6cfd470ab79e29a2c0ea09b6c401b1daa9fbad 100644
--- a/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGCPsToRPCSensorModelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGCPsToRPCSensorModelImageFilter_txx
-#define otbGCPsToRPCSensorModelImageFilter_txx
+#ifndef otbGCPsToRPCSensorModelImageFilter_hxx
+#define otbGCPsToRPCSensorModelImageFilter_hxx
 
 #include "otbGCPsToRPCSensorModelImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
index bce96de2555dbbbf7bfc849b0577e1051421e206..79527bd439d4e869faef23654e99c97fd0cefd29 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.h
@@ -306,7 +306,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGenericRSResampleImageFilter.txx"
+#include "otbGenericRSResampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
index 1743cdb354b43c1caf33be7a69ebd040b928ba1f..f6e71596833cc4f22c0b7c73dbf0d7c88cb7bf00 100644
--- a/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGenericRSResampleImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGenericRSResampleImageFilter_txx
-#define otbGenericRSResampleImageFilter_txx
+#ifndef otbGenericRSResampleImageFilter_hxx
+#define otbGenericRSResampleImageFilter_hxx
 
 #include "otbGenericRSResampleImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.h b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
index 2b387814a2ae12af0825b3dd752ffec4302fc341..4591cd886483b75bd660b20fd89744f68561bb6a 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.h
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.h
@@ -100,7 +100,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbGeographicalDistance.txx"
+# include "otbGeographicalDistance.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx b/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
index feed9d68dcf2ba849016df8ab4bb758cf86bb082..2539ab69a7bace6c76ffecbb89be16f1e3396eb8 100644
--- a/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
+++ b/Modules/Filtering/Projection/include/otbGeographicalDistance.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeographicalDistance_txx
-#define otbGeographicalDistance_txx
+#ifndef otbGeographicalDistance_hxx
+#define otbGeographicalDistance_hxx
 
 #include "otbGeographicalDistance.h"
 #include "otbMath.h"
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
index 4229ae3771694a5f39b236a509db92a2ef12a5e9..61c63914377d9d240354e062c86d9942b8e121be 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.h
@@ -295,7 +295,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeometriesProjectionFilter.txx"
+#include "otbGeometriesProjectionFilter.hxx"
 #endif
 
 #endif // otbGeometriesProjectionFilter_h
diff --git a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
index 6a492cacdb6fca0a1a89cc6760fd76cb1589fd52..ea4854ef1d17dc032dd838badcd6cb30482be705 100644
--- a/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbGeometriesProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeometriesProjectionFilter_txx
-#define otbGeometriesProjectionFilter_txx
+#ifndef otbGeometriesProjectionFilter_hxx
+#define otbGeometriesProjectionFilter_hxx
 
 /*===========================================================================*/
 /*===============================[ Includes ]================================*/
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
index 220b9a0c38ecc80e6c9bb5f65c4c9531b2109b44..3da0bb60a0c6feb279d33afef7d95dc4551db3d5 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbGroundSpacingImageFunction.txx"
+# include "otbGroundSpacingImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
index acc92106b5ca9d9caf0bc3964631b4e1a8b8f2fe..0c7a2d85c4f1eb422e7b5d6036a4e978afe43aa0 100644
--- a/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
+++ b/Modules/Filtering/Projection/include/otbGroundSpacingImageFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbGroundSpacingImageFunction_txx
-#define otbGroundSpacingImageFunction_txx
+#ifndef otbGroundSpacingImageFunction_hxx
+#define otbGroundSpacingImageFunction_hxx
 
 #include "otbMath.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
index bf37333abdbe726aea912037018b8a558dcaac91..8096b4410dd840164bd970eded98cae442212250 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToEnvelopeVectorDataFilter.txx"
+#include "otbImageToEnvelopeVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
index bbacb2321b22a71cceae234ea7dc128aac9502de..a783a510412e95f56bb3ba3a8f4beceeaa6eead5 100644
--- a/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbImageToEnvelopeVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToEnvelopeVectorDataFilter_txx
-#define otbImageToEnvelopeVectorDataFilter_txx
+#ifndef otbImageToEnvelopeVectorDataFilter_hxx
+#define otbImageToEnvelopeVectorDataFilter_hxx
 
 #include "otbImageToEnvelopeVectorDataFilter.h"
 #include "otbDataNode.h"
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
index 99200364b8bb11ae6802f46e28c242e88b05925a..992905dff73fe2d9ce5a4ff29d05654d201598c5 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.h
@@ -102,7 +102,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImportGeoInformationImageFilter.txx"
+#include "otbImportGeoInformationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
index 35e9ba8682a8a3e14948858f8af5024928b3b366..4ce28e2664c3f2b3e93bdf8cadc6e08fe125dd95 100644
--- a/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbImportGeoInformationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImportGeoInformationImageFilter_txx
-#define otbImportGeoInformationImageFilter_txx
+#ifndef otbImportGeoInformationImageFilter_hxx
+#define otbImportGeoInformationImageFilter_hxx
 
 #include "otbImportGeoInformationImageFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
index 526b194ab09bd0d78ee45201750f8f67470bcd99..bc5f878650cb0ad93cb5727a85484b1967a6f163 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.h
@@ -74,7 +74,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLambertConformalConicMapProjection.txx"
+#include "otbLambertConformalConicMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
index 49df994bfbb90e8fff81d64e6b67cc3b534f3061..5a0b1f46c3917368352d93698f491be7a23b3e83 100644
--- a/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbLambertConformalConicMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLambertConformalConicMapProjection_txx
-#define otbLambertConformalConicMapProjection_txx
+#ifndef otbLambertConformalConicMapProjection_hxx
+#define otbLambertConformalConicMapProjection_hxx
 
 #include "otbLambertConformalConicMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
index dc5fe37c44a84c3afe876ad6e54d59d5dfbafc08..33c317f5f62c64d65fb66943232db80a8a3cb1cb 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.h
@@ -170,7 +170,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLeastSquareAffineTransformEstimator.txx"
+#include "otbLeastSquareAffineTransformEstimator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
index 674c571a1b78545c400a583f70737647134d3ef1..f3b661612ac2e5176530e1f9b25ed763e443f459 100644
--- a/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
+++ b/Modules/Filtering/Projection/include/otbLeastSquareAffineTransformEstimator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLeastSquareAffineTransformEstimator_txx
-#define otbLeastSquareAffineTransformEstimator_txx
+#ifndef otbLeastSquareAffineTransformEstimator_hxx
+#define otbLeastSquareAffineTransformEstimator_hxx
 
 #include <vnl/algo/vnl_lsqr.h>
 #include <vnl/vnl_sparse_matrix_linear_system.h>
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
index b063d0fb3b030f2268631308ec118574aaf0f9c7..55e5b41c1ef62104c27d934e0ec145b460cc8adc 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.h
@@ -70,7 +70,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMollweidMapProjection.txx"
+#include "otbMollweidMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx b/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
index c9899a9f11d600d1477fa2e61f428692fc1da798..4906e2fbeb63f1345cbfda03f168c479780d0307 100644
--- a/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbMollweidMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMollweidMapProjection_txx
-#define otbMollweidMapProjection_txx
+#ifndef otbMollweidMapProjection_hxx
+#define otbMollweidMapProjection_hxx
 
 #include "otbMollweidMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
index 1226e36c85ab84eff41f4a286a014fb384eb025e..6bc0420c6579382b92411976d5c2a2577ddf4c77 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.h
@@ -111,7 +111,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOrthoRectificationFilter.txx"
+#include "otbOrthoRectificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
index f085c66b2aff9efb3a9bb7c859872f827939e48e..b9031a68ff22ece9d59fb2ab408ff456a05f46a3 100644
--- a/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbOrthoRectificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOrthoRectificationFilter_txx
-#define otbOrthoRectificationFilter_txx
+#ifndef otbOrthoRectificationFilter_hxx
+#define otbOrthoRectificationFilter_hxx
 
 #include "otbOrthoRectificationFilter.h"
 #include "itkMetaDataObject.h"
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
index d6576c37bbed000045431a52d78480a5ab0478d3..6c08c46b35b2151b3ca3152ba81cc93a5d958e01 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.h
@@ -138,7 +138,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPhysicalToRPCSensorModelImageFilter.txx"
+#include "otbPhysicalToRPCSensorModelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
index 01c10488d008f36d6c6cde98977f4aaef2223a82..53804f59ac5084d29829ff213d0f538f1eded45a 100644
--- a/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbPhysicalToRPCSensorModelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPhysicalToRPCSensorModelImageFilter_txx
-#define otbPhysicalToRPCSensorModelImageFilter_txx
+#ifndef otbPhysicalToRPCSensorModelImageFilter_hxx
+#define otbPhysicalToRPCSensorModelImageFilter_hxx
 
 #include "otbPhysicalToRPCSensorModelImageFilter.h"
 #include "otbDEMHandler.h"
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
index ad7659d922801bad7cb6282247f6deb4a6cb6b14..e568eb5b762eaadd0025248c1249ce85189d9ac2 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.h
@@ -177,7 +177,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProjectiveProjectionImageFilter.txx"
+#include "otbProjectiveProjectionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
index 8fd20c52a6fe22f744497523ff7d7d16198082d5..8335e3342ad52fa6f442ab43bdfff48df85d0a45 100644
--- a/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbProjectiveProjectionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProjectiveProjectionImageFilter_txx
-#define otbProjectiveProjectionImageFilter_txx
+#ifndef otbProjectiveProjectionImageFilter_hxx
+#define otbProjectiveProjectionImageFilter_hxx
 
 #include "otbProjectiveProjectionImageFilter.h"
 
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.h b/Modules/Filtering/Projection/include/otbROIdataConversion.h
index 1c74b75a40d1dc9bb6a331d2046827018a549c4e..9709067ad256e8205bacc52547a42da8996fb458 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.h
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.h
@@ -100,7 +100,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbROIdataConversion.txx"
+#include "otbROIdataConversion.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbROIdataConversion.hxx b/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
index 5844bf660fa006510b0b97350c3f2b8bc1f9b12f..e6faf09306fe4b7b16ba4249cbd0448e0b99145d 100644
--- a/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
+++ b/Modules/Filtering/Projection/include/otbROIdataConversion.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbROIdataConversion_txx
-#define otbROIdataConversion_txx
+#ifndef otbROIdataConversion_hxx
+#define otbROIdataConversion_hxx
 
 #include "itkVector.h"
 
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
index 8092cf1d36a4f1d59112a53225c1c41d6e17b929..d7173b1cf08a8d51c6e3d5b9a9ec85f001d959aa 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.h
@@ -73,7 +73,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSinusoidalMapProjection.txx"
+#include "otbSinusoidalMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
index 2f68bcae26cd7901f35f02c801c94814daf80065..7115c1378d3e8657812c6d36ec0321123e6dcee9 100644
--- a/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbSinusoidalMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSinusoidalMapProjection_txx
-#define otbSinusoidalMapProjection_txx
+#ifndef otbSinusoidalMapProjection_hxx
+#define otbSinusoidalMapProjection_hxx
 
 #include "otbSinusoidalMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.h b/Modules/Filtering/Projection/include/otbTileMapTransform.h
index 0d4e8cc5609e97d4eb796f7be362fbe4a9e4253b..64748717b38389c8f9e729dd4866b8d6f907ecda 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.h
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.h
@@ -97,7 +97,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTileMapTransform.txx"
+#include "otbTileMapTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbTileMapTransform.hxx b/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
index 19b241f64bd8dacca701674adda526f17167518a..30f3a4ff054961cdaefb29237dfbc836ba3bef53 100644
--- a/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
+++ b/Modules/Filtering/Projection/include/otbTileMapTransform.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTileMapTransform_txx
-#define otbTileMapTransform_txx
+#ifndef otbTileMapTransform_hxx
+#define otbTileMapTransform_hxx
 
 #include "otbTileMapTransform.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
index b5b34be4a3e21f7335041a02e0f57a7060a7c3f8..f5e1e5b1bed35a28808ee51ba3ba844092952316 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.h
@@ -75,7 +75,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTransMercatorMapProjection.txx"
+#include "otbTransMercatorMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
index 3f46b6e51f0821106d438cc5747b1678a7fdbadf..5dc92d2bc05d175c149f5c7d7efaf8ceef17977d 100644
--- a/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbTransMercatorMapProjection.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTransMercatorMapProjection_txx
-#define otbTransMercatorMapProjection_txx
+#ifndef otbTransMercatorMapProjection_hxx
+#define otbTransMercatorMapProjection_hxx
 
 #include "otbTransMercatorMapProjection.h"
 #include "otbUtils.h"
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.h b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
index c121faeb1fbd3caeeb28796cc8fc6d701517823d..25ed0b2d22b6125a421069339dac4c40a746a688 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.h
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.h
@@ -73,7 +73,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUtmMapProjection.txx"
+#include "otbUtmMapProjection.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx b/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
index 46e20e6b88f44cf60f8953cf70a21c1637f55ace..f74d30b705195df3997b153dd1ab29807b9cacae 100644
--- a/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
+++ b/Modules/Filtering/Projection/include/otbUtmMapProjection.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbUtmMapProjection_txx
-#define otbUtmMapProjection_txx
+#ifndef otbUtmMapProjection_hxx
+#define otbUtmMapProjection_hxx
 
 #include "otbUtmMapProjection.h"
 
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
index c36c1c0911b3b442fbf3b9bed9db24df069bb73e..66806cf4ca539320648a23a80aad3f35bf79df17 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.h
@@ -134,7 +134,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataIntoImageProjectionFilter.txx"
+#include "otbVectorDataIntoImageProjectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
index ccf2dc45ec5aa943fb0f31d58febcee6ce35ef22..067342ec3c0b87b9d4ed6b0021e8919d6a37fb15 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataIntoImageProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataIntoImageProjectionFilter_txx
-#define otbVectorDataIntoImageProjectionFilter_txx
+#ifndef otbVectorDataIntoImageProjectionFilter_hxx
+#define otbVectorDataIntoImageProjectionFilter_hxx
 
 #include "otbVectorDataIntoImageProjectionFilter.h"
 #include "otb_boost_string_header.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
index 40efd1202d1eeac18dbf1f19cc6710667c2f0cc6..3594ee5f3e0bdaa0b75be80f2b1dca3d483335be 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.h
@@ -207,7 +207,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataProjectionFilter.txx"
+#include "otbVectorDataProjectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
index 1cc7ddc936615e1c0a2a790b98de9f41fb0bf57c..8af72d15f20f89551587cfdee0d8054463d010a7 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataProjectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataProjectionFilter_txx
-#define otbVectorDataProjectionFilter_txx
+#ifndef otbVectorDataProjectionFilter_hxx
+#define otbVectorDataProjectionFilter_hxx
 
 #include "otbVectorDataProjectionFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
index a82bed669ad22a7f42d65ea44707924d4e9926eb..02cd97b4403962f9636590e5a1b1170b31115647 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbVectorDataTransformFilter.txx"
+#include "otbVectorDataTransformFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
index a134de82df1a1a757aa0a95e9b17afe4bfab5cc2..963def0c052108a91b6c8aaf9a415ad608dbef23 100644
--- a/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
+++ b/Modules/Filtering/Projection/include/otbVectorDataTransformFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataTransformFilter_txx
-#define otbVectorDataTransformFilter_txx
+#ifndef otbVectorDataTransformFilter_hxx
+#define otbVectorDataTransformFilter_hxx
 
 #include "otbVectorDataTransformFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
index 6dc0cfe79a4cac91c39d0568197e960be34b8788..4ef154a0e4ed2c449a98199af3bdd008006d195c 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.h
@@ -682,7 +682,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftSmoothingImageFilter.txx"
+#include "otbMeanShiftSmoothingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
index efdf17c433ebfbde4d0779afc44748794eef238e..79078aaff2594440b968e72d2d49da36f794ee47 100644
--- a/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
+++ b/Modules/Filtering/Smoothing/include/otbMeanShiftSmoothingImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMeanShiftSmoothingImageFilter_txx
-#define otbMeanShiftSmoothingImageFilter_txx
+#ifndef otbMeanShiftSmoothingImageFilter_hxx
+#define otbMeanShiftSmoothingImageFilter_hxx
 
 #include "otbMeanShiftSmoothingImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
index 615ccc13f5512b8cee609e51db878be8062439ae..93ad5b31bf8d6f1eaea4039b13c66764df074c54 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.h
@@ -82,7 +82,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateSampleListFilter.txx"
+#include "otbConcatenateSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
index f7c0d34da9a363a5c594a00ff20c98428658191c..5228687806d09575aa72f1dbc06822097aac4faf 100644
--- a/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbConcatenateSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateSampleListFilter_txx
-#define otbConcatenateSampleListFilter_txx
+#ifndef otbConcatenateSampleListFilter_hxx
+#define otbConcatenateSampleListFilter_hxx
 
 #include "otbConcatenateSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
index d452a1318ca1271ce8b0076a7f7b7c03d62f7682..dccb083d4431ab5c707011a4aa0ec42237d95294 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.h
@@ -162,7 +162,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbContinuousMinimumMaximumImageCalculator.txx"
+#include "otbContinuousMinimumMaximumImageCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
index 6a733e25c4fd47e6d438176b65a1e94e4ecae7fa..f613b0252969ca273824e540eb75343eb5f482ec 100644
--- a/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
+++ b/Modules/Filtering/Statistics/include/otbContinuousMinimumMaximumImageCalculator.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbContinuousMinimumMaximumImageCalculator_txx
-#define otbContinuousMinimumMaximumImageCalculator_txx
+#ifndef otbContinuousMinimumMaximumImageCalculator_hxx
+#define otbContinuousMinimumMaximumImageCalculator_hxx
 
 #include "otbContinuousMinimumMaximumImageCalculator.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
index cf6211bd9506011426fe856f6a5240a9d1054f26..ce61d1fdb78deb77a5936c7f65262ffdf90f131b 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.h
@@ -115,7 +115,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaussianAdditiveNoiseSampleListFilter.txx"
+#include "otbGaussianAdditiveNoiseSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
index 0cfe7acd11957b16cf88412eaad5c628ae547076..218db2371363b10f65635a4939eaf52c9fa88811 100644
--- a/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbGaussianAdditiveNoiseSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaussianAdditiveNoiseSampleListFilter_txx
-#define otbGaussianAdditiveNoiseSampleListFilter_txx
+#ifndef otbGaussianAdditiveNoiseSampleListFilter_hxx
+#define otbGaussianAdditiveNoiseSampleListFilter_hxx
 
 #include "otbGaussianAdditiveNoiseSampleListFilter.h"
 #include "itkMersenneTwisterRandomVariateGenerator.h"
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
index c2c04c9ea556bb1b1ffacde2ef7cd753a1f17f82..92c12d1b6336d80aada12596659b3f83558e3f63 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.h
@@ -123,7 +123,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramStatisticsFunction.txx"
+#include "otbHistogramStatisticsFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
index f9af415242c770064ce9aaf6e715d1df8900430f..d3cd3b37663c66bedb95dfb584cdc0b6fed8885b 100644
--- a/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
+++ b/Modules/Filtering/Statistics/include/otbHistogramStatisticsFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbHistogramStatisticsFunction_txx
-#define otbHistogramStatisticsFunction_txx
+#ifndef otbHistogramStatisticsFunction_hxx
+#define otbHistogramStatisticsFunction_hxx
 
 #include "otbHistogramStatisticsFunction.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
index f2542f3be5c8a50ef0d9d68ee30afe846b70464c..bb3d0355dc6a2a1fdbfc5b682a5299cfd4d368f2 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.h
@@ -207,7 +207,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleGenerator.txx"
+#include "otbListSampleGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
index 7f17e073b19fb4032ec587dfbeb1e463a1adf96b..1aa680e18ef11c8fdd197da70de6b7b8d0b8f7a5 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleGenerator_txx
-#define otbListSampleGenerator_txx
+#ifndef otbListSampleGenerator_hxx
+#define otbListSampleGenerator_hxx
 
 #include "otbListSampleGenerator.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.h b/Modules/Filtering/Statistics/include/otbListSampleSource.h
index 8beb507cf567fd955c92bba762c064fa680d54c0..f11922a1513ecc4f3a05756581624c880f24bf83 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.h
@@ -90,7 +90,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleSource.txx"
+#include "otbListSampleSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleSource.hxx b/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
index e3b0e0a0bc84c56db79c670a702f88c80be7da05..2f64f9d162cf9a4a591df7d0a55fd955f5f381c0 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleSource_txx
-#define otbListSampleSource_txx
+#ifndef otbListSampleSource_hxx
+#define otbListSampleSource_hxx
 
 #include "otbListSampleSource.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
index 42f96558940f329d7e6d7b5759904c32e8858477..e4bafc3b82fa684b18453ca7054b4d4a880a1e36 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.h
@@ -150,7 +150,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToBalancedListSampleFilter.txx"
+#include "otbListSampleToBalancedListSampleFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
index 19dc6839752f00e4a713c780b1f8ad064f6770f4..099f7eb66314cad151ba8eb1df11bb0d6e8ef5fd 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToBalancedListSampleFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToBalancedListSampleFilter_txx
-#define otbListSampleToBalancedListSampleFilter_txx
+#ifndef otbListSampleToBalancedListSampleFilter_hxx
+#define otbListSampleToBalancedListSampleFilter_hxx
 
 #include "otbListSampleToBalancedListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
index f524aee70502587ddd237782e1a6d2ed706e78a4..e77ce05478184e7133b6890e34053ffefd1d01c2 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.h
@@ -172,7 +172,7 @@ private:
 } // end of namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToHistogramListGenerator.txx"
+#include "otbListSampleToHistogramListGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
index 3d147197c0fe2e5cd9182bfb98916d54e179af5f..66803564a255d73bf7792edf8bbf07b3fb26f674 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToHistogramListGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToHistogramListGenerator_txx
-#define otbListSampleToHistogramListGenerator_txx
+#ifndef otbListSampleToHistogramListGenerator_hxx
+#define otbListSampleToHistogramListGenerator_hxx
 
 #include "otbListSampleToHistogramListGenerator.h"
 #include "itkArray.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
index e092656945876dc44cae4e90370a600530110a60..08b035800000c47878194d08fa4f0b504636ca3c 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.h
@@ -101,7 +101,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToListSampleFilter.txx"
+#include "otbListSampleToListSampleFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
index be6f811e3d0eb448603e09440ee56997125aec5a..71f19ccc57327b018069de41e98a5a1622cd88ec 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToListSampleFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToListSample_txx
-#define otbListSampleToListSample_txx
+#ifndef otbListSampleToListSample_hxx
+#define otbListSampleToListSample_hxx
 
 #include "otbListSampleToListSampleFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
index 01bdb8506067f25ee6eae8f4f5762e7a680471e3..6e5e6c7a391b291f09ea73c6c6fc34929e3635db 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.h
@@ -129,7 +129,7 @@ private:
 } // end of namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbListSampleToVariableDimensionHistogramGenerator.txx"
+#include "otbListSampleToVariableDimensionHistogramGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
index f7b5de355ae99661d92ab8c76241193673995d51..7a38bf846bc9f2b6a7099e421d66337d90473ae5 100644
--- a/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
+++ b/Modules/Filtering/Statistics/include/otbListSampleToVariableDimensionHistogramGenerator.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbListSampleToVariableDimensionHistogramGenerator_txx
-#define otbListSampleToVariableDimensionHistogramGenerator_txx
+#ifndef otbListSampleToVariableDimensionHistogramGenerator_hxx
+#define otbListSampleToVariableDimensionHistogramGenerator_hxx
 
 #include "otbListSampleToVariableDimensionHistogramGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
index 5348890e2e1d932acfcdd55a68925d0675d10d7b..a4be329775e92d3983af3ea84741ca9770d7b8fb 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.h
@@ -145,7 +145,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalHistogramImageFunction.txx"
+#include "otbLocalHistogramImageFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
index aedd9974d9a3ff9ea9ec7b0b8885120a6387b243..cdef25d6e0122ff5fe17925a34b5ee4a492f82da 100644
--- a/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
+++ b/Modules/Filtering/Statistics/include/otbLocalHistogramImageFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLocalHistogramImageFunction_txx
-#define otbLocalHistogramImageFunction_txx
+#ifndef otbLocalHistogramImageFunction_hxx
+#define otbLocalHistogramImageFunction_hxx
 
 #include "otbLocalHistogramImageFunction.h"
 #include "itkConstNeighborhoodIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
index f75d244c6114b71f55518a1e68e3e4d76db3ddce..462b80d70f121b645364a256c8d074ab6dc28981 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.h
@@ -218,7 +218,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalizeVectorImageFilter.txx"
+#include "otbNormalizeVectorImageFilter.hxx"
 #endif
 
 #endif // otbNormalizeVectorImageFilter_h
diff --git a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
index 858d26d299deb6be949ea3b45d19ca2c0fb5a56a..f2534c4e223b2d31479a3a75caff76828b57f721 100644
--- a/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbNormalizeVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalizeVectorImageFilter_txx
-#define otbNormalizeVectorImageFilter_txx
+#ifndef otbNormalizeVectorImageFilter_hxx
+#define otbNormalizeVectorImageFilter_hxx
 #include "otbNormalizeVectorImageFilter.h"
 
 namespace otb
@@ -86,4 +86,4 @@ NormalizeVectorImageFilter< TInputImage, TOutputImage >
 
 } // end of namespace otb
 
-#endif // otbNormalizeVectorImageFilter_txx
+#endif // otbNormalizeVectorImageFilter_hxx
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
index 0770189120e55cb1fb8d8d18d381e48c5a946974..3db7987dd703b398d28c5a28e2d67339903b9aee 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.h
@@ -109,7 +109,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbShiftScaleSampleListFilter.txx"
+#include "otbShiftScaleSampleListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
index 5a9f0bdc3ac43de6e89ce0b4d27a2978694f384a..0d25a6510be546ec99f9941662873d0c6502df71 100644
--- a/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbShiftScaleSampleListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbShiftScaleSampleListFilter_txx
-#define otbShiftScaleSampleListFilter_txx
+#ifndef otbShiftScaleSampleListFilter_hxx
+#define otbShiftScaleSampleListFilter_hxx
 
 #include "otbShiftScaleSampleListFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
index 42b72c1afa1be0ca7ff15aece3d4ce01166be063..6d42edd7633ef209fbee19983be0368667119afd 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.h
@@ -329,7 +329,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingCompareImageFilter.txx"
+#include "otbStreamingCompareImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
index 242e2d62fc0217009fc7eaf993752169718eb0f6..b67233a61908df8efe1f5f0e5ff33f3906856b6d 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingCompareImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingCompareImageFilter_txx
-#define otbStreamingCompareImageFilter_txx
+#ifndef otbStreamingCompareImageFilter_hxx
+#define otbStreamingCompareImageFilter_hxx
 #include "otbStreamingCompareImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
index a258628abedb1dada2c641b1cd7c426b13e7cffb..afc84acc3e21a194b24a1341bfbbc271d2efa1b2 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingHistogramVectorImageFilter.txx"
+#include "otbStreamingHistogramVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
index 6068616df34f5900122636e4b4c9d9245f762c96..c0f8cfa3e89dcb9bddb66a0d1f195f19219ef004 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingHistogramVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingHistogramVectorImageFilter_txx
-#define otbStreamingHistogramVectorImageFilter_txx
+#ifndef otbStreamingHistogramVectorImageFilter_hxx
+#define otbStreamingHistogramVectorImageFilter_hxx
 #include "otbStreamingHistogramVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
index 7058c1911c2243c05014104e2ef9dbed10324fd8..c1e82d30bf9a6a96d4fca3db883ef07f67c3a0ac 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.h
@@ -290,7 +290,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMinMaxImageFilter.txx"
+#include "otbStreamingMinMaxImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
index 0dbabd3c0c69f236749a43699eee99811ad685d4..295fe273d3f40f29e12498bedfb765c0d6ca0bde 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMinMaxImageFilter_txx
-#define otbStreamingMinMaxImageFilter_txx
+#ifndef otbStreamingMinMaxImageFilter_hxx
+#define otbStreamingMinMaxImageFilter_hxx
 #include "otbStreamingMinMaxImageFilter.h"
 
 #include <algorithm>
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
index d9c5c97b9184ed62e22370c2648f85418023983e..1019bfcccdb15f1a02ab6fe28923a7d9cdede863 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingMinMaxVectorImageFilter.txx"
+#include "otbStreamingMinMaxVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
index 5ea28dc66cba67a582dc4fbd4a09f58e95549176..155a5e20b6b6722e3713d49d63e3a9561db28910 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingMinMaxVectorImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingMinMaxVectorImageFilter_txx
-#define otbStreamingMinMaxVectorImageFilter_txx
+#ifndef otbStreamingMinMaxVectorImageFilter_hxx
+#define otbStreamingMinMaxVectorImageFilter_hxx
 #include "otbStreamingMinMaxVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
index 69a4d83d93b57de016bf053b4c62d0d43474c198..e73d6a68c355160088668e7eb43ef0672efea064 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.h
@@ -368,7 +368,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsImageFilter.txx"
+#include "otbStreamingStatisticsImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
index 0c6e758c9c9888c78c1544ce2bd408d046230d80..b6018ac992fa9a229ec0c1636495b68fb0441e09 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsImageFilter_txx
-#define otbStreamingStatisticsImageFilter_txx
+#ifndef otbStreamingStatisticsImageFilter_hxx
+#define otbStreamingStatisticsImageFilter_hxx
 #include "otbStreamingStatisticsImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
index 6ce9ed2be7adbd2cf3b243eec364741dacd61b14..94ccf482b4a0f9cdb022e9194d9a2d4d426d67b7 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.h
@@ -268,7 +268,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsMapFromLabelImageFilter.txx"
+#include "otbStreamingStatisticsMapFromLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
index dcff0ee1768a5e0fda9a58e413122946aa51b177..97865c94f9562607b49d2e08658891188d593275 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsMapFromLabelImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsMapFromLabelImageFilter_txx
-#define otbStreamingStatisticsMapFromLabelImageFilter_txx
+#ifndef otbStreamingStatisticsMapFromLabelImageFilter_hxx
+#define otbStreamingStatisticsMapFromLabelImageFilter_hxx
 #include "otbStreamingStatisticsMapFromLabelImageFilter.h"
 
 #include "itkInputDataObjectIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
index 7ba64bbcbf638f30734459fa79b1d33c6b9fba9e..0543969cac67ecd9fb6362d4803af15347f784dd 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.h
@@ -504,7 +504,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingStatisticsVectorImageFilter.txx"
+#include "otbStreamingStatisticsVectorImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
index c721aa0a9b032bc563aff963c7c37f5dc8eedd4e..a4ec6ff0f9496a8dd1e48735b54538b15f2eeaa5 100644
--- a/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbStreamingStatisticsVectorImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingStatisticsVectorImageFilter_txx
-#define otbStreamingStatisticsVectorImageFilter_txx
+#ifndef otbStreamingStatisticsVectorImageFilter_hxx
+#define otbStreamingStatisticsVectorImageFilter_hxx
 #include "otbStreamingStatisticsVectorImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
index fcf638c2d65f338d4080aadadd24f1bfa1b44c3b..b3efc4a92f199f7690ce7c9a47ec46a0620c3015 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVarianceImageFilter.txx"
+#include "otbVarianceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
index bb357ccf9e6e2597c50bcc1c47531224b5e7954a..df639aa3789d071055b8bb8f61a803a9d4d273f0 100644
--- a/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVarianceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVarianceImageFilter_txx
-#define otbVarianceImageFilter_txx
+#ifndef otbVarianceImageFilter_hxx
+#define otbVarianceImageFilter_hxx
 
 #include "otbVarianceImageFilter.h"
 
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
index ac89d754c351e625b2cc005ddf7003f3365e6405..9b01d0efc29d22a5e450c0ada6c72fa126592e74 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.h
@@ -102,7 +102,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToIntensityImageFilter.txx"
+#include "otbVectorImageToIntensityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
index 4ae27915720368dcbf0036dab95b6754eed016d8..d60596cdf70a0a14b28dc2fc940584bedf7a5367 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToIntensityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToIntensityImageFilter_txx
-#define otbVectorImageToIntensityImageFilter_txx
+#ifndef otbVectorImageToIntensityImageFilter_hxx
+#define otbVectorImageToIntensityImageFilter_hxx
 
 #include "otbVectorImageToIntensityImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
index 939a8bced61adc461db4b2f317c3b4b2f1f678aa..d6a72a52d7204d91c785b9dc273ab9b52e31ffb6 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.h
@@ -207,7 +207,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorImageToMatrixImageFilter.txx"
+#include "otbVectorImageToMatrixImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
index 0bd8d0e466b7411637d7fd284f3cef8745126998..c62146286ab20a1483ac23b45be7acd41d911cd8 100644
--- a/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
+++ b/Modules/Filtering/Statistics/include/otbVectorImageToMatrixImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorImageToMatrixFilter_txx
-#define otbVectorImageToMatrixFilter_txx
+#ifndef otbVectorImageToMatrixFilter_hxx
+#define otbVectorImageToMatrixFilter_hxx
 #include "otbVectorImageToMatrixImageFilter.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
index 0f073805ed77ce0cabacc0abd272169b8aade8fe..ed710abd82d0cfe131c63efbbaff615d59c2d00a 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConcatenateVectorDataFilter.txx"
+#include "otbConcatenateVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
index 54c87548adb6a064f5db19638f0a4fd54dea588a..80b5372ffb913b57ae562ab21ae93bed3d6bbe72 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbConcatenateVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConcatenateVectorDataFilter_txx
-#define otbConcatenateVectorDataFilter_txx
+#ifndef otbConcatenateVectorDataFilter_hxx
+#define otbConcatenateVectorDataFilter_hxx
 
 #include "otbConcatenateVectorDataFilter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
index 7266d7efcc1acc0e1e1f7741d400dd4c61390516..95593c9010f5de46aa6128b6bd0635d098dbb908 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.h
@@ -100,7 +100,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDBOverlapDataNodeFeatureFunction.txx"
+#include "otbDBOverlapDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
index 7bef4449b50cfca6ff6acdf7cb3524c91d8d7ecf..424f50a3da00118780d5141d2bbdd65ea9c671db 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbDBOverlapDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDBOverlapDataNodeFeatureFunction_txx
-#define otbDBOverlapDataNodeFeatureFunction_txx
+#ifndef otbDBOverlapDataNodeFeatureFunction_hxx
+#define otbDBOverlapDataNodeFeatureFunction_hxx
 
 #include "otbDBOverlapDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
index 95f95e3f42bb1eb280be4ac2aa20478e9470bd18..9f4ab226b0033418d35020562231cec4597fad35 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h
@@ -158,7 +158,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.txx"
+#include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
index 11a0b1c4c26db613179164e4548996c72ba0e771..ea5bae9245539164c4f6bfc8976d97a15a670a05 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
-#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_txx
+#ifndef otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_hxx
+#define otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction_hxx
 
 #include "otbRadiometryHomogenousWithNeighborhoodDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
index 08a8a4a520894f9abd2ca89ad37cc868e589b985..155fa0ea7a0ebda50ffeb5db8b8315150ef452fb 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.h
@@ -129,7 +129,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralAngleDataNodeFeatureFunction.txx"
+#include "otbSpectralAngleDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
index 3b5e219258128c9f69dd5287ef0dc973f49c7135..a155f52b6358b6f802ffb82aa624da84b69bee84 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbSpectralAngleDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralAngleDataNodeFeatureFunction_txx
-#define otbSpectralAngleDataNodeFeatureFunction_txx
+#ifndef otbSpectralAngleDataNodeFeatureFunction_hxx
+#define otbSpectralAngleDataNodeFeatureFunction_hxx
 
 #include "otbSpectralAngleDataNodeFeatureFunction.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
index 6e403dcd7c4ea5af9b805ffba2c3a8c4f001e4cd..4819475cf2b8152b1ee4b05613a8b4bc73cdc824 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.h
@@ -94,7 +94,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataAdapter.txx"
+#include "otbVectorDataAdapter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
index afa9e256771c0b4afb285f5b5539e314c4b1b298..b939a4bfd4326ae38cd5ac03d1adb7d79dd96443 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataAdapter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataAdapterFilter_txx
-#define otbVectorDataAdapterFilter_txx
+#ifndef otbVectorDataAdapterFilter_hxx
+#define otbVectorDataAdapterFilter_hxx
 
 #include "otbVectorDataAdapter.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
index 390c08fe7ac9e8db1b2cc2e321bc4c4bcb00c45e..6dc61e0fa98c6ce55500eb9620dae287850f9a97 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.h
@@ -150,7 +150,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataExtractROI.txx"
+#include "otbVectorDataExtractROI.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
index 4a807233d96c3bc05c066b05688c30489585e146..e7f98fb8efc69daf1143509a4431e375afdcc9ed 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataExtractROI.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataExtractROI_txx
-#define otbVectorDataExtractROI_txx
+#ifndef otbVectorDataExtractROI_hxx
+#define otbVectorDataExtractROI_hxx
 
 #include "otbVectorDataExtractROI.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
index ad9baa500aa07b606b28eb8e077fce7a767d246a..ec346bbbc5c7d78886c4d6a7b215915cf4ef6e44 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToRandomLineGenerator.txx"
+#include "otbVectorDataToRandomLineGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
index d7e5bea878a8031c8f30167f0505f80584060009..dba6c8300f3cc01992c60384e896cb34a381402a 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToRandomLineGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToRandomLineGenerator_txx
-#define otbVectorDataToRandomLineGenerator_txx
+#ifndef otbVectorDataToRandomLineGenerator_hxx
+#define otbVectorDataToRandomLineGenerator_hxx
 
 #include "otbVectorDataToRandomLineGenerator.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
index a360d58fdc1b998b118f6c0f9755dea126e19482..2adfd3e61049f332162fd9f4c68899468772aac8 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToSpecificDescriptionFilterBase.txx"
+#include "otbVectorDataToSpecificDescriptionFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
index 08fc1bdae0c5fb78a31ad52daf64c23a7dcf002e..e8f38cb490d65348071f19f791e0421dcfd3915b 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToSpecificDescriptionFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToSpecificDescriptionFilterBase_txx
-#define otbVectorDataToSpecificDescriptionFilterBase_txx
+#ifndef otbVectorDataToSpecificDescriptionFilterBase_hxx
+#define otbVectorDataToSpecificDescriptionFilterBase_hxx
 
 #include "otbVectorDataToSpecificDescriptionFilterBase.h"
 
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
index 43c68b43d262ae373cb0062d62321c5c173399b0..87192334227f939ab06ab33a1118afc56b128a24 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.h
@@ -131,7 +131,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToVectorDataFilter.txx"
+#include "otbVectorDataToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
index 8d8f881e1ad6472e92e5875b9f1e62d770d3775f..57edc6e307089a70816cf85fc66164b8a0d1804f 100644
--- a/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
+++ b/Modules/Filtering/VectorDataManipulation/include/otbVectorDataToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToVectorDataFilter_txx
-#define otbVectorDataToVectorDataFilter_txx
+#ifndef otbVectorDataToVectorDataFilter_hxx
+#define otbVectorDataToVectorDataFilter_hxx
 
 #include "otbVectorDataToVectorDataFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
index ff523bfd70b58dbc03863a0dccd64051ff27e93e..e2633ffecd04fd49ce7cf07b64d56efc1b1b155a 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.h
@@ -260,7 +260,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToMapFilter.txx"
+#include "otbVectorDataToMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
index 24e660e535e1773e117da0ea21c2e653e8bb9338..f6a9274ece4d6f26bad97537bc8e1e75c64096c5 100644
--- a/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
+++ b/Modules/Filtering/VectorDataRendering/include/otbVectorDataToMapFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataToMapFilter_txx
-#define otbVectorDataToMapFilter_txx
+#ifndef otbVectorDataToMapFilter_hxx
+#define otbVectorDataToMapFilter_hxx
 
 #include <sstream>
 #include "otbVectorDataToMapFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
index 3dfb27421a07f980840df9dda68863d6e1465e65..1e91d331e6fc2451c030aff276359f98daacddf2 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.h
@@ -142,7 +142,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubsampleImageFilter.txx"
+#include "otbSubsampleImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
index 57a9bfa971733d60f2ecd5807bb0bf62e3ef934e..07c4c9d4e7cfbe7ab5a9d3a6ec95d8680ac5cd81 100644
--- a/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbSubsampleImageFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSubsampleImageFilter_txx
-#define otbSubsampleImageFilter_txx
+#ifndef otbSubsampleImageFilter_hxx
+#define otbSubsampleImageFilter_hxx
 #include "otbSubsampleImageFilter.h"
 
 #include "otbMacro.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
index cb0d78d25a7b7551d702b1adc9f2e861377203df..2cad91ac0eb8f2b146c259cc3a48b795ba01aa9c 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.h
@@ -492,7 +492,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletFilterBank.txx"
+#include "otbWaveletFilterBank.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
index 5dcf3cfb463577f1a45e8f4ea7276d35fcdfaf4f..974a4c4dbdc8ceb8e9f85ffb360171e42dff423b 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletFilterBank.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletFilterBank_txx
-#define otbWaveletFilterBank_txx
+#ifndef otbWaveletFilterBank_hxx
+#define otbWaveletFilterBank_hxx
 #include "otbWaveletFilterBank.h"
 
 #include "otbSubsampleImageFilter.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
index d2efb9a66b85162ffb07588f6fb6fc5c0be3932e..8ece032e86f74ad2654f4c9c1bce456a539261ec 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
@@ -110,7 +110,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletImageFilter.txx"
+#include "otbWaveletImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
index 4f932121aa07df2a5a4288a4164a7c0b90aadf53..d3f4178a7dd0a2abb93ad07b75a218c30647ee94 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbWaveletImageFilter_txx
-#define otbWaveletImageFilter_txx
+#ifndef otbWaveletImageFilter_hxx
+#define otbWaveletImageFilter_hxx
 
 #include "otbWaveletImageFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
index fe16b95e837fcffbf97e01727b4d7e7679e9cec2..92195efd51c489fa9c4f1cf42b572688f13c7ee7 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
@@ -111,7 +111,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletInverseImageFilter.txx"
+#include "otbWaveletInverseImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
index 1bdc41c2807ebe71ec601fa3805c918604393483..a604de01baac8ab72d1f227b3cc7526b0ad8c912 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef __otbWaveletInverseImageFilter_txx
-#define __otbWaveletInverseImageFilter_txx
+#ifndef __otbWaveletInverseImageFilter_hxx
+#define __otbWaveletInverseImageFilter_hxx
 
 #include "otbWaveletInverseImageFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
index c8e1d21edee65068d71180e96bd806c68209e2c7..9c682d857763dd1204f4b839d1eb749b7a7e2b9b 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.h
@@ -276,7 +276,7 @@ protected:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletOperatorBase.txx"
+#include "otbWaveletOperatorBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
index 171f06f89abc4aef8f4d0a7820470438e1c44ed9..0b6887527fb530ac89523e1c07f31263629f7511 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletOperatorBase.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletOperatorBase_txx
-#define otbWaveletOperatorBase_txx
+#ifndef otbWaveletOperatorBase_hxx
+#define otbWaveletOperatorBase_hxx
 
 #include "otbWaveletOperatorBase.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
index 4efc0a1286e1c4543b40a1e1c2aff54256b06b55..1ef0fbaa649cebf5574a367c2ce1e56a0b36f6c8 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.h
@@ -369,7 +369,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletPacketTransform.txx"
+#include "otbWaveletPacketTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
index 168b76b5c663dc8b8f222af87dfab7d5155b9318..d23c3edfa34164839ae1f0fbe3dc291e3680c834 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletPacketTransform.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletPacketTransform_txx
-#define otbWaveletPacketTransform_txx
+#ifndef otbWaveletPacketTransform_hxx
+#define otbWaveletPacketTransform_hxx
 #include "otbWaveletPacketTransform.h"
 #include "otbMacro.h"
 
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
index 4a0a43f8d50a88bfcc6247c6ef747e2194482907..414aaa7cb9a22bdd8a5e0dcc1dfb9eef9e2ffe81 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.h
@@ -343,7 +343,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletTransform.txx"
+#include "otbWaveletTransform.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx b/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
index 73a09bc5859c7f67c314a9fd6a0317be87fcddd3..91ca10fe627da30beae9a9f05412e96a7158853c 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletTransform.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbWaveletTransform_txx
-#define otbWaveletTransform_txx
+#ifndef otbWaveletTransform_hxx
+#define otbWaveletTransform_hxx
 #include "otbWaveletTransform.h"
 
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
index 6dd659a202e3e54b1f98e44e61b596aad26b0ada..4a7434b2c473021f15378a631acd60a535c24abc 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
@@ -100,7 +100,7 @@ private:
 };
 }// End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.txx"
+#include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
index 8cf40c217696ee68b3da7b6d41de9514a51f826f..65b7072c3fe567bbe5e57f337c7d78f429bd1a51 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWaveletsBandsListToWaveletsSynopsisImageFilter_txx
-#define otbWaveletsBandsListToWaveletsSynopsisImageFilter_txx
+#ifndef otbWaveletsBandsListToWaveletsSynopsisImageFilter_hxx
+#define otbWaveletsBandsListToWaveletsSynopsisImageFilter_hxx
 
 #include "otbWaveletsBandsListToWaveletsSynopsisImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
index 2fbd4143c470d579ec933362611fbacce7a2811f..b4be5234312adae4d8545364016bf36146f9c86d 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
@@ -119,7 +119,7 @@ private:
 };
 }// End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.txx"
+#include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
index b74d69e611c5630f59bf711878c7e375658577a5..5089f4964acd628296dc94490def2adde6a02695 100644
--- a/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
+++ b/Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWaveletsSynopsisImageToWaveletsBandsListFilter_txx
-#define otbWaveletsSynopsisImageToWaveletsBandsListFilter_txx
+#ifndef otbWaveletsSynopsisImageToWaveletsBandsListFilter_hxx
+#define otbWaveletsSynopsisImageToWaveletsBandsListFilter_hxx
 
 #include "otbWaveletsSynopsisImageToWaveletsBandsListFilter.h"
 
diff --git a/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
index 47b35814ccd4fbf7aaec98ab375c93df444e8025..4d817eda57d151b918970c9c90e182b8cc1dc9c7 100644
--- a/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
+++ b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
@@ -62,7 +62,7 @@ WaveletGenerator<TMotherWaveletOperator>
 {
   std::ostringstream msg;
   msg << "The mother wavelet ID " << TMotherWaveletOperator;
-  msg << " is unknown or has to be implemented (check the txx file)...\n";
+  msg << " is unknown or has to be implemented (check the hxx file)...\n";
   throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
 }
 
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
index 8ff9ae486c402023c9bfb73ffe0468f12a59c87d..2aebe3b07b0253fc82ba5981e07a301028853970 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.h
@@ -118,7 +118,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFuzzyVariable.txx"
+#include "otbFuzzyVariable.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
index e54d8ccbfbfa37e677712e17b062d89e3101e7ca..baac16cbc0adee4de406602861474cf50e42b2d0 100644
--- a/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
+++ b/Modules/Fusion/Fuzzy/include/otbFuzzyVariable.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFuzzyVariable_txx
-#define otbFuzzyVariable_txx
+#ifndef otbFuzzyVariable_hxx
+#define otbFuzzyVariable_hxx
 
 
 #include "otbFuzzyVariable.h"
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
index fb885033c53d6865c7aefd73a6e7ef2706c8f2da..ce195333fb1df17ff4be79f81e533d77563f5c0a 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.h
@@ -220,7 +220,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbNeighborhoodMajorityVotingImageFilter.txx"
+#include "otbNeighborhoodMajorityVotingImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
index 3428d360e25e6995670364f5f3371ff9ae792e2a..992174a5a34e00923d6809bf18fe5c34e885d4bb 100644
--- a/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
+++ b/Modules/Fusion/MajorityVoting/include/otbNeighborhoodMajorityVotingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeighborhoodMajorityVotingImageFilter_txx
-#define otbNeighborhoodMajorityVotingImageFilter_txx
+#ifndef otbNeighborhoodMajorityVotingImageFilter_hxx
+#define otbNeighborhoodMajorityVotingImageFilter_hxx
 
 // First make sure that the configuration is available.
 // This line can be removed once the optimized versions
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
index c57b46d5680383dcd1cbd365cf585b30d5dbbf36..eb0b4a6389f69aaf1cb06cf9b94c534897cd7863 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.h
@@ -326,7 +326,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBayesianFusionFilter.txx"
+#include "otbBayesianFusionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
index 242e30afd1225aa1bdc7dad205b65d2ee14bf839..e87c8d82232b3e80c0197f559b5078c58c87a066 100644
--- a/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbBayesianFusionFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBayesianFusionFilter_txx
-#define otbBayesianFusionFilter_txx
+#ifndef otbBayesianFusionFilter_hxx
+#define otbBayesianFusionFilter_hxx
 
 #include "otbBayesianFusionFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
index df34eeadeb8c45236c82b2111c29008b4125666b..02b5f0a5488effc2600ce1e817406242871d9f6c 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.h
@@ -265,7 +265,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLmvmPanSharpeningFusionImageFilter.txx"
+#include "otbLmvmPanSharpeningFusionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
index 11aadef45adc83f554df6196030f701c0c6dd486..eb3e63c1caf12d63f5ef45f61660b3e19a890543 100644
--- a/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbLmvmPanSharpeningFusionImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLmvmPanSharpeningFusionImageFilter_txx
-#define otbLmvmPanSharpeningFusionImageFilter_txx
+#ifndef otbLmvmPanSharpeningFusionImageFilter_hxx
+#define otbLmvmPanSharpeningFusionImageFilter_hxx
 
 #include "otbLmvmPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
index 2808c721eb9f6eec7484a447891e16f80667904d..7256c1e6893a15f74e2d649a663e4d2f987b1e52 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.h
@@ -272,7 +272,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSimpleRcsPanSharpeningFusionImageFilter.txx"
+#include "otbSimpleRcsPanSharpeningFusionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
index 6218dd0d3a128d666994562e7291ed61170da256..e8a5c642fe8e9c9e557a0cde4f68a7f788fbeff4 100644
--- a/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
+++ b/Modules/Fusion/PanSharpening/include/otbSimpleRcsPanSharpeningFusionImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_txx
-#define otbSimpleRcsPanSharpeningFusionImageFilter_txx
+#ifndef otbSimpleRcsPanSharpeningFusionImageFilter_hxx
+#define otbSimpleRcsPanSharpeningFusionImageFilter_hxx
 
 #include "otbSimpleRcsPanSharpeningFusionImageFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
index 119d46ae5a59ddaf27c903c30c725b9219f50d0d..7e12e957f746a7c9e7932d16754426314038300a 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalRxDetectorFilter.txx"
+#include "otbLocalRxDetectorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
index 2e7aec6ae482190de4218f2e147ebc337098c5e2..6ee6f07d177b0d09ddb878ed146522731d900d21 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLocalRxDetectorFilter_txx
-#define otbLocalRxDetectorFilter_txx
+#ifndef otbLocalRxDetectorFilter_hxx
+#define otbLocalRxDetectorFilter_hxx
 
 #include "otbLocalRxDetectorFilter.h"
 
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
index fb7ca0da7e183d397b059bbd71984d189021febb..6e01dec46b4194ef725f0a8d7f1a0940838e29f7 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.h
@@ -116,7 +116,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLocalRxDetectorNonThreadFilter.txx"
+#include "otbLocalRxDetectorNonThreadFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
index 8f306108d1a1fb008b868e962b57b840dc27d0de..876cfe2cd2f9c3c9ee7f038585b724773caafaf1 100644
--- a/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
+++ b/Modules/Hyperspectral/AnomalyDetection/include/otbLocalRxDetectorNonThreadFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLocalRxDetectorNonThreadFilter_txx
-#define otbLocalRxDetectorNonThreadFilter_txx
+#ifndef otbLocalRxDetectorNonThreadFilter_hxx
+#define otbLocalRxDetectorNonThreadFilter_hxx
 
 #include "otbLocalRxDetectorNonThreadFilter.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
index 4165c416de32354f565d29bd98dfc725b05f9903..7da8b60d10b7a49639cd4f0345fb68a275d7fe01 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.h
@@ -124,7 +124,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbEigenvalueLikelihoodMaximisation.txx"
+#include "otbEigenvalueLikelihoodMaximisation.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
index a07479154ef5266612c00f369809a9d43e7bf09a..205f99aa3f143367aaf8a9da8c242fbe0cc49684 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbEigenvalueLikelihoodMaximisation.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbEigenvalueLikelihoodMaximisation_txx
-#define otbEigenvalueLikelihoodMaximisation_txx
+#ifndef otbEigenvalueLikelihoodMaximisation_hxx
+#define otbEigenvalueLikelihoodMaximisation_hxx
 
 #include "otbEigenvalueLikelihoodMaximisation.h"
 
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
index c64de134eb41c38119251aac9749582242369403..b67a2ddc16c3ff32041f59e364209b07ecf91375 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.h
@@ -135,6 +135,6 @@ private:
 
 } // end namesapce otb
 
-#include "otbVcaImageFilter.txx"
+#include "otbVcaImageFilter.hxx"
 
 #endif /* otbVCAImageFilter_h */
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
index 014ff8e7eef8cc32e52e8154eb583dbab4142020..6ff8dad735381821d93bb3ee43b8a355e10883e4 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVcaImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVCAImageFilter_txx
-#define otbVCAImageFilter_txx
+#ifndef otbVCAImageFilter_hxx
+#define otbVCAImageFilter_hxx
 
 #include "otbVcaImageFilter.h"
 #include "otbStandardWriterWatcher.h"
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
index 410c093a664baaaee4e71373dd623cc3f3907d08..0b5ee0d8cac6fd9e52001264d9b64c902e78184e 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.h
@@ -137,7 +137,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVirtualDimensionality.txx"
+#include "otbVirtualDimensionality.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
index 60735b5b2f00b2f465ea87c6884fbffdba81e43c..2f8fefab8922eef3b45e871f68b029ab994d9baf 100644
--- a/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
+++ b/Modules/Hyperspectral/EndmembersExtraction/include/otbVirtualDimensionality.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVirtualDimensionality_txx
-#define otbVirtualDimensionality_txx
+#ifndef otbVirtualDimensionality_hxx
+#define otbVirtualDimensionality_hxx
 
 #include "otbVirtualDimensionality.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
index 1b8801a8b4298936476fc4dc023affec2bf585fe..42b353b63dbd3b2c2dd881f561e09ac29c8a99ea 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.h
@@ -184,7 +184,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbISRAUnmixingImageFilter.txx"
+#include "otbISRAUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
index e49c9f32c13955b3f956423ce91180b431f6c80c..58286f552506a8992f4f0044f388c36935ffa0f1 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbISRAUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbISRAUnmixingImageFilter_txx
-#define otbISRAUnmixingImageFilter_txx
+#ifndef otbISRAUnmixingImageFilter_hxx
+#define otbISRAUnmixingImageFilter_hxx
 
 #include "otbISRAUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
index 2c84a4164a1f253300fa69885c5e486293c5cfe5..64fdd0bbbea3bec51e41f109d27a05a037af1be8 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.h
@@ -281,7 +281,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMDMDNMFImageFilter.txx"
+#include "otbMDMDNMFImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
index 3b8f50266ff2f6c3bd4bb2a9f4b1711cb3dfa09d..600400947c070d9e0fbec49490dd296aa0573ba7 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbMDMDNMFImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMDMDNMFImageFilter_txx
-#define otbMDMDNMFImageFilter_txx
+#ifndef otbMDMDNMFImageFilter_hxx
+#define otbMDMDNMFImageFilter_hxx
 
 #include "otbMDMDNMFImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
index 8121661932267cfe34794d5c572541e8e37f2809..0ee01c7e60fbafda48655bd076f3c246152f7b60 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.h
@@ -187,7 +187,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCLSUnmixingImageFilter.txx"
+#include "otbNCLSUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
index 9dc135b225dcf5551b1dae648bd9f45f28205a75..434985e7519cd23ed800e5172659694bf0bf8a29 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbNCLSUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCLSUnmixingImageFilter_txx
-#define otbNCLSUnmixingImageFilter_txx
+#ifndef otbNCLSUnmixingImageFilter_hxx
+#define otbNCLSUnmixingImageFilter_hxx
 
 #include "otbNCLSUnmixingImageFilter.h"
 #include <algorithm>
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
index 848641c3e0fab8ee18444cc259402a40c5702956..752c248b7101d460a2c999af4090d4084b84f6d8 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.h
@@ -183,7 +183,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSparseUnmixingImageFilter.txx"
+#include "otbSparseUnmixingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
index 150725421e47c6f176c77d2bc609ed741e9b5e17..1f854e11abcfe7f3a342c7aa6388da77a8c67fdd 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbSparseUnmixingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSparseUnmixingImageFilter_txx
-#define otbSparseUnmixingImageFilter_txx
+#ifndef otbSparseUnmixingImageFilter_hxx
+#define otbSparseUnmixingImageFilter_hxx
 
 #include "otbSparseUnmixingImageFilter.h"
 
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
index d25c5c4fb9a970705641ec177680f517c356d380..1e5efd0c03d60b16be9ef9d39780b8f590852765 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.h
@@ -188,7 +188,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbUnConstrainedLeastSquareImageFilter.txx"
+#include "otbUnConstrainedLeastSquareImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
index 1833ec25373110d2339aefef945c8ab357c25ae9..1d309139a332a104c56fa8a897d857c3541a85d1 100644
--- a/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
+++ b/Modules/Hyperspectral/Unmixing/include/otbUnConstrainedLeastSquareImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbUnConstrainedLeastSquareImageFilter_txx
-#define otbUnConstrainedLeastSquareImageFilter_txx
+#ifndef otbUnConstrainedLeastSquareImageFilter_hxx
+#define otbUnConstrainedLeastSquareImageFilter_hxx
 
 #include "otbUnConstrainedLeastSquareImageFilter.h"
 
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
index 99bf42ad8734ba15c5b1e770a26ef7a60caf017f..5b4de355d029ff3aeee0ba38aab01806eb7b7648 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.h
@@ -100,7 +100,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToOSMVectorDataGenerator.txx"
+#include "otbImageToOSMVectorDataGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
index 69952eedc8919e4c9a0a9b79ef3b84329e90c52c..280af84cccf372d91fbf34083f5caf1b48ed5e27 100644
--- a/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
+++ b/Modules/IO/Carto/include/otbImageToOSMVectorDataGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToOSMVectorDataGenerator_txx
-#define otbImageToOSMVectorDataGenerator_txx
+#ifndef otbImageToOSMVectorDataGenerator_hxx
+#define otbImageToOSMVectorDataGenerator_hxx
 
 #include "otbImageToOSMVectorDataGenerator.h"
 #include "otbGeoInformationConversion.h"
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.h b/Modules/IO/Carto/include/otbMapFileProductWriter.h
index a2e2d7e0d1df7498baea0fa0641f5e7de8bba8dd..c4458de059f05bbd257d788d45931725ffd1dd75 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.h
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.h
@@ -240,7 +240,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMapFileProductWriter.txx"
+#include "otbMapFileProductWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
index 8bc2c3c9425d5f54e5704c261a66d77c15eab178..ffe3b65e4af93f8d2b299aec8c7230dad78f335e 100644
--- a/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
+++ b/Modules/IO/Carto/include/otbMapFileProductWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMapFileProductWriter_txx
-#define otbMapFileProductWriter_txx
+#ifndef otbMapFileProductWriter_hxx
+#define otbMapFileProductWriter_hxx
 
 #include "otbMapFileProductWriter.h"
 #include "itksys/SystemTools.hxx"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
index 3dede58828da0550ffb745e051fc827bef093a04..dc518668fae9a2bdb28863ca6d5cfa1272347924 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.h
@@ -112,7 +112,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsXMLFileReader.txx"
+#include "otbStatisticsXMLFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
index 186ab47bd138c4ddd71ca6250538b7614e5ac888..147b83856810617f3596c5628703e12286f957e9 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsXMLFileReader_txx
-#define otbStatisticsXMLFileReader_txx
+#ifndef otbStatisticsXMLFileReader_hxx
+#define otbStatisticsXMLFileReader_hxx
 
 #include "otbStatisticsXMLFileReader.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
index 594f55283bf22cf076e994810044ba5688a860c0..596dd41e175a1490e44930bb923fa9f1c80cf25e 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.h
@@ -108,7 +108,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStatisticsXMLFileWriter.txx"
+#include "otbStatisticsXMLFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
index 0d6e6593746517d68959ddf189708b724a92edbd..332bf2fe57ced60bc9dadcd81d53714fa013a5cb 100644
--- a/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
+++ b/Modules/IO/IOXML/include/otbStatisticsXMLFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStatisticsXMLFileWriter_txx
-#define otbStatisticsXMLFileWriter_txx
+#ifndef otbStatisticsXMLFileWriter_hxx
+#define otbStatisticsXMLFileWriter_hxx
 
 #include "otbStatisticsXMLFileWriter.h"
 #include "itkMacro.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.h b/Modules/IO/ImageIO/include/otbImageFileReader.h
index f136a6bec8252b3a79fffacd06d417d1b41d8f53..b3414c0895bf4a41d9f47254367279883f147830 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.h
@@ -212,7 +212,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFileReader.txx"
+#include "otbImageFileReader.hxx"
 #endif
 
 #endif // otbImageFileReader_h
diff --git a/Modules/IO/ImageIO/include/otbImageFileReader.hxx b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
index 5ed852539b4d971026705b97befe06b5ef0bc771..da9350ff6ec96fd25a2966ead602b12d9a04566d 100644
--- a/Modules/IO/ImageIO/include/otbImageFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFileReader_txx
-#define otbImageFileReader_txx
+#ifndef otbImageFileReader_hxx
+#define otbImageFileReader_hxx
 
 #include "otbImageFileReader.h"
 #include "otbConfigure.h"
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.h b/Modules/IO/ImageIO/include/otbImageFileWriter.h
index 7313b074b6465524f7dbaed627f3a569f5b3bb6f..2828234eda2f03b80eee47d2ff18ea6de0145588 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.h
@@ -287,7 +287,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageFileWriter.txx"
+#include "otbImageFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
index 2a2a3255553b5782088a66e713ccd7d1e56c93d5..c3cb72d50aa8863e0e479870ae4b3c9637e298b7 100644
--- a/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageFileWriter_txx
-#define otbImageFileWriter_txx
+#ifndef otbImageFileWriter_hxx
+#define otbImageFileWriter_hxx
 
 #include "otbImageFileWriter.h"
 #include "itkImageFileWriter.h"
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
index d31a890d683304f5f75c2791b690c1329f3635f8..e5fcbbead2f445fafd4a755695925b3ed893644d 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.h
@@ -470,7 +470,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSeriesFileReader.txx"
+#include "otbImageSeriesFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
index 03c153a2d2b2844374010b19f4d0448c311d6084..2fb1d0fc5ba70a64100010d5938d4556edb474f5 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReader.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbImageSeriesFileReader_txx
-#define otbImageSeriesFileReader_txx
+#ifndef otbImageSeriesFileReader_hxx
+#define otbImageSeriesFileReader_hxx
 #include "otbImageSeriesFileReader.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
index 58b071957e30e90b09ee7899db4d04227b0d0de1..6493c9597aa2a252a68ee6df4ebe920991e658bf 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.h
@@ -200,7 +200,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSeriesFileReaderBase.txx"
+#include "otbImageSeriesFileReaderBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
index a9eea80e2412ee01a46de0eb0b6cbefd50c43377..3dbdec0a9095c72f3ddd06626124d32a96801863 100644
--- a/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
+++ b/Modules/IO/ImageIO/include/otbImageSeriesFileReaderBase.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbImageSeriesFileReaderBase_txx
-#define otbImageSeriesFileReaderBase_txx
+#ifndef otbImageSeriesFileReaderBase_hxx
+#define otbImageSeriesFileReaderBase_hxx
 #include "otbImageSeriesFileReaderBase.h"
 
 namespace otb {
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
index 6b01674b52fb3756e49b1dcc761f59ab657c13fd..3137fa7bc09de7ed9c5247a120ac1fa9a304483c 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.h
@@ -290,7 +290,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiImageFileWriter.txx"
+#include "otbMultiImageFileWriter.hxx"
 #endif
 
 #endif // otbMultiImageFileWriter_h
diff --git a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
index 5e6d6304dc52aa3dc95a497b45264ff2cc15d277..849eea28a6c957b3e53f75a1344de676beda0511 100644
--- a/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbMultiImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiImageFileWriter_txx
-#define otbMultiImageFileWriter_txx
+#ifndef otbMultiImageFileWriter_hxx
+#define otbMultiImageFileWriter_hxx
 
 #include "otbMultiImageFileWriter.h"
 #include "otbImageIOFactory.h"
@@ -86,4 +86,4 @@ MultiImageFileWriter::Sink<TImage>
 
 } // end of namespace otb
 
-#endif // otbMultiImageFileWriter_txx
+#endif // otbMultiImageFileWriter_hxx
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
index 86d7c3faa199969d9a3d778a6d0aee73cc173d37..cdf0beeaf9b433645c50546f63cdb62db6a0831e 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbScalarBufferToImageFileWriter.txx"
+#include "otbScalarBufferToImageFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
index e18329a0022bb9e5dd7e532a09c3d0382f2a7320..f60f87e7d1fa54ab3da5e8c3f7e2d613f5bf5dfc 100644
--- a/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
+++ b/Modules/IO/ImageIO/include/otbScalarBufferToImageFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbScalarBufferToImageFileWriter_txx
-#define otbScalarBufferToImageFileWriter_txx
+#ifndef otbScalarBufferToImageFileWriter_hxx
+#define otbScalarBufferToImageFileWriter_hxx
 
 #include "otbMacro.h"
 
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
index 9acdf7eddc840786616acd8324abeaec7c9e75be..bb19e43453486a340f1b94a18fc28846683a2123 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.h
@@ -320,7 +320,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKmzProductWriter.txx"
+#include "otbKmzProductWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
index 5e54d1e86daf8613eef8dd99ee9270e7e559f4d6..caa8e518b899bf5dcc7369c3af21d08347287c46 100644
--- a/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
+++ b/Modules/IO/KMZWriter/include/otbKmzProductWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKmzProductWriter_txx
-#define otbKmzProductWriter_txx
+#ifndef otbKmzProductWriter_hxx
+#define otbKmzProductWriter_hxx
 
 #include <string>
 
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
index 1730092353d9711a768e9fe0f78dcba01e79a041..0bfc1313cd445253a2d6f5a0765bcfea921dbdfc 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.h
@@ -130,7 +130,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDifferenceImageFilter.txx"
+#include "otbDifferenceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
index 1074686bdcc84ed59cf9e2b4a3c7752fd7d2e820..a74038f9260d2dce660ecfa18d38d7c8504964fe 100644
--- a/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
+++ b/Modules/IO/TestKernel/include/otbDifferenceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDifferenceImageFilter_txx
-#define otbDifferenceImageFilter_txx
+#ifndef otbDifferenceImageFilter_hxx
+#define otbDifferenceImageFilter_hxx
 
 #include "otbDifferenceImageFilter.h"
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
index 4df9b28092071e01866a34b5e01f0f6f61311dda..3538352e0365db953a0dffb2225a6c1048413a49 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataFileReader.txx"
+#include "otbVectorDataFileReader.hxx"
 #endif
 
 #endif // otbVectorDataFileReader_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
index 222c813c57e6edbf667477723429709957e6e5c9..397c96751f1872a3077edcd485bae8cb8ddc8714 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileReader.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataFileReader_txx
-#define otbVectorDataFileReader_txx
+#ifndef otbVectorDataFileReader_hxx
+#define otbVectorDataFileReader_hxx
 
 #include <fstream>
 
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
index bd285d54b6734d7dd5e1982889065427a6660b52..157c941c5f702eeb48028d5bd10448d281c4534c 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataFileWriter.txx"
+#include "otbVectorDataFileWriter.hxx"
 #endif
 
 #endif // otbVectorDataFileWriter_h
diff --git a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
index d0d66eed741ae024291aeb8424e8b07c8484a859..d960743ec9e6bbc84c1077db6fe86e905682781c 100644
--- a/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
+++ b/Modules/IO/VectorDataIO/include/otbVectorDataFileWriter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbVectorDataFileWriter_txx
-#define otbVectorDataFileWriter_txx
+#ifndef otbVectorDataFileWriter_hxx
+#define otbVectorDataFileWriter_hxx
 
 #include "otbMacro.h"
 #include "otbVectorDataFileWriter.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
index 49ae13d3bf9510343e116f624ef276631c0d29ac..b11ab143d654b9ed7ee49c2534671570fbd577bf 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.h
@@ -164,7 +164,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixToMassOfBelief.txx"
+#include "otbConfusionMatrixToMassOfBelief.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
index d5bfae3d122fd267d14b40947f5fa2063fc4221f..3f8a4202bb9bf88bae634b61f8b311a4c1cc7e25 100644
--- a/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbConfusionMatrixToMassOfBelief.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixToMassOfBelief_txx
-#define otbConfusionMatrixToMassOfBelief_txx
+#ifndef otbConfusionMatrixToMassOfBelief_hxx
+#define otbConfusionMatrixToMassOfBelief_hxx
 
 #include "otbConfusionMatrixToMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
index 18afb8e0f817aa0e6d98148463b7e8c6d415e0d0..d7baae4973de95fe17d1cb4c91a9f563c3eb9f60 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.h
@@ -170,7 +170,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDSFusionOfClassifiersImageFilter.txx"
+#include "otbDSFusionOfClassifiersImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
index cf618e75c2533f9ae3f58be3d4c76eaa1e45005d..889ee00d2852342146adc5a001d6b316cfa19277 100644
--- a/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbDSFusionOfClassifiersImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDSFusionOfClassifiersImageFilter_txx
-#define otbDSFusionOfClassifiersImageFilter_txx
+#ifndef otbDSFusionOfClassifiersImageFilter_hxx
+#define otbDSFusionOfClassifiersImageFilter_hxx
 
 #include "otbDSFusionOfClassifiersImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
index 4a08d78764cef9dc1fc6b677ad108c9bf258d6a5..f3be3d920c2a826ed6addcf179f56643a0891ff5 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.h
@@ -107,7 +107,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbJointMassOfBeliefFilter.txx"
+#include "otbJointMassOfBeliefFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
index 35b893df3404b3680ce984c14e0a569a27d384fc..15df8a2ce15b8dfa253948eb3e1e947d3eb69a39 100644
--- a/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbJointMassOfBeliefFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbJointMassOfBeliefFilter_txx
-#define otbJointMassOfBeliefFilter_txx
+#ifndef otbJointMassOfBeliefFilter_hxx
+#define otbJointMassOfBeliefFilter_hxx
 
 #include "otbJointMassOfBeliefFilter.h"
 
@@ -211,7 +211,7 @@ JointMassOfBeliefFilter<TMassFunction>
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbJointMassOfBeliefFilter.txx"
+#include "otbJointMassOfBeliefFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
index 6f99177e877d88e672d843135043df3e8b3cebd8..58e265ce27ee77933efd0261be177c94bb77af60 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.h
@@ -197,7 +197,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMassOfBelief.txx"
+#include "otbMassOfBelief.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
index 7bf2289e492094bae1b759ee3745ec2f587db6b5..7d52776ee605864d53c7eaf45d5b21e4e84867ac 100644
--- a/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbMassOfBelief.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMassOfBelief_txx
-#define otbMassOfBelief_txx
+#ifndef otbMassOfBelief_hxx
+#define otbMassOfBelief_hxx
 
 #include "otbMassOfBelief.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
index 98b1bc803f9f21b54569b3a8693c5e607a3a13e4..5e0e6464f55b7d88a30a30fef25a67c35ce7f759 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.h
@@ -177,7 +177,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStandardDSCostFunction.txx"
+#include "otbStandardDSCostFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
index fab661ea247165473eda8c4cc0691d7fbe3d7f0e..4829d1b55702558027f14f4a96cf53aefe61f118 100644
--- a/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbStandardDSCostFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStandardDSCostFunction_txx
-#define otbStandardDSCostFunction_txx
+#ifndef otbStandardDSCostFunction_hxx
+#define otbStandardDSCostFunction_hxx
 
 #include "otbStandardDSCostFunction.h"
 
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
index ca77284e9aaee49b9ee85222ef171167d9260703..b72d4b0dda0dc18fbe0ea1b00a20008da90cfd7f 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToDSValidatedVectorDataFilter.txx"
+#include "otbVectorDataToDSValidatedVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
index 7e5237c097cb9f9a6ba1c3d1c2c5001ced422a9e..91063119a8082c066b7b99512c43eb481eb6c135 100644
--- a/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
+++ b/Modules/Learning/DempsterShafer/include/otbVectorDataToDSValidatedVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToDSValidatedVectorDataFilter_txx
-#define otbVectorDataToDSValidatedVectorDataFilter_txx
+#ifndef otbVectorDataToDSValidatedVectorDataFilter_hxx
+#define otbVectorDataToDSValidatedVectorDataFilter_hxx
 
 #include "otbVectorDataToDSValidatedVectorDataFilter.h"
 #include <iostream>
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
index 69446f002b64247a630b8572cf5c1d2420c7d261..0dd8a314028702de013e75644f059c72b23df016 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
@@ -186,7 +186,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAutoencoderModel.txx"
+#include "otbAutoencoderModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
index e5a26e9ee3dc8cbf4918222f4b7b45bc93e925cb..636f62cfd22ec339da109a2a7a7fea75832481bf 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbAutoencoderModel_txx
-#define otbAutoencoderModel_txx
+#ifndef otbAutoencoderModel_hxx
+#define otbAutoencoderModel_hxx
 
 #include "otbAutoencoderModel.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
index 5110fc6137dc3b2d8b404670314cc81ebd7465ca..7f71fdedbd7757b0d5213a43a8c91da056d1a9e6 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
@@ -72,7 +72,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAutoencoderModelFactory.txx"
+#include "otbAutoencoderModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
index c55f718a622ccd6ecc9632bd8cac7b9aa38c78bf..50146f20ba5ed83963c8b2303798ed6bc99c6f1d 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbAutoencoderModelFactory_txx
-#define otbAutoencoderModelFactory_txx
+#ifndef otbAutoencoderModelFactory_hxx
+#define otbAutoencoderModelFactory_hxx
 
 #include "otbAutoencoderModelFactory.h"
 #include "otbAutoencoderModel.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
index c92d7d63d3643e8b3fa7b9ef7bd8e22c7534534c..7ddeeda00989df7713e2c23c84cf78cb02771d21 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h
@@ -78,7 +78,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDimensionalityReductionModelFactory.txx"
+#include "otbDimensionalityReductionModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
index 0760e1514294ee56c3fffcb81bd89352827f4c43..8f56fe58ee136f6944a61655a0589dcd79c8acf3 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbDimensionalityReductionModelFactory_txx
-#define otbDimensionalityReductionModelFactory_txx
+#ifndef otbDimensionalityReductionModelFactory_hxx
+#define otbDimensionalityReductionModelFactory_hxx
 
 #include "otbDimensionalityReductionModelFactory.h"
 #include "otbConfigure.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
index d48d400cc243cfa80bb610bd533ca2284392fee1..5ef0689a891100f493afcefa4f1a2ec35dcea44a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
@@ -140,7 +140,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageDimensionalityReductionFilter.txx"
+#include "otbImageDimensionalityReductionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
index b48a264a36ca1c42bf1450e1cc6dc2d3ee927345..85a8142e0b9049716844394891b2ebdb0e33ae08 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbImageDimensionalityReductionFilter_txx
-#define otbImageDimensionalityReductionFilter_txx
+#ifndef otbImageDimensionalityReductionFilter_hxx
+#define otbImageDimensionalityReductionFilter_hxx
 
 #include "otbImageDimensionalityReductionFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
index 501a4618d4eab983a173e4e2029aa82591445bf2..3752382c36905bc92b8a392017d65eccfbce7dda 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
@@ -114,7 +114,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAModel.txx"
+#include "otbPCAModel.hxx"
 #endif
 
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
index a387852fecc386d9c5f2a6c27c7bf39cd7a3649d..85601662729a23d931b2b5d841494b7633b8728a 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbPCAModel_txx
-#define otbPCAModel_txx
+#ifndef otbPCAModel_hxx
+#define otbPCAModel_hxx
 
 #include "otbPCAModel.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
index 2fa07f5e99bd91c5e85fda0c96210f5370e7aed5..74fb5ef4fe4ad3f098d9baaab6c123c576a5d29f 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.h
@@ -71,7 +71,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPCAModelFactory.txx"
+#include "otbPCAModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
index ab31accbe01b926a1d4ca57b4f23b3fc813cd931..c309e601da9e77ece51eff0fdeb9e819b66281cf 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbPCAModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbPCAFactory_txx
-#define otbPCAFactory_txx
+#ifndef otbPCAFactory_hxx
+#define otbPCAFactory_hxx
 
 #include "otbPCAModelFactory.h"
 
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index d1f2ec37ceed6fd1398e8a505374858a343d49ca..11c5fe592a7b56ca04a6ca81c55edfdfb4ec0f7e 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -149,7 +149,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMModel.txx"
+#include "otbSOMModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
index e1d7dc3fc6251abbdbd3aa210cd3c3ebced903d8..2c2abca261bb0533745eaf55fad822f9d9397f03 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSOMModel_txx
-#define otbSOMModel_txx
+#ifndef otbSOMModel_hxx
+#define otbSOMModel_hxx
 
 #include "otbSOMModel.h"
 #include "otbSOM.h"
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
index 2cbc78e2d02371e2e9e2e2f7d9ce698f1c1b66cb..d0a420cbc0581fae90cc8d0d43667cf7c436041b 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.h
@@ -72,7 +72,7 @@ private:
 } //namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMModelFactory.txx"
+#include "otbSOMModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
index 5799660768e900fa37e2dc1f4365a5f37b66079d..755e0a86b9a483c3bad3266ccd1dc1f0e9de472c 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSOMFactory_txx
-#define otbSOMFactory_txx
+#ifndef otbSOMFactory_hxx
+#define otbSOMFactory_hxx
 
 #include "otbSOMModelFactory.h"
 
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.h b/Modules/Learning/LearningBase/include/otbDecisionTree.h
index 7c71c01ba10fd25c5263f16e5f7816fda5e275b7..34b56ded33f2582500b4e315e9ab69e7e7aa2e45 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.h
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTree.txx"
+#include "otbDecisionTree.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbDecisionTree.hxx b/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
index e2430982d7bb4ea3aac1dbb01bc419fc4888bd2c..aa2559531bcc091cd089529417c44a0f9bb9b397 100644
--- a/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
+++ b/Modules/Learning/LearningBase/include/otbDecisionTree.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTree_txx
-#define otbDecisionTree_txx
+#ifndef otbDecisionTree_hxx
+#define otbDecisionTree_hxx
 
 #include "otbDecisionTree.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
index 77b407846744f2623c27563bf2363e0c8a3b0631..a28c91fcbeb144a55c207ae54c45bdc2c1431c56 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.h
@@ -113,7 +113,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGaussianModelComponent.txx"
+#include "otbGaussianModelComponent.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
index ada1f2d3c51b5dbe8e3fc3b8cd4121fca28e05e3..eb3d71cafbd0ce8dceb995b89f99b904218d81a8 100644
--- a/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
+++ b/Modules/Learning/LearningBase/include/otbGaussianModelComponent.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGaussianModelComponent_txx
-#define otbGaussianModelComponent_txx
+#ifndef otbGaussianModelComponent_hxx
+#define otbGaussianModelComponent_hxx
 
 #include <iostream>
 
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
index a7a30cd5f80881b40931acb120d68d59d5560060..4609ce047de79e67fcb7a5e09a1174579ba172a0 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.h
@@ -138,7 +138,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageClassificationFilter.txx"
+#include "otbImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
index 3306f71872279b83001c97f9ded9786179371adc..fda4ab00349481e59c459257999737dd6b744b27 100644
--- a/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageClassificationFilter_txx
-#define otbImageClassificationFilter_txx
+#ifndef otbImageClassificationFilter_hxx
+#define otbImageClassificationFilter_hxx
 
 #include "otbImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
index 3de3c8a3a23658f52f3baaa63088383ffc1e05b1..7b52de4dbd28c5b4eb0f7a085727b0b140b8d10c 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.h
@@ -128,7 +128,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKMeansImageClassificationFilter.txx"
+#include "otbKMeansImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
index 98a1b9ae8012a4956d9151a71df51d5212979b18..1dc15df5ae8d35fd8cdb633af6bec7c88a2ec593 100644
--- a/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
+++ b/Modules/Learning/LearningBase/include/otbKMeansImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKMeansImageClassificationFilter_txx
-#define otbKMeansImageClassificationFilter_txx
+#ifndef otbKMeansImageClassificationFilter_hxx
+#define otbKMeansImageClassificationFilter_hxx
 
 #include "otbKMeansImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
index 38632d5f4e2c38cfe8df09d547c589aab4fdcc4a..01f522a4feccf6afbc246c7f61f5b14aa0e0cea5 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.h
@@ -246,7 +246,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMachineLearningModel.txx"
+#include "otbMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
index 46b7f60016c54c853fd0e9474b36b7c15d27063e..a2c353a89a90865d2510eeafba9a75de2c18ee3d 100644
--- a/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
+++ b/Modules/Learning/LearningBase/include/otbMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMachineLearningModel_txx
-#define otbMachineLearningModel_txx
+#ifndef otbMachineLearningModel_hxx
+#define otbMachineLearningModel_hxx
 
 #ifdef _OPENMP
  # include <omp.h>
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.h b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
index 0b598f44b5106525ee11506425e64f1038985460..0a0af75660bb338da062a85175b7094f97a83f4d 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.h
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.h
@@ -226,7 +226,7 @@ private:
 } // end of namespace
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSEMClassifier.txx"
+#include "otbSEMClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx b/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
index 5e926710ea3bfaba6984ff0668f89da92d08e98e..dc687494181a6ccf177788633ff9da7a946dac80 100644
--- a/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
+++ b/Modules/Learning/LearningBase/include/otbSEMClassifier.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSEMClassifier_txx
-#define otbSEMClassifier_txx
+#ifndef otbSEMClassifier_hxx
+#define otbSEMClassifier_hxx
 
 #include <cstdlib>
 
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
index daced60f4437ee12a8fa1b24eb1ec425b17b1616..b9ab131bfcf5cf175f8a94104b4b3d52aa009447 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.h
@@ -390,7 +390,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMarkovRandomFieldFilter.txx"
+#include "otbMarkovRandomFieldFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
index 0e7833f4cec8b73bd6eb0a234992ec5a7832a7f0..3473e2f423eb90b969339f1ee20fd2b0b315337a 100644
--- a/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
+++ b/Modules/Learning/Markov/include/otbMarkovRandomFieldFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbMarkovRandomFieldFilter_txx
-#define otbMarkovRandomFieldFilter_txx
+#ifndef otbMarkovRandomFieldFilter_hxx
+#define otbMarkovRandomFieldFilter_hxx
 #include "otbMarkovRandomFieldFilter.h"
 
 namespace otb
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.h b/Modules/Learning/SOM/include/otbPeriodicSOM.h
index ae33ebe576a87709c0acd3146c2f97359a4e3c8e..a565b39ca5588fd124d7afd33183cb72e4d0c211 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.h
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.h
@@ -136,7 +136,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPeriodicSOM.txx"
+#include "otbPeriodicSOM.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbPeriodicSOM.hxx b/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
index 711748ca668f9cd34565fe2afed0a4b7eadb24bf..6a267f5aa8c98468aec3fbd35e9c4285ff07532b 100644
--- a/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
+++ b/Modules/Learning/SOM/include/otbPeriodicSOM.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbPeriodicSOM_txx
-#define otbPeriodicSOM_txx
+#ifndef otbPeriodicSOM_hxx
+#define otbPeriodicSOM_hxx
 
 #include "itkNumericTraits.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOM.h b/Modules/Learning/SOM/include/otbSOM.h
index f506f086dcb11c41633af0404e0c361aecae5240..4c002cf6570ddd7ce5de27d4e0bf5f87a56abf62 100644
--- a/Modules/Learning/SOM/include/otbSOM.h
+++ b/Modules/Learning/SOM/include/otbSOM.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOM.txx"
+#include "otbSOM.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOM.hxx b/Modules/Learning/SOM/include/otbSOM.hxx
index e8a1c15268b5794610109a65cb46ad1b0bd45d01..cf044b0cd1b1663dbb3dbc82dbfe093c78ed072a 100644
--- a/Modules/Learning/SOM/include/otbSOM.hxx
+++ b/Modules/Learning/SOM/include/otbSOM.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOM_txx
-#define otbSOM_txx
+#ifndef otbSOM_hxx
+#define otbSOM_hxx
 
 #include "otbSOM.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
index 4bbdc898cf4266d124d6a13530d643527febf419..2b9163aa4b2964dec74be4cef1d456a432208e75 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.h
@@ -89,7 +89,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMActivationBuilder.txx"
+#include "otbSOMActivationBuilder.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx b/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
index 4cf475df2e0309c43fb270d5bb80e9f9722a6125..09730e1e8af97bfca1c15950e6f515e5dd54ba5f 100644
--- a/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
+++ b/Modules/Learning/SOM/include/otbSOMActivationBuilder.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMActivationBuilder_txx
-#define otbSOMActivationBuilder_txx
+#ifndef otbSOMActivationBuilder_hxx
+#define otbSOMActivationBuilder_hxx
 
 #include "otbSOMActivationBuilder.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.h b/Modules/Learning/SOM/include/otbSOMClassifier.h
index 55027d4435a73a54db0114e79ffc6de10042c4cc..b291250039c64c448f49167db101c571190cace6 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.h
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.h
@@ -102,7 +102,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMClassifier.txx"
+#include "otbSOMClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMClassifier.hxx b/Modules/Learning/SOM/include/otbSOMClassifier.hxx
index 5401e4bc5d160c763952ad03f57ec7cfac45cbbb..c789e45c7c3a0154404b3b0844cdc2dbdffdd65f 100644
--- a/Modules/Learning/SOM/include/otbSOMClassifier.hxx
+++ b/Modules/Learning/SOM/include/otbSOMClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMClassifier_txx
-#define otbSOMClassifier_txx
+#ifndef otbSOMClassifier_hxx
+#define otbSOMClassifier_hxx
 
 #include "otbSOMClassifier.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
index 3b913d2dae916c7b542213b2016b307868267b35..6ad8984858eafcc3ed00724fae9316b4474e3447 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.h
@@ -125,7 +125,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMImageClassificationFilter.txx"
+#include "otbSOMImageClassificationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
index b5942d37a4353d1e60c8c536244779e76a204198..78f7969b89f32dc1f6cfc9af331e8aa491214cd5 100644
--- a/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
+++ b/Modules/Learning/SOM/include/otbSOMImageClassificationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMImageClassificationFilter_txx
-#define otbSOMImageClassificationFilter_txx
+#ifndef otbSOMImageClassificationFilter_hxx
+#define otbSOMImageClassificationFilter_hxx
 
 #include "otbSOMImageClassificationFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Learning/SOM/include/otbSOMMap.h b/Modules/Learning/SOM/include/otbSOMMap.h
index fdaa7aba7423f2a26fa8ef18550c6bf246da3cd8..6177034f7d2a1a71db82dba5b0e2a7b1868aacc6 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.h
+++ b/Modules/Learning/SOM/include/otbSOMMap.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMMap.txx"
+#include "otbSOMMap.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMMap.hxx b/Modules/Learning/SOM/include/otbSOMMap.hxx
index 7edb2c9257bc55a04c8f59a96bc689e386c67854..2ff52aa71f6ba1963934978fad8dd1a7a70f8a21 100644
--- a/Modules/Learning/SOM/include/otbSOMMap.hxx
+++ b/Modules/Learning/SOM/include/otbSOMMap.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMMap_txx
-#define otbSOMMap_txx
+#ifndef otbSOMMap_hxx
+#define otbSOMMap_hxx
 
 #include "otbSOMMap.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
index 1d32719dab6915def50f363f5cfc407f08c7d60e..403404907f4b8bad2bb331dedcf072f7fa13473a 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.h
@@ -120,7 +120,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMWithMissingValue.txx"
+#include "otbSOMWithMissingValue.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx b/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
index 9378b147e1975dc338ba367d0c55a8f54036a1a8..e5794e507ff2b23928f163e1e6fef29eba67880e 100644
--- a/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
+++ b/Modules/Learning/SOM/include/otbSOMWithMissingValue.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMWithMissingValue_txx
-#define otbSOMWithMissingValue_txx
+#ifndef otbSOMWithMissingValue_hxx
+#define otbSOMWithMissingValue_hxx
 
 #include "otbSOMWithMissingValue.h"
 
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
index 78b169646faae24d87089f822b13ead32b6e869a..18b3be2d3a92f6048dd2546b4419baacde1ea7f6 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.h
@@ -160,7 +160,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSOMbasedImageFilter.txx"
+#include "otbSOMbasedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
index 914df9a6dc3332b31d29799bbb4328bd699ba064..ebc249d6616f1b12e6daba0bdc8bfdcf238c95af 100644
--- a/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
+++ b/Modules/Learning/SOM/include/otbSOMbasedImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSOMbasedImageFilter_txx
-#define otbSOMbasedImageFilter_txx
+#ifndef otbSOMbasedImageFilter_hxx
+#define otbSOMbasedImageFilter_hxx
 
 #include "otbSOMbasedImageFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
index af80118a95a0313ff9e2a9ef389158248618273f..36d5f638043501bf577c054bff9eecfc76450ff8 100644
--- a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
+++ b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.h
@@ -188,7 +188,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSampleExtractorFilter.txx"
+#include "otbImageSampleExtractorFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
index d5faa1064cb5c5a589dba2d64f5909d07007ff24..5676411f7d9372d0d439f9c70895ec8873b36d98 100644
--- a/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbImageSampleExtractorFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageSampleExtractorFilter_txx
-#define otbImageSampleExtractorFilter_txx
+#ifndef otbImageSampleExtractorFilter_hxx
+#define otbImageSampleExtractorFilter_hxx
 
 #include "otbImageSampleExtractorFilter.h"
 #include "itkDefaultConvertPixelTraits.h"
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
index 39230855b07e8fe4b65e9bfd756bd497d692fd11..0bed151c83a2939893aaee3e0354fbbcdeb69cfc 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.h
@@ -193,7 +193,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataToClassStatisticsFilter.txx"
+#include "otbOGRDataToClassStatisticsFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
index 9aeb389a0190dd93c6edc73acad04195d4e9c8b7..6e6c1f07eaf5dc0fcb8b953172205773a0381f50 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToClassStatisticsFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataToClassStatisticsFilter_txx
-#define otbOGRDataToClassStatisticsFilter_txx
+#ifndef otbOGRDataToClassStatisticsFilter_hxx
+#define otbOGRDataToClassStatisticsFilter_hxx
 
 #include "otbOGRDataToClassStatisticsFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
index e1b9dfd60867bb7fa1bdf71ec1f6c7bc9dd590c1..d04721d37262c9af1871c7c4bae55c08ddd50484 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.h
@@ -269,7 +269,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataToSamplePositionFilter.txx"
+#include "otbOGRDataToSamplePositionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
index 949b4d45f580458ef58998baaa9dc1f8efc8def6..59aae1e31f307e8c1fac9eb27171630bd601c4ac 100644
--- a/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
+++ b/Modules/Learning/Sampling/include/otbOGRDataToSamplePositionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataToSamplePositionFilter_txx
-#define otbOGRDataToSamplePositionFilter_txx
+#ifndef otbOGRDataToSamplePositionFilter_hxx
+#define otbOGRDataToSamplePositionFilter_hxx
 
 #include "otbOGRDataToSamplePositionFilter.h"
 
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
index 89d21483fb83ca67edb85c3679932b303e35d83c..3789fb816aaec4274cbf777e83c6da2e059ac687 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.h
@@ -237,7 +237,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentSamplingFilterBase.txx"
+#include "otbPersistentSamplingFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
index 15b54b5bbbc83acc59fc9b170718a5099ad1e418..51bcd66d08a80af71a9d0fb956dcbbe72b38cb03 100644
--- a/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
+++ b/Modules/Learning/Sampling/include/otbPersistentSamplingFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentSamplingFilterBase_txx
-#define otbPersistentSamplingFilterBase_txx
+#ifndef otbPersistentSamplingFilterBase_hxx
+#define otbPersistentSamplingFilterBase_hxx
 
 #include "otbPersistentSamplingFilterBase.h"
 #include "otbMaskedIteratorDecorator.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
index 2fc2bf82f915c9cd774dc4c83a59646fea14e731..6b61f1f03201d12caf6e0ba557129017de0fc32f 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoostMachineLearningModel.txx"
+#include "otbBoostMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
index b022e0c240a7f70d03c1c9446166a0b39cf68e6a..a07cbd0890e12117ff9d3ffec0bc0eee97c231f3 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoostMachineLearningModel_txx
-#define otbBoostMachineLearningModel_txx
+#ifndef otbBoostMachineLearningModel_hxx
+#define otbBoostMachineLearningModel_hxx
 
 #include "otbBoostMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
index 53812f30a7b3010069b77790916d9195ac7c8cb5..82dac7f3f4e7713064cf279af0c239e930890875 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBoostMachineLearningModelFactory.txx"
+#include "otbBoostMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
index 1d132473eb6c45f5496f4f517934317d77501d49..1148fbe4cde9646ef3b9600740c6f691d7add60b 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBoostMachineLearningModelFactory_txx
-#define otbBoostMachineLearningModelFactory_txx
+#ifndef otbBoostMachineLearningModelFactory_hxx
+#define otbBoostMachineLearningModelFactory_hxx
 
 #include "otbBoostMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
index ab5d2c737f8eb8a334c78a97e44422cc86f26386..ad44207cc4c2edd9fa72bf0619bfb9234ccfc2bb 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.h
@@ -182,7 +182,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixCalculator.txx"
+#include "otbConfusionMatrixCalculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
index f88c779b8662893006d0ef69a3826859cf12ac6c..11c9e0af65b809fcf596048f173b8028ae2b468e 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixCalculator_txx
-#define otbConfusionMatrixCalculator_txx
+#ifndef otbConfusionMatrixCalculator_hxx
+#define otbConfusionMatrixCalculator_hxx
 
 #include "otbConfusionMatrixCalculator.h"
 
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
index f1219fe1d084cd72dd253310fed7f3194d70c44d..c788eb448c964c523cf596b6f23d1cc72722b56d 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.h
@@ -184,7 +184,7 @@ private:
 } // end of namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbConfusionMatrixMeasurements.txx"
+#include "otbConfusionMatrixMeasurements.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
index 32a6bc5e529afd8cc2dd5ec96f1e23469d5aa127..257cff8ab3f301d9ad518ddf77fdbbbc2ac2a959 100644
--- a/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
+++ b/Modules/Learning/Supervised/include/otbConfusionMatrixMeasurements.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbConfusionMatrixMeasurements_txx
-#define otbConfusionMatrixMeasurements_txx
+#ifndef otbConfusionMatrixMeasurements_hxx
+#define otbConfusionMatrixMeasurements_hxx
 
 #include "otbConfusionMatrixMeasurements.h"
 
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
index 360912511e12e7cc51a92e1e38d290405ce92146..b0940ce737a6ff649319537508f6d7b7334b1888 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.h
@@ -208,7 +208,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTreeMachineLearningModel.txx"
+#include "otbDecisionTreeMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
index 055839026b41596e6d5f9e3832212b2b8bcc4723..b465a76d197eb21da943718d6662e4fd396e325e 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTreeMachineLearningModel_txx
-#define otbDecisionTreeMachineLearningModel_txx
+#ifndef otbDecisionTreeMachineLearningModel_hxx
+#define otbDecisionTreeMachineLearningModel_hxx
 
 #include "otbDecisionTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
index e19064b0b7d76a7e2145f35ba608c8dbd0bd4eb4..414a4f36cdbb7c2fb507a97fd239b0a7b6006fff 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDecisionTreeMachineLearningModelFactory.txx"
+#include "otbDecisionTreeMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
index 97d1f1b51eb4ebe05f336add109838cbf0bfd5d6..3c86c8228a56029ee8b7b1ef2cd12d72e3291ee3 100644
--- a/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbDecisionTreeMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDecisionTreeMachineLearningModelFactory_txx
-#define otbDecisionTreeMachineLearningModelFactory_txx
+#ifndef otbDecisionTreeMachineLearningModelFactory_hxx
+#define otbDecisionTreeMachineLearningModelFactory_hxx
 
 #include "otbDecisionTreeMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
index 1f8eeb07269771bfc34045722eb53a233ea363ad..3249ef81a9e2e22a8139db8b419c349c968b2155 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGradientBoostedTreeMachineLearningModel.txx"
+#include "otbGradientBoostedTreeMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
index 12a82d9ee26dd9434cd9fc745ada17c68541f8dc..6553874a50addc57a30a5b8bd0ad4031cd969b7a 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGradientBoostedTreeMachineLearningModel_txx
-#define otbGradientBoostedTreeMachineLearningModel_txx
+#ifndef otbGradientBoostedTreeMachineLearningModel_hxx
+#define otbGradientBoostedTreeMachineLearningModel_hxx
 
 #include "otbGradientBoostedTreeMachineLearningModel.h"
 #include "otbOpenCVUtils.h"
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
index a608dc92f1d21411ae11e461aef25902c1213c48..c68f843f7b112b9cffbade94ae6d99dc449f0ab2 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.h
@@ -75,7 +75,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGradientBoostedTreeMachineLearningModelFactory.txx"
+#include "otbGradientBoostedTreeMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
index 81fb5aab088614eb89db81164c256b7a17e40b70..150db96e9de61e50e433036c93daeed2bbc27fad 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGradientBoostedTreeMachineLearningModelFactory_txx
-#define otbGradientBoostedTreeMachineLearningModelFactory_txx
+#ifndef otbGradientBoostedTreeMachineLearningModelFactory_hxx
+#define otbGradientBoostedTreeMachineLearningModelFactory_hxx
 
 #include "otbGradientBoostedTreeMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
index 7e0a9cf0f217c592e68ab258c5ccfd1cbf4d37cf..fff1dd22567ed636752218d94d9c70cf992184ab 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.h
@@ -126,7 +126,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKNearestNeighborsMachineLearningModel.txx"
+#include "otbKNearestNeighborsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
index 53b33424d555afce0c58cabf419ce81dbefb94a5..e67d0fd19f7862b9c7309e7673b5047a561dfb54 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKNearestNeighborsMachineLearningModel_txx
-#define otbKNearestNeighborsMachineLearningModel_txx
+#ifndef otbKNearestNeighborsMachineLearningModel_hxx
+#define otbKNearestNeighborsMachineLearningModel_hxx
 
 #include <boost/lexical_cast.hpp>
 #include "otbKNearestNeighborsMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
index 148589d22a4ab1702b5620674f7f291dbded3c87..badcb3edbf09dc956909f1df45fc5969f578290b 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbKNearestNeighborsMachineLearningModelFactory.txx"
+#include "otbKNearestNeighborsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
index e36dc894a9a670c32b83dd0fe1dfc099bf695198..0ad49c886da68b7de4686527473516ef76fa1cfa 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbKNearestNeighborsMachineLearningModelFactory_txx
-#define otbKNearestNeighborsMachineLearningModelFactory_txx
+#ifndef otbKNearestNeighborsMachineLearningModelFactory_hxx
+#define otbKNearestNeighborsMachineLearningModelFactory_hxx
 
 #include "otbKNearestNeighborsMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
index 035dc6a7ec1a7e7ff0771d2f4bec4d6eb960cc3c..8a1020e73f54d83277daaeaeee5a90b8173fe6c2 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.h
@@ -111,7 +111,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapClassifier.txx"
+#include "otbLabelMapClassifier.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
index b7a6141b5a76f52085307c54a3ca4bff7ba33d9b..45a08ff44e1108e39a1868eab21a0a83d1411b2c 100644
--- a/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
+++ b/Modules/Learning/Supervised/include/otbLabelMapClassifier.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapClassifier_txx
-#define otbLabelMapClassifier_txx
+#ifndef otbLabelMapClassifier_hxx
+#define otbLabelMapClassifier_hxx
 
 #include "otbLabelMapClassifier.h"
 
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
index 621c1e5b7fec8e03cb467bda71037c10e7e2c3c2..6e89b686539a5ec0b1849e69e00ef25181f43a24 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.h
@@ -328,7 +328,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLibSVMMachineLearningModel.txx"
+#include "otbLibSVMMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
index 762aa0cb7af9b21b7ed99d99111bcf155f3cbcea..aeace69db384301c4da887b816c9da9f507d1240 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLibSVMMachineLearningModel_txx
-#define otbLibSVMMachineLearningModel_txx
+#ifndef otbLibSVMMachineLearningModel_hxx
+#define otbLibSVMMachineLearningModel_hxx
 
 #include <fstream>
 #include "otbLibSVMMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
index b07b98855d493c4a49a0357268b08cb7990f92a5..65609170e4f943abc93642d029664384c89c7327 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLibSVMMachineLearningModelFactory.txx"
+#include "otbLibSVMMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
index da060b8df98d0e8d9e873dfaf7ff85da72bb52e1..2ac79bb49b4182cd57db5e26b91a60a6a55fa191 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLibSVMMachineLearningModelFactory_txx
-#define otbLibSVMMachineLearningModelFactory_txx
+#ifndef otbLibSVMMachineLearningModelFactory_hxx
+#define otbLibSVMMachineLearningModelFactory_hxx
 
 #include "otbLibSVMMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
index a059b1b6d8136b063bce6b36fe9c8923f9c10326..470f9f9b50e74dce2f0d0e3110802550836e1676 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.h
@@ -78,7 +78,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMachineLearningModelFactory.txx"
+#include "otbMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
index 31cb1a288e60eec279098ebcf4542431d50a907f..5e9d3762e7d73315d50170136c61838dd77d6f5e 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMachineLearningModelFactory_txx
-#define otbMachineLearningModelFactory_txx
+#ifndef otbMachineLearningModelFactory_hxx
+#define otbMachineLearningModelFactory_hxx
 
 #include "otbMachineLearningModelFactory.h"
 #include "otbConfigure.h"
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
index 2861b105fc2c7d908dff0004c0af899ca51189c8..283b5ce015c53c3c9ac4e8d6c9d91d3c8668e2a0 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.h
@@ -217,7 +217,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeuralNetworkMachineLearningModel.txx"
+#include "otbNeuralNetworkMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
index 644e2b35bdf6d3b1a89da625e3ed004f60c524ee..e18d3fd285e25bb0ec590fe7b28f0b426efa2dfa 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeuralNetworkMachineLearningModel_txx
-#define otbNeuralNetworkMachineLearningModel_txx
+#ifndef otbNeuralNetworkMachineLearningModel_hxx
+#define otbNeuralNetworkMachineLearningModel_hxx
 
 #include <fstream>
 #include "otbNeuralNetworkMachineLearningModel.h"
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
index ef266b297505ceb1840a73b757eedab16b3f13bc..a2fae40c6a4000938dd74be6dd2b902c5f40bf48 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNeuralNetworkMachineLearningModelFactory.txx"
+#include "otbNeuralNetworkMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
index f0713c6df5bae2851c38e1689423b00d015dadfe..8fe08f1da317ad6b90c934bd5f8685fae59db6ab 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNeuralNetworkMachineLearningModelFactory_txx
-#define otbNeuralNetworkMachineLearningModelFactory_txx
+#ifndef otbNeuralNetworkMachineLearningModelFactory_hxx
+#define otbNeuralNetworkMachineLearningModelFactory_hxx
 
 #include "otbNeuralNetworkMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
index 10aa5645f64998326f5b9c32f80fb64983c6af19..cb3da6e3025e279b47794c8ba48dca748c832e4d 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.h
@@ -102,7 +102,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalBayesMachineLearningModel.txx"
+#include "otbNormalBayesMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
index 1a47e4cf4311ff3ced592d7b21fd5174eb8951c5..b376625c606486c431fb4c79860a2a61730f6693 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalBayesMachineLearningModel_txx
-#define otbNormalBayesMachineLearningModel_txx
+#ifndef otbNormalBayesMachineLearningModel_hxx
+#define otbNormalBayesMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
index 09fa60ceeba09a02aba265b036f2a67b66acfdbe..4455a2694208cc642cad56c111357e7e17c10e4d 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNormalBayesMachineLearningModelFactory.txx"
+#include "otbNormalBayesMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
index 72e1df37b8b2f4f7d60c5cf9be1895ed102d2c82..ebc68869c61f5d2b8855cbbc3671601ab3ac0a11 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNormalBayesMachineLearningModelFactory_txx
-#define otbNormalBayesMachineLearningModelFactory_txx
+#ifndef otbNormalBayesMachineLearningModelFactory_hxx
+#define otbNormalBayesMachineLearningModelFactory_hxx
 
 #include "otbNormalBayesMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
index 80d61e95f02807fc6d6782ecc53ea1767d18c6ee..e04c7fd19e3c718fe655536959b66d50b63b979d 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.h
@@ -226,7 +226,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomForestsMachineLearningModel.txx"
+#include "otbRandomForestsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
index 0e046cc76a270b32d45221a6106c5b950cb28c59..e364d6c34bd2f780314acc059022edefc0bd6512 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRandomForestsMachineLearningModel_txx
-#define otbRandomForestsMachineLearningModel_txx
+#ifndef otbRandomForestsMachineLearningModel_hxx
+#define otbRandomForestsMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
index 271e94d8077e9c1531de0b9dbe65faebd9dac187..698919b98b2f4755502b531711e47036cf96ad07 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRandomForestsMachineLearningModelFactory.txx"
+#include "otbRandomForestsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
index 466f672a6ee46f3577e5fe3d9067bcb919deaeb1..162c0594d6ce30b54a0219cf6dd4716a8ef97648 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRandomForestsMachineLearningModelFactory_txx
-#define otbRandomForestsMachineLearningModelFactory_txx
+#ifndef otbRandomForestsMachineLearningModelFactory_hxx
+#define otbRandomForestsMachineLearningModelFactory_hxx
 
 #include "otbRandomForestsMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
index 47efa923e22d35002405fdc41cc506e0293b94d5..7e183cd2aa228665057624c9c77eca0afe1e91ee 100644
--- a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
+++ b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.h
@@ -115,7 +115,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMCrossValidationCostFunction.txx"
+#include "otbSVMCrossValidationCostFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
index 25da162a45435a95a46cd2ffe1bc6972c812bb16..899e862a20484a959c5f8660d5e568cd97a5dfc3 100644
--- a/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMCrossValidationCostFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMCrossValidationCostFunction_txx
-#define otbSVMCrossValidationCostFunction_txx
+#ifndef otbSVMCrossValidationCostFunction_hxx
+#define otbSVMCrossValidationCostFunction_hxx
 
 #include "otbSVMCrossValidationCostFunction.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
index 9d47adc457592ef907636ac94f88efffd33b1b12..dca029a2c8cf2b2a09cea9eb3162a100e7cbbe64 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.h
@@ -178,7 +178,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMachineLearningModel.txx"
+#include "otbSVMMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
index b2cb6d262663c42f2eeca6cc912bd979828e5589..8649a4a06d6d5431e4f8322c64fa0f9ef2868c9b 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMachineLearningModel_txx
-#define otbSVMMachineLearningModel_txx
+#ifndef otbSVMMachineLearningModel_hxx
+#define otbSVMMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
index 6eec6503afb341c855f96532389f01eab334b1bc..4a2bb999d859fd1fbcd497ab6bf2c3e47dfbff68 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.h
@@ -73,7 +73,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMachineLearningModelFactory.txx"
+#include "otbSVMMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
index af94f0e315cd7829b71aeb7e7e01aee8f6456b62..22c820d0c820762d5cdc487d0ae55474cb700da5 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMachineLearningModelFactory_txx
-#define otbSVMMachineLearningModelFactory_txx
+#ifndef otbSVMMachineLearningModelFactory_hxx
+#define otbSVMMachineLearningModelFactory_hxx
 
 #include "otbSVMMachineLearningModelFactory.h"
 
diff --git a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
index ab02a0f7b5a08c81782ea7f9d1dccc4ed5d22af3..d4e8ddd1f9b1019fac2969b09e16983120f5a759 100644
--- a/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
+++ b/Modules/Learning/Supervised/include/otbSVMMarginSampler.h
@@ -108,7 +108,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSVMMarginSampler.txx"
+#include "otbSVMMarginSampler.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx b/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
index b5ca257fadec2c14c4d69aa5078005a3ddf71b81..f7d28484bcacd7015e79b3faef71cdfe75b4f92f 100644
--- a/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
+++ b/Modules/Learning/Supervised/include/otbSVMMarginSampler.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSVMMarginSampler_txx
-#define otbSVMMarginSampler_txx
+#ifndef otbSVMMarginSampler_hxx
+#define otbSVMMarginSampler_hxx
 
 #include "otbSVMMarginSampler.h"
 #include "otbMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 914d9aed652c4e31a2428dc0ff145c51eb15a09c..4fe28c42136975575a0877d298564b3f990a353a 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -180,7 +180,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkRandomForestsMachineLearningModel.txx"
+#include "otbSharkRandomForestsMachineLearningModel.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
index 10c3a5630f663d234baa40513445a937bd636bd5..248a715ea482edaeca2100658201f7987484d06f 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSharkRandomForestsMachineLearningModel_txx
-#define otbSharkRandomForestsMachineLearningModel_txx
+#ifndef otbSharkRandomForestsMachineLearningModel_hxx
+#define otbSharkRandomForestsMachineLearningModel_hxx
 
 #include <fstream>
 #include "itkMacro.h"
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
index 53b4adcb5e57e1c83ef43f2c5b448f2a98eed464..dc35613147b294cca159af6b22b07cfd2687c62f 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
@@ -71,7 +71,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkRandomForestsMachineLearningModelFactory.txx"
+#include "otbSharkRandomForestsMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
index 38fe3f023b3463f4ca3b2093881c305588e74660..17b75e3c8d22fd92d53924d41fbaa7428bc3506e 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSharkRandomForestsMachineLearningModelFactory_txx
-#define otbSharkRandomForestsMachineLearningModelFactory_txx
+#ifndef otbSharkRandomForestsMachineLearningModelFactory_hxx
+#define otbSharkRandomForestsMachineLearningModelFactory_hxx
 
 
 #include "otbSharkRandomForestsMachineLearningModelFactory.h"
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
index e9b365d3e51740aee5031290b651fe43da558da0..ce4ff665cda1ebe9703051915bd6b7fea7398878 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.h
@@ -98,7 +98,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbContingencyTableCalculator.txx"
+#include "otbContingencyTableCalculator.hxx"
 #endif
 
 #endif //otbContingencyTableCalculator_h
diff --git a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
index a5bb6761fb45579b28c4665d04b5a2edf35b807c..4725c246428264788ca1121af2ad7a25a0f16f71 100644
--- a/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
+++ b/Modules/Learning/Unsupervised/include/otbContingencyTableCalculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbContingencyTableCalculator_txx
-#define otbContingencyTableCalculator_txx
+#ifndef otbContingencyTableCalculator_hxx
+#define otbContingencyTableCalculator_hxx
 
 #include "otbContingencyTableCalculator.h"
 #include "itkMacro.h"
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
index 8a06adb8e507e292804493896f76c69d61ba28b2..0c8b1502dead68069a70beca72c5c80968a91c58 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
@@ -165,7 +165,7 @@ private:
 
 #ifndef OTB_MANUAL_INSTANTIATION
 
-#include "otbSharkKMeansMachineLearningModel.txx"
+#include "otbSharkKMeansMachineLearningModel.hxx"
 
 #endif
 
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
index f3b9310c7b3ac6cec9b9eb7e19da027463533cac..f7318cdaaae053148ca6d88efb083f3f54b738b0 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSharkKMeansMachineLearningModel_txx
-#define otbSharkKMeansMachineLearningModel_txx
+#ifndef otbSharkKMeansMachineLearningModel_hxx
+#define otbSharkKMeansMachineLearningModel_hxx
 
 #include <fstream>
 #include "boost/make_shared.hpp"
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
index 69e22afe39c1672032ea467cf6391f2d9d7eb667..9d253c47d8959707eb3fe1f7a418a863c33def73 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
@@ -70,7 +70,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSharkKMeansMachineLearningModelFactory.txx"
+#include "otbSharkKMeansMachineLearningModelFactory.hxx"
 #endif
 
 #endif
diff --git a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
index a4fe5584e04249875de1193e365fd888a43cfa07..40c11d2979d53ac8b43327e59692aa4203f27bbf 100644
--- a/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
+++ b/Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.hxx
@@ -17,8 +17,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef otbSharkKMeansMachineLearningModelFactory_txx
-#define otbSharkKMeansMachineLearningModelFactory_txx
+#ifndef otbSharkKMeansMachineLearningModelFactory_hxx
+#define otbSharkKMeansMachineLearningModelFactory_hxx
 
 #include "otbSharkKMeansMachineLearningModelFactory.h"
 
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
index 959ffd45dc34dd614d2575112289e2379e866a98..d3cbdf13b3763602eb897d1ccb339c830721373c 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.h
@@ -342,7 +342,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSimpleParallelTiffWriter.txx"
+#include "otbSimpleParallelTiffWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
index 4292ad0f8460c3811e541e25a793711f59caec43..1c6aa5033f186e1fb252ab2bdeff46da8cd35082 100644
--- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSimpleParallelTiffWriter_txx
-#define otbSimpleParallelTiffWriter_txx
+#ifndef otbSimpleParallelTiffWriter_hxx
+#define otbSimpleParallelTiffWriter_hxx
 
 #include "otbSimpleParallelTiffWriter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
index 1800dc62ae4a170c70f0039906c79f2b2093e40d..dfb2af2d8168a549ef259992bdc642f25c27de04 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.h
@@ -142,7 +142,7 @@ template <typename TImage> void WriteMPI(TImage *img, const std::string &output,
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMPIVrtWriter.txx"
+#include "otbMPIVrtWriter.hxx"
 #endif
 
 #endif //__otbMPIVrtWriter_h
diff --git a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
index b57518ed73d613b37e33b86c59ba732ed0e44cc2..33e8253c0ab4b0bc5f1b7196c47674b7775a1dc8 100644
--- a/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
+++ b/Modules/MPI/MPIVrtWriter/include/otbMPIVrtWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMPIVrtWriter_txx
-#define otbMPIVrtWriter_txx
+#ifndef otbMPIVrtWriter_hxx
+#define otbMPIVrtWriter_hxx
 
 #include "otbMPIVrtWriter.h"
 #include "otbMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
index 2baa1fce0952ef00e79618fa8d8b48caf9f45e83..5c24b93f3a41354a0f0761d68ec351e2b7b1989d 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.h
@@ -83,7 +83,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageListToRCC8GraphFilter.txx"
+#include "otbImageListToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
index 5f98249b275864b5453991111bad566e836982d1..8e75de80ca4641616ab133d5f09af6c95bbbf264 100644
--- a/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageListToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageListToRCC8GraphFilter_txx
-#define otbImageListToRCC8GraphFilter_txx
+#ifndef otbImageListToRCC8GraphFilter_hxx
+#define otbImageListToRCC8GraphFilter_hxx
 
 #include "otbImageListToRCC8GraphFilter.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
index 16e7b2196077732e056fd8852eee4c97c90e26be..61d2f8c092495417a2addb4e0c71bff9050c08ae 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.h
@@ -106,7 +106,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageMultiSegmentationToRCC8GraphFilter.txx"
+#include "otbImageMultiSegmentationToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
index e4a653076e9becbfb767b7982d0bbdf492086dbd..1af4027e8890a139d27dc81e0dfca72767ab9254 100644
--- a/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageMultiSegmentationToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageMultiSegmentationToRCC8GraphFilter_txx
-#define otbImageMultiSegmentationToRCC8GraphFilter_txx
+#ifndef otbImageMultiSegmentationToRCC8GraphFilter_hxx
+#define otbImageMultiSegmentationToRCC8GraphFilter_hxx
 
 #include "otbImageMultiSegmentationToRCC8GraphFilter.h"
 #include "itkMinimumMaximumImageCalculator.h"
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
index 7e074277a8fbebcaf41d6019a9a2e3862761d8f4..2b79599f75cb7b362707cffa4b7ddb2de37893a2 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.h
@@ -197,7 +197,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToImageRCC8Calculator.txx"
+#include "otbImageToImageRCC8Calculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
index 265c3b34fbbf433dd51cd194f890d673212104dc..9d2771e050ae5c219064f91ce439c745f2fdc3a6 100644
--- a/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
+++ b/Modules/OBIA/RCC8/include/otbImageToImageRCC8Calculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToImageRCC8Calculator_txx
-#define otbImageToImageRCC8Calculator_txx
+#ifndef otbImageToImageRCC8Calculator_hxx
+#define otbImageToImageRCC8Calculator_hxx
 
 #include "otbImageToImageRCC8Calculator.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
index 2dd119d9468bd6dca88f7628522be09f9b30d1fb..149828819f91948dcd59ae46aa385f0cf50e7dd6 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.h
@@ -176,7 +176,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygonListToRCC8GraphFilter.txx"
+#include "otbPolygonListToRCC8GraphFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
index 2b1d81da48ee83197b77b199e46e61e81c5e616a..b42cd634ab514fff1f2d045de9f1e362d7978ff2 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
+++ b/Modules/OBIA/RCC8/include/otbPolygonListToRCC8GraphFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygonListToRCC8GraphFilter_txx
-#define otbPolygonListToRCC8GraphFilter_txx
+#ifndef otbPolygonListToRCC8GraphFilter_hxx
+#define otbPolygonListToRCC8GraphFilter_hxx
 
 #include "otbPolygonListToRCC8GraphFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
index 4f81008a0805c8209d4d1102b46a9e24c731a35c..6980d80fdaa3e95e78b1655bed3df551b38bfebf 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.h
@@ -131,7 +131,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPolygonToPolygonRCC8Calculator.txx"
+#include "otbPolygonToPolygonRCC8Calculator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
index 0c730ca7fe2983fecfcbd17f05cb8b7d9351bf5f..1f3e6dfc199e5e815d172f9dfd4f38bc34bcc66f 100644
--- a/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
+++ b/Modules/OBIA/RCC8/include/otbPolygonToPolygonRCC8Calculator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPolygonToPolygonRCC8Calculator_txx
-#define otbPolygonToPolygonRCC8Calculator_txx
+#ifndef otbPolygonToPolygonRCC8Calculator_hxx
+#define otbPolygonToPolygonRCC8Calculator_hxx
 
 #include "otbPolygonToPolygonRCC8Calculator.h"
 #include "otbMacro.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
index fa91c811babd40ca8e8d3f250df5397a283f4e71..be0439865028e01f94c3539e5eef31587c19074d 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.h
@@ -132,7 +132,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8EdgeIterator.txx"
+#include "otbRCC8EdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
index 753f2609c1bf774323abcf823fb4f8366f99e370..377360083cefc2b23c973a54f7a5393be7f5d247 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8EdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8EdgeIterator_txx
-#define otbRCC8EdgeIterator_txx
+#ifndef otbRCC8EdgeIterator_hxx
+#define otbRCC8EdgeIterator_hxx
 
 #include "otbRCC8EdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.h b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
index fc1f7f965f24d5faf6b300ce7674508896efeb8b..5267efa56037d915cb14c570a31f609ddd84fe68 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.h
@@ -146,7 +146,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8Graph.txx"
+#include "otbRCC8Graph.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx b/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
index 9a45b5170985cc8e1798f1a86481a577b5646b5b..576724e3754dd33244f820dac20ecc0b968b6c4f 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8Graph.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8Graph_txx
-#define otbRCC8Graph_txx
+#ifndef otbRCC8Graph_hxx
+#define otbRCC8Graph_hxx
 
 #include "otbRCC8Graph.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
index 31879d4809a74994ce2b32d390a8dd26e632f678..dca598e5db5e6c9881a56b70947caf47b4cf1b0b 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.h
@@ -115,7 +115,7 @@ private:
 };
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphFileReader.txx"
+#include "otbRCC8GraphFileReader.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
index 2aa1dcb2f2749b3fb5d0def05adda47a1f5cdb4a..7f6efbba21df79a3efc9dff3afb6a55d71a1da38 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileReader.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphFileReader_txx
-#define otbRCC8GraphFileReader_txx
+#ifndef otbRCC8GraphFileReader_hxx
+#define otbRCC8GraphFileReader_hxx
 
 #include "otbRCC8GraphFileReader.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
index f9c893cb519a32412e46e24add0f690760ca973b..a3f27a55c75e7ac19909982684532b7837d2c891 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.h
@@ -152,7 +152,7 @@ private:
 } // namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphFileWriter.txx"
+#include "otbRCC8GraphFileWriter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
index 7d780f7447c734d78d4eda422cee8d43b4e9b201..c120000cb01a59937f431ae37e3e20d487f8d4d4 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphFileWriter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphFileWriter_txx
-#define otbRCC8GraphFileWriter_txx
+#ifndef otbRCC8GraphFileWriter_hxx
+#define otbRCC8GraphFileWriter_hxx
 
 #include "otbRCC8GraphFileWriter.h"
 #include "otbRCC8VertexIterator.h"
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
index 817ddb43306b779731adb4d7241e88e8acabdc59..8fa69081e8afa575ffc0a3188112e22a80100daa 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.h
@@ -68,6 +68,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8GraphSource.txx"
+#include "otbRCC8GraphSource.hxx"
 #endif
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
index 6b1287bfb6b83ead2f5dc454ff1491231a7c089d..02ed91f9a54e725b4bae7931a957309c6097d049 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8GraphSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8GraphSource_txx
-#define otbRCC8GraphSource_txx
+#ifndef otbRCC8GraphSource_hxx
+#define otbRCC8GraphSource_hxx
 
 #include "otbRCC8GraphSource.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
index f4e76dbaa8ff1ac75673c7978fa096d261f0c880..459310e3a9098038ef7ab6a7a71f7286756f5cb6 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.h
@@ -123,7 +123,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8InEdgeIterator.txx"
+#include "otbRCC8InEdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
index 20d6c83fe9c75bc86912fb1c173f63f4bb3ad5af..21ef336b906e90c20c5ad3e745249f1986e5a05d 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8InEdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8InEdgeIterator_txx
-#define otbRCC8InEdgeIterator_txx
+#ifndef otbRCC8InEdgeIterator_hxx
+#define otbRCC8InEdgeIterator_hxx
 
 #include "otbRCC8InEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
index eeb088d6f3ae39fabbf9b64d2ca1cf096fafb5d6..b76e3b1644663931dc6c6f4405e7d4c3e4a053f9 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.h
@@ -123,7 +123,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8OutEdgeIterator.txx"
+#include "otbRCC8OutEdgeIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
index 3abc28e2698e36f6df4d5a894b1034fd22e1d1ed..c18aadf563a63a2a129cecd5bed6c24c004bed91 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8OutEdgeIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8OutEdgeIterator_txx
-#define otbRCC8OutEdgeIterator_txx
+#ifndef otbRCC8OutEdgeIterator_hxx
+#define otbRCC8OutEdgeIterator_hxx
 
 #include "otbRCC8OutEdgeIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
index b432ded5499cfa3ae0ea36a07d4ae0c34a91b359..21a3afad36cb2a94ece94c90bf7af40d8515daae 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.h
@@ -96,7 +96,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexBase.txx"
+#include "otbRCC8VertexBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
index 1a0a82a416a386a8167bdb7149a38a5d5126ef59..72c66ffd1b804c91107c5461e5355cbcacba9142 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexBase_txx
-#define otbRCC8VertexBase_txx
+#ifndef otbRCC8VertexBase_hxx
+#define otbRCC8VertexBase_hxx
 
 #include "otbRCC8VertexBase.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
index 03b8d559aba60eb891667d3444dcf79b5da61484..444611ed617f2b9d25daad90a74fa1b752995e31 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.h
@@ -118,7 +118,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexIterator.txx"
+#include "otbRCC8VertexIterator.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
index 297d7fa3f96ff7fa7290d3f12453b1817210b07a..de39d935b1d342ed540a2edd8ddc88f4df8c5b7f 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexIterator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexIterator_txx
-#define otbRCC8VertexIterator_txx
+#ifndef otbRCC8VertexIterator_hxx
+#define otbRCC8VertexIterator_hxx
 
 #include "otbRCC8VertexIterator.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
index c9695fb2e3f89247f1662b6ce73d91a14ec53624..1f8ae05ca205305c36bbe4de26973f53e46ea661 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.h
@@ -82,7 +82,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexWithCompacity.txx"
+#include "otbRCC8VertexWithCompacity.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
index 3feea52dd00db2de27ae38e7b0e921549659b0b4..f6fc5ed6768e5f934a0b533513844439b2c407e2 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithCompacity.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexWithCompacity_txx
-#define otbRCC8VertexWithCompacity_txx
+#ifndef otbRCC8VertexWithCompacity_hxx
+#define otbRCC8VertexWithCompacity_hxx
 
 #include "otbRCC8VertexWithCompacity.h"
 
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
index 09387ec7fe74c28a501c421a6dff753450acba86..4734b10a098369dd767af0f2bc5fb53146980c3f 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.h
@@ -84,7 +84,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRCC8VertexWithRegionCenter.txx"
+#include "otbRCC8VertexWithRegionCenter.hxx"
 #endif
 
 #endif
diff --git a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
index 5461bcca5ea21598b124888b7bd04d216d4d42e2..113118460dabb745084cc2e84c0953b52c1fadb9 100644
--- a/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
+++ b/Modules/OBIA/RCC8/include/otbRCC8VertexWithRegionCenter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRCC8VertexWithRegionCenter_txx
-#define otbRCC8VertexWithRegionCenter_txx
+#ifndef otbRCC8VertexWithRegionCenter_hxx
+#define otbRCC8VertexWithRegionCenter_hxx
 
 #include "otbRCC8VertexWithRegionCenter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
index 511ce50752076c34ae22d9c4fe85bff97c64b52d..8ef524ae03a88767f86775e7c893c70b1276cbb9 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.h
@@ -88,7 +88,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGAndRIndexImageFilter.txx"
+#include "otbGAndRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
index 00133a55055e970a275c3680ff4b4c1cc4c3586d..40282aed491827045564392ff620b63f375e0715 100644
--- a/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbGAndRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGAndRIndexImageFilter_txx
-#define otbGAndRIndexImageFilter_txx
+#ifndef otbGAndRIndexImageFilter_hxx
+#define otbGAndRIndexImageFilter_hxx
 
 #include "otbGAndRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
index 84993a01809c5d84815ef0533a4a15ed4c18e5b1..98c532e854efeb366e68580276fbe9df44f4a21f 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.h
@@ -131,7 +131,7 @@ private:
 
 }
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNDVIDataNodeFeatureFunction.txx"
+#include "otbNDVIDataNodeFeatureFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
index 6838d441a1c39faed418a72c866ea2f597b5e4c2..78775e308b8885ac390634afddcad1b764ba3c3b 100644
--- a/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
+++ b/Modules/Radiometry/Indices/include/otbNDVIDataNodeFeatureFunction.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNDVIDataNodeFeatureFunction_txx
-#define otbNDVIDataNodeFeatureFunction_txx
+#ifndef otbNDVIDataNodeFeatureFunction_hxx
+#define otbNDVIDataNodeFeatureFunction_hxx
 
 #include "otbNDVIDataNodeFeatureFunction.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
index d042eed158a4f5550bedeead4628fb920fcf1cba..402885c6badb96aea848e0df35bf6cbc588c73d2 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndBAndNIRIndexImageFilter.txx"
+#include "otbRAndBAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
index cf6a3d29a25998ef70e99057a1c229012860d98e..93901951f79e1274125ecd7e1c33f7a391f29d16 100644
--- a/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndBAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndBAndNIRIndexImageFilter_txx
-#define otbRAndBAndNIRIndexImageFilter_txx
+#ifndef otbRAndBAndNIRIndexImageFilter_hxx
+#define otbRAndBAndNIRIndexImageFilter_hxx
 
 #include "otbRAndBAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
index 9f9f60b8657a0892a2706da375a53e3d6fb8edfb..e4ea4f49c8aaaec989fc87199effb94f5699317d 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndGAndNIRIndexImageFilter.txx"
+#include "otbRAndGAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
index e8e29123d788fb53a1a2bc4131737950a104a835..59295bfe358a7aa241209a0b16d472214f27c041 100644
--- a/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndGAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndGAndNIRIndexImageFilter_txx
-#define otbRAndGAndNIRIndexImageFilter_txx
+#ifndef otbRAndGAndNIRIndexImageFilter_hxx
+#define otbRAndGAndNIRIndexImageFilter_hxx
 
 #include "otbRAndGAndNIRIndexImageFilter.h"
 
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
index 075384e25a43841c485798533f8d38532380ea6c..2d775710ea0850cd232e6bdfd70210454fa8cd9e 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.h
@@ -87,7 +87,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbRAndNIRIndexImageFilter.txx"
+#include "otbRAndNIRIndexImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
index 2b1bbcbe7527f5c4008cb36416ac175543e4c752..774eceb9938c4443bac7603c57a123a7bd3c2aa0 100644
--- a/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
+++ b/Modules/Radiometry/Indices/include/otbRAndNIRIndexImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRAndNIRIndexImageFilter_txx
-#define otbRAndNIRIndexImageFilter_txx
+#ifndef otbRAndNIRIndexImageFilter_hxx
+#define otbRAndNIRIndexImageFilter_hxx
 
 #include "otbRAndNIRIndexImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
index df71735c0f7a329aab7e1a7bf25d280e95567766..6bb9c5060115cfaae14bffe3c8fd34fd8b98a122 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.h
@@ -277,7 +277,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReflectanceToSurfaceReflectanceImageFilter.txx"
+#include "otbReflectanceToSurfaceReflectanceImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
index 9494c2ebc35251e91c1d1b65b9494ad9c30953e5..4c3623cdc7712059a08850d14e71563a2cb7ba41 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbReflectanceToSurfaceReflectanceImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReflectanceToSurfaceReflectanceImageFilter_txx
-#define otbReflectanceToSurfaceReflectanceImageFilter_txx
+#ifndef otbReflectanceToSurfaceReflectanceImageFilter_hxx
+#define otbReflectanceToSurfaceReflectanceImageFilter_hxx
 
 #include "otbReflectanceToSurfaceReflectanceImageFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
index 8b1290f976ae0e97d9de3fb1ecdac91122fec471..4e94c055375410668f6bd9ddbfdd7f1bd9f90e2e 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h
@@ -308,7 +308,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.txx"
+#include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
index 18a18316228bce0c7c294e77dd7817ff83fe6cda..ba1559b26c8cd4750c0e919b288634e290590f66 100644
--- a/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
+++ b/Modules/Radiometry/OpticalCalibration/include/otbSurfaceAdjacencyEffectCorrectionSchemeFilter.hxx
@@ -20,8 +20,8 @@
  */
 
 
-#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
-#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_txx
+#ifndef otbSurfaceAdjacencyEffectCorrectionSchemeFilter_hxx
+#define otbSurfaceAdjacencyEffectCorrectionSchemeFilter_hxx
 
 #include "otbSurfaceAdjacencyEffectCorrectionSchemeFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
index a5d5188b1c79a27f90be5c44f30111d50f115d70..c4bfc132b541acd184cba00cebe666af5c40c6ec 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.h
@@ -158,7 +158,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbSarBrightnessFunction.txx"
+# include "otbSarBrightnessFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
index 571f0ba97a7aa22022d585cf592679bea52ea3f6..1bae60c77ca95c16a6fb9b402c25c1cebbaeb9fb 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarBrightnessFunction_txx
-#define otbSarBrightnessFunction_txx
+#ifndef otbSarBrightnessFunction_hxx
+#define otbSarBrightnessFunction_hxx
 
 #include "otbSarBrightnessFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
index 1d23c658b5e8a361277e76fcde2c4e835e3888d7..ad8b991968b4c9f2584fc01301da995d85c5392d 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.h
@@ -99,7 +99,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarBrightnessToImageFilter.txx"
+#include "otbSarBrightnessToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
index e01c24d797cf69fa2e13da16b90b9d63abf186ed..2dfd3f59b9c45a1efadebf7b10cf6af02d6f9166 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarBrightnessToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarBrightnessToImageFilter_txx
-#define otbSarBrightnessToImageFilter_txx
+#ifndef otbSarBrightnessToImageFilter_hxx
+#define otbSarBrightnessToImageFilter_hxx
 
 #include "otbSarBrightnessToImageFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
index f90161345c989a252800419cff9d140aa64ec85f..6b771c9dbfa6052d49104cc93303a85d3572a800 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.h
@@ -95,7 +95,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarDeburstImageFilter.txx"
+#include "otbSarDeburstImageFilter.hxx"
 #endif
 
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
index 372bc8affd2fd42273a9e6113a32f524575fc6d1..f460f0eab63d639202b6bfb95a7690a10c3c0518 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarDeburstImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarDeburstImageFilter_txx
-#define otbSarDeburstImageFilter_txx
+#ifndef otbSarDeburstImageFilter_hxx
+#define otbSarDeburstImageFilter_hxx
 
 #include "otbSarDeburstImageFilter.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
index 4c3466cc55da7c270a8c44b42d2ddd1010ded880..640ff6647346c48f1d70444bd12048bec5da6cce 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.h
@@ -146,7 +146,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarParametricMapFunction.txx"
+#include "otbSarParametricMapFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
index a1b4698f8e5e0a2ec8638d7f28c5ba38a7fe32c0..d196cf02557704b21d2bd1f31461be30c12f3bc4 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarParametricMapFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarParametricMapFunction_txx
-#define otbSarParametricMapFunction_txx
+#ifndef otbSarParametricMapFunction_hxx
+#define otbSarParametricMapFunction_hxx
 
 #include "otbSarParametricMapFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
index 2bb43aabb96d3a06c3ad8c2e1af5a3d841ab72fc..3e7346ceaa2f0936e2ab1c3e0614156610070740 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.h
@@ -204,7 +204,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbSarRadiometricCalibrationFunction.txx"
+# include "otbSarRadiometricCalibrationFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
index 8d90feda2d4b1291d6245ba1845e48c9c7cb54ad..1b863819ff6fe0509827001e899558654d14e6f0 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationFunction.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbSarRadiometricCalibrationFunction_txx
-#define otbSarRadiometricCalibrationFunction_txx
+#ifndef otbSarRadiometricCalibrationFunction_hxx
+#define otbSarRadiometricCalibrationFunction_hxx
 
 #include "otbSarRadiometricCalibrationFunction.h"
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
index a9f427c3f7d62b472cd61ac2442124a44b072cd7..a41fd0acc12db33ae2c38e4745a0d1c4ee69e321 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.h
@@ -133,7 +133,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSarRadiometricCalibrationToImageFilter.txx"
+#include "otbSarRadiometricCalibrationToImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
index f58b1cb0af6c56dc77c119b9d8c3d1830edc1207..d08ab5315c7b54f3edfd61e8f8bae3b5241018c2 100644
--- a/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbSarRadiometricCalibrationToImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSarRadiometricCalibrationToImageFilter_txx
-#define otbSarRadiometricCalibrationToImageFilter_txx
+#ifndef otbSarRadiometricCalibrationToImageFilter_hxx
+#define otbSarRadiometricCalibrationToImageFilter_hxx
 
 #include "otbSarRadiometricCalibrationToImageFilter.h"
 #include "otbSarImageMetadataInterfaceFactory.h"
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
index 58ce56d755c831c22ddc372ced0f3b9498f6c0b2..f082fa57e4da0c26a257b2d647c5099553c0e808 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.h
@@ -110,7 +110,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTerraSarBrightnessFunctor.txx"
+#include "otbTerraSarBrightnessFunctor.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
index 350497a8bbb7685289008dcbdea35172275cb8c0..709735a3e6b6b33edd35f38f88d03f4a0b731de1 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessFunctor.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTerraSarBrightnessFunctor_txx
-#define otbTerraSarBrightnessFunctor_txx
+#ifndef otbTerraSarBrightnessFunctor_hxx
+#define otbTerraSarBrightnessFunctor_hxx
 
 #include "otbTerraSarBrightnessFunctor.h"
 
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
index 220e2b3a589f0e797aa5d80991e05a107169778e..51e50cb0dd66208f3196c2c6ee63354d86598bf9 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbTerraSarBrightnessImageFilter.txx"
+#include "otbTerraSarBrightnessImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
index bdf5af1fca8b7bb11f72e130fa6720666ad1efac..84b8012d607dc4f7b87ef07b83ecabddd1111100 100644
--- a/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
+++ b/Modules/Radiometry/SARCalibration/include/otbTerraSarBrightnessImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbTerraSarBrightnessImageFilter_txx
-#define otbTerraSarBrightnessImageFilter_txx
+#ifndef otbTerraSarBrightnessImageFilter_hxx
+#define otbTerraSarBrightnessImageFilter_hxx
 
 #include "otbTerraSarBrightnessImageFilter.h"
 #include "otbTerraSarImageMetadataInterface.h"
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
index 59f5b80431406b019fa354ce8abfd58c7bf10bce..3788b051e9f22d507acef1c5e883e96f60ed0626 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.h
@@ -117,7 +117,7 @@ class AtmosphericEffects
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAtmosphericEffects.txx"
+#include "otbAtmosphericEffects.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
index ae3d8533906141f6902337cf75ca700c94da4397..238d19f2be76cb40bebdb3a409b7ea823bbad233 100644
--- a/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
+++ b/Modules/Radiometry/Simulation/include/otbAtmosphericEffects.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAtmosphericEffects_txx
-#define otbAtmosphericEffects_txx
+#ifndef otbAtmosphericEffects_hxx
+#define otbAtmosphericEffects_hxx
 
 #include "otbAtmosphericEffects.h"
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
index bb5ce3410871ff7998c992634f70362f2dac190a..b1bbfde9a07ee88f70e45b6a8ba569133a0b9ac4 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.h
@@ -203,7 +203,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageSimulationMethod.txx"
+#include "otbImageSimulationMethod.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
index 60a23d17ef51b493c7c0ec2d496275cbe9bf67e4..97c60d8c986625fb92397d6f1f52311262d50ef7 100644
--- a/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
+++ b/Modules/Radiometry/Simulation/include/otbImageSimulationMethod.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageSimulationMethod_txx
-#define otbImageSimulationMethod_txx
+#ifndef otbImageSimulationMethod_hxx
+#define otbImageSimulationMethod_hxx
 
 #include "otbImageSimulationMethod.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
index e268f8341f3500ab843d806cda416227c5406915..01716e4a71e401d1b4cb24be007c226170b0e1ce 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.h
@@ -146,7 +146,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToSimulatedImageFilter.txx"
+#include "otbLabelMapToSimulatedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
index 583e2ad8ff8c881913ba6952c053cba5c815fa51..b7b627fb2a5e6d22a6deec3067b65d75b1346c61 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbLabelMapToSimulatedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToSimulatedImageFilter_txx
-#define otbLabelMapToSimulatedImageFilter_txx
+#ifndef otbLabelMapToSimulatedImageFilter_hxx
+#define otbLabelMapToSimulatedImageFilter_hxx
 
 #include "otbLabelMapToSimulatedImageFilter.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
index a51ef87a3f86f80fdaa1b0cc6d6d5c3122fbed62..ccde580e32a94769f1710972174622549bbde2ef 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.h
@@ -103,7 +103,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelToProSailParameters.txx"
+#include "otbLabelToProSailParameters.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
index 464576bda25806f7921c64e0098cdc116d3ea73c..445736486879bc8435cbb3f35541af18e30bea0d 100644
--- a/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
+++ b/Modules/Radiometry/Simulation/include/otbLabelToProSailParameters.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelToProSailParameters_txx
-#define otbLabelToProSailParameters_txx
+#ifndef otbLabelToProSailParameters_hxx
+#define otbLabelToProSailParameters_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
index 93996e839750ee92e6e5f325f96304806c26dc4f..afc2663bc14b81d9c5d2d5094f646e4ee1ade4f4 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.h
@@ -162,7 +162,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReduceSpectralResponse.txx"
+#include "otbReduceSpectralResponse.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
index 95c3b4de2acd91e490daddf2e90ffda37cfa886a..279075d8bc7aec3e888f203188aab2bf2fd30617 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponse.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReduceSpectralResponse_txx
-#define otbReduceSpectralResponse_txx
+#ifndef otbReduceSpectralResponse_hxx
+#define otbReduceSpectralResponse_hxx
 
 #include <algorithm>
 #include "itkNumericTraits.h"
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
index 8e89bfddbc1a4e30e996f806966d5cb6c3669669..d80b981ca66f2802de7bb6702083b14ddac1361f 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.h
@@ -149,7 +149,7 @@ namespace otb
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbReduceSpectralResponseClassifierRAndNIR.txx"
+#include "otbReduceSpectralResponseClassifierRAndNIR.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
index 30ffa2061ed33a4bec6ff188957502d09c8bf91b..f3c3718d04f235793b92fbd36ae37b7af8b29eee 100644
--- a/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
+++ b/Modules/Radiometry/Simulation/include/otbReduceSpectralResponseClassifierRAndNIR.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbReduceSpectralResponseClassifierRAndNIR_txx
-#define otbReduceSpectralResponseClassifierRAndNIR_txx
+#ifndef otbReduceSpectralResponseClassifierRAndNIR_hxx
+#define otbReduceSpectralResponseClassifierRAndNIR_hxx
 
 #include "otbReduceSpectralResponseClassifierRAndNIR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
index 5ca29341b8a521385f4f0b9cb2809663e39869fa..d820d9c6d9a22267c24763a2c5049a6cc6f38ee3 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.h
@@ -171,7 +171,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSatelliteRSR.txx"
+#include "otbSatelliteRSR.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
index 2f955ec20b42e5d937a8cb5cbdd6078d6a52aef0..3edaee4d7a14031dcdba5a08c6255f734f91a055 100644
--- a/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSatelliteRSR.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSatelliteRSR_txx
-#define otbSatelliteRSR_txx
+#ifndef otbSatelliteRSR_hxx
+#define otbSatelliteRSR_hxx
 
 #include "otbSatelliteRSR.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
index 303eb9267c05694d97e9bf8301fccc01e959cd95..dc1934354d7896e350c583957bd502806e75e5d1 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.h
@@ -140,7 +140,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpatialisationFilter.txx"
+#include "otbSpatialisationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
index e96f98153c930892f1dff7fb35839246df2473cb..192a3e234e705bffd313c0048a8854967fcd6104 100644
--- a/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSpatialisationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpatialisationFilter_txx
-#define otbSpatialisationFilter_txx
+#ifndef otbSpatialisationFilter_hxx
+#define otbSpatialisationFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
index 5039e4359f0858e66aac76a35abbcc3bf4c12bc4..8c0284a33e3989527ff1176c70796e516c9c5a21 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.h
@@ -191,7 +191,7 @@ private:
 
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSpectralResponse.txx"
+#include "otbSpectralResponse.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx b/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
index 2363a6417d8873361544ad845a1977d43ffb6c89..5a72ef4bb89350bb177374810e8b881e79e37011 100644
--- a/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSpectralResponse.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSpectralResponse_txx
-#define otbSpectralResponse_txx
+#ifndef otbSpectralResponse_hxx
+#define otbSpectralResponse_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
index 840f880dbef325d0cb7596a95f49ec331edb975b..daf37852b6b0f111ff77a48466d6d21a8252ad70 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.h
@@ -296,7 +296,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSurfaceReflectanceToReflectanceFilter.txx"
+#include "otbSurfaceReflectanceToReflectanceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
index 9364b328c4d283a3554e57c7070f35579e951664..216676d801caf8b0efd7d6a72317ccf5a5d16bb7 100644
--- a/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
+++ b/Modules/Radiometry/Simulation/include/otbSurfaceReflectanceToReflectanceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSurfaceReflectanceToReflectanceFilter_txx
-#define otbSurfaceReflectanceToReflectanceFilter_txx
+#ifndef otbSurfaceReflectanceToReflectanceFilter_hxx
+#define otbSurfaceReflectanceToReflectanceFilter_hxx
 
 #include "otbSurfaceReflectanceToReflectanceFilter.h"
 #include "otbOpticalImageMetadataInterfaceFactory.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
index 1c5e118fe975ea1db0182d28d2cc69a2b0e74a3f..95ba5b5514ccef35e2ffbc91e9ce776a438a737e 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.h
@@ -228,7 +228,7 @@ private:
 };
 } // end namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapEstimationMethod.txx"
+#include "otbDisparityMapEstimationMethod.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
index c40c36221c1a9fb8bba9d54f482670ec1768f513..5a13f97a0d5daf45e535ef282b3293157badba56 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapEstimationMethod.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapEstimationMethod_txx
-#define otbDisparityMapEstimationMethod_txx
+#ifndef otbDisparityMapEstimationMethod_hxx
+#define otbDisparityMapEstimationMethod_hxx
 
 #include "otbDisparityMapEstimationMethod.h"
 #include "itkImageRegistrationMethod.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
index 8a58f4d2f275d91fc933fd917d8de0292de77393..7ace7fdb8de11f1f1a7b6ca3c0f3ef6b081d6f29 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.h
@@ -182,7 +182,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapMedianFilter.txx"
+#include "otbDisparityMapMedianFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
index f876cfe9ed2673e609cb5019924c3969150f421f..6fd7b3b93a5c2e718f015ba7d7d30fe7eb28d373 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapMedianFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapMedianFilter_txx
-#define otbDisparityMapMedianFilter_txx
+#ifndef otbDisparityMapMedianFilter_hxx
+#define otbDisparityMapMedianFilter_hxx
 
 #ifdef ITK_USE_CONSOLIDATED_MORPHOLOGY
 #else
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
index ab1eb7d37e0f936f5d8e3e7a8f2a02df54b75c69..b139e844c4812b2c8e94e92f738387bce34727bf 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.h
@@ -185,7 +185,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapTo3DFilter.txx"
+#include "otbDisparityMapTo3DFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
index 737e9d3937c6b985f0356153f8a3d522e80b4fe2..48e3df23b66d0ac0c64e1e9479821946470e9cc0 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapTo3DFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapTo3DFilter_txx
-#define otbDisparityMapTo3DFilter_txx
+#ifndef otbDisparityMapTo3DFilter_hxx
+#define otbDisparityMapTo3DFilter_hxx
 
 #include "otbDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
index 163d54dc1f37b6591e149d9de7135af5218924e7..396f7bde25a3a1df64ca5658a37d770d05cf7be0 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.h
@@ -206,7 +206,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityMapToDEMFilter.txx"
+#include "otbDisparityMapToDEMFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
index fdbbcbaaabca89b940063139b8b7c7782a869ad1..86a9ac5e4790a39d8b32a4f0a2f1576a8ee91454 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityMapToDEMFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityMapToDEMFilter_txx
-#define otbDisparityMapToDEMFilter_txx
+#ifndef otbDisparityMapToDEMFilter_hxx
+#define otbDisparityMapToDEMFilter_hxx
 
 #include "otbDisparityMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
index aa7d1c8ac1e6fb09aa6ebfa7d42b3a5ae8418cf9..fb7b510276c84e70b364696da8d143d61ae19d73 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbDisparityTranslateFilter.txx"
+#include "otbDisparityTranslateFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
index 1d4129959a554985a4376192ba440074553d3b74..2ecbc873e28602b1c6070643664b82191f2fb02c 100644
--- a/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbDisparityTranslateFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbDisparityTranslateFilter_txx
-#define otbDisparityTranslateFilter_txx
+#ifndef otbDisparityTranslateFilter_hxx
+#define otbDisparityTranslateFilter_hxx
 
 #include "otbDisparityTranslateFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
index a300e02bb8fed3f3e0ce8593dabfe1543c2d0b21..0f1d0c1957f7da76274dc4952e1ae1e14a326e87 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.h
@@ -253,7 +253,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbFineRegistrationImageFilter.txx"
+#include "otbFineRegistrationImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
index 33b4cf4ccf82c3cfa7d6295545b62a9349de3c14..47b79280814cae5c5f405f289ff626c1a4d48ceb 100644
--- a/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbFineRegistrationImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbFineRegistrationImageFilter_txx
-#define otbFineRegistrationImageFilter_txx
+#ifndef otbFineRegistrationImageFilter_hxx
+#define otbFineRegistrationImageFilter_hxx
 
 #include "otbFineRegistrationImageFilter.h"
 
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
index 085da5cfad057e2307107c473f2dd49da2db60b0..ad2de0bc836e349d34775358475d982d95aeda30 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.h
@@ -190,7 +190,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMultiDisparityMapTo3DFilter.txx"
+#include "otbMultiDisparityMapTo3DFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
index 5fcab948225d1a37c64cee1e17801b4c7615993f..6acf57d3caf415796fc68d01cf5b3f0cc8efa23a 100644
--- a/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbMultiDisparityMapTo3DFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMultiDisparityMapTo3DFilter_txx
-#define otbMultiDisparityMapTo3DFilter_txx
+#ifndef otbMultiDisparityMapTo3DFilter_hxx
+#define otbMultiDisparityMapTo3DFilter_hxx
 
 #include "otbMultiDisparityMapTo3DFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
index 4ee49f4aec2a44dd86d7d1526ab12816904eec54..400c3268d663228e428b15c71242666e07598d8a 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.h
@@ -159,7 +159,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCCRegistrationFilter.txx"
+#include "otbNCCRegistrationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
index a5518d4cc9e36f743eb08067d34157a92be365a9..a42ccd3f388b128c0e4e463744b8319d57a94613 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCCRegistrationFilter_txx
-#define otbNCCRegistrationFilter_txx
+#ifndef otbNCCRegistrationFilter_hxx
+#define otbNCCRegistrationFilter_hxx
 #include "otbNCCRegistrationFilter.h"
 
 namespace otb
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
index 0dd35eae8b5474ccb4192b88a340e971c06c9e0e..4cda2ec715d794b0573a1dfa91e7026e25c04221 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.h
@@ -193,7 +193,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNCCRegistrationFunction.txx"
+#include "otbNCCRegistrationFunction.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
index 1b9687b618c1ac1a74985efe5a302cbc2a4ab296..b104a7d9e983047f9053e3211690f4262f814260 100644
--- a/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
+++ b/Modules/Registration/DisparityMap/include/otbNCCRegistrationFunction.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNCCRegistrationFunction_txx
-#define otbNCCRegistrationFunction_txx
+#ifndef otbNCCRegistrationFunction_hxx
+#define otbNCCRegistrationFunction_hxx
 
 #include "vnl/vnl_math.h"
 #include "itkNeighborhoodIterator.h"
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
index 466b493f6f427e0ce17a59661ebb318d8ce4ea91..bc48ccc2b80185b683ab56c15bcc7cfa8d94c92a 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.h
@@ -509,7 +509,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPixelWiseBlockMatchingImageFilter.txx"
+#include "otbPixelWiseBlockMatchingImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
index c8499025d9e99966e018d91542d22b8cb65dbb9c..2a617111877cc6fd5c4ccd6e1839458d07eb112e 100644
--- a/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbPixelWiseBlockMatchingImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPixelWiseBlockMatchingImageFilter_txx
-#define otbPixelWiseBlockMatchingImageFilter_txx
+#ifndef otbPixelWiseBlockMatchingImageFilter_hxx
+#define otbPixelWiseBlockMatchingImageFilter_hxx
 
 #include "otbPixelWiseBlockMatchingImageFilter.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
index e01d3f66522df0390a12dbdf10a86850f39e1789..4d46b9fcccda9d18d6af794284cc6c9eee1901ac 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.h
@@ -284,7 +284,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbSubPixelDisparityImageFilter.txx"
+#include "otbSubPixelDisparityImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
index 3250075e4cef41f10e3824b9b53bb4bdc73684ea..32e1baf576f3527456de6de3d282c5f78c56c93b 100644
--- a/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
+++ b/Modules/Registration/DisparityMap/include/otbSubPixelDisparityImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbSubPixelDisparityImageFilter_txx
-#define otbSubPixelDisparityImageFilter_txx
+#ifndef otbSubPixelDisparityImageFilter_hxx
+#define otbSubPixelDisparityImageFilter_hxx
 
 #include "otbSubPixelDisparityImageFilter.h"
 
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
index 0b9b93e7ff521bd9c0d71c6341d04b0f38ee424e..286b9fc7e51dd0f80ba7828f0c0db547ec71bc68 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.h
@@ -78,7 +78,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplinesInterpolateDisplacementFieldGenerator.txx"
+#include "otbBSplinesInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
index afc2eb4d61318ff62eab58ae6e3b4524836b3f5f..f5bf50acc4942f247c790ac6251788bb218b5d97 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_txx
-#define otbBSplinesInterpolateDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateDisplacementFieldGenerator_hxx
+#define otbBSplinesInterpolateDisplacementFieldGenerator_hxx
 
 #include "otbBSplinesInterpolateDisplacementFieldGenerator.h"
 // Disabling deprecation warning if on visual
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
index 02bedae933c0cca1a44229d4e36232a2ffa9c001..21d1c0d26c82de35623d3659eef0bbe3ebed8b58 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.h
@@ -132,7 +132,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.txx"
+#include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
index 39e64ba41b6a4eb136ae34e5c8f20a1cdbebe284..7a86cebee0e33f766ceb8831bf549fe43cc50a8e 100644
--- a/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbBSplinesInterpolateTransformDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
-#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_txx
+#ifndef otbBSplinesInterpolateTransformDisplacementFieldGenerator_hxx
+#define otbBSplinesInterpolateTransformDisplacementFieldGenerator_hxx
 
 #include "otbBSplinesInterpolateTransformDisplacementFieldGenerator.h"
 #include "itkLandmarkDisplacementFieldSource.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
index 1b701aa48055cca8aba0170c5e32267c8317dbc5..dea75c6cfe0cdef9c7b2c1865fcd28151894be96 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.h
@@ -81,7 +81,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.txx"
+#include "otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
index 5e1f12d243da0a9fea4e094a7b37f96a8cfdec4b..5192a8cb6693a442efd87b683f04504100c7260e 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestPointsLinearInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
-#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_hxx
+#define otbNNearestPointsLinearInterpolateDisplacementFieldGenerator_hxx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
index 3ee3175124c128a3cc61fbf7747cf7825eb93aaf..63b981a3eebb5bdd7358f15358a834ece1e2423e 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.h
@@ -88,7 +88,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.txx"
+#include "otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
index 5f8c2a15e5b37de68c5a557ea971ba8cd8f9e5a9..e66e1a01989006328b8dd8fba74a926ee3953c0a 100644
--- a/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
-#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_txx
+#ifndef otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_hxx
+#define otbNNearestTransformsLinearInterpolateDisplacementFieldGenerator_hxx
 
 #define EPSILON 1e-15
 
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
index 8ae789e0f957707b9a1ffe0e831d6f43f68178f7..a5d41ae734de0f436438130053465b647839a711 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.h
@@ -76,7 +76,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNearestPointDisplacementFieldGenerator.txx"
+#include "otbNearestPointDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
index e7e29e8b917e042b9d894442d3592fb49052a46f..19730624b4c888877cba5fcf03e3fc2d043c1dde 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNearestPointDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNearestPointDisplacementFieldGenerator_txx
-#define otbNearestPointDisplacementFieldGenerator_txx
+#ifndef otbNearestPointDisplacementFieldGenerator_hxx
+#define otbNearestPointDisplacementFieldGenerator_hxx
 
 #include "otbNearestPointDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
index 393b66ac684246ce9fc338a72324bb979fbbe86a..19ebf116fb5b666d12be5244e420dab714a3b11a 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.h
@@ -79,7 +79,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbNearestTransformDisplacementFieldGenerator.txx"
+#include "otbNearestTransformDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
index 4e8000b62c97c03c0781dc22a0825d23c841ba7e..266f49165177bc66a5b276c264421d08830e7f72 100644
--- a/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbNearestTransformDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbNearestTransformDisplacementFieldGenerator_txx
-#define otbNearestTransformDisplacementFieldGenerator_txx
+#ifndef otbNearestTransformDisplacementFieldGenerator_hxx
+#define otbNearestTransformDisplacementFieldGenerator_hxx
 
 #include "otbNearestTransformDisplacementFieldGenerator.h"
 #include "itkImageRegionIteratorWithIndex.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
index c3b8d1312e53f94de9d29fe1ea3a9c6b2cfc89fa..879d51a6d61c69e2ba5de5d7ed756adaac5871d7 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.h
@@ -160,7 +160,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetToDisplacementFieldGenerator.txx"
+#include "otbPointSetToDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
index 66009e3ff6b84b8a6265d3495ec49a6889835e63..28e73fb6f7d0f10521d1dd8371c29384d7bc299c 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetToDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetToDisplacementFieldGenerator_txx
-#define otbPointSetToDisplacementFieldGenerator_txx
+#ifndef otbPointSetToDisplacementFieldGenerator_hxx
+#define otbPointSetToDisplacementFieldGenerator_hxx
 
 #include "otbPointSetToDisplacementFieldGenerator.h"
 #include "otbMacro.h"
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
index e399698d797ad3b86e8e23415db9609635176e7f..e411b139aa1ef0df9bbb40ea71a22c024df7d9ff 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.h
@@ -100,7 +100,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPointSetWithTransformToDisplacementFieldGenerator.txx"
+#include "otbPointSetWithTransformToDisplacementFieldGenerator.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
index 0fbebc3f2b859b3a1bb255e9095c7318adf8354e..d0bdb0d50e815d77bbf80972a3eb51c720568dbd 100644
--- a/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
+++ b/Modules/Registration/DisplacementField/include/otbPointSetWithTransformToDisplacementFieldGenerator.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_txx
-#define otbPointSetWithTransformToDisplacementFieldGenerator_txx
+#ifndef otbPointSetWithTransformToDisplacementFieldGenerator_hxx
+#define otbPointSetWithTransformToDisplacementFieldGenerator_hxx
 
 #include "otbPointSetWithTransformToDisplacementFieldGenerator.h"
 
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
index c283d48473cf35877d50511ec1fe774b97dcb462..52128fc0fc4f7db5f8a33b8678f4e919beb49c98 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.h
@@ -184,7 +184,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbAdhesionCorrectionFilter.txx"
+#include "otbAdhesionCorrectionFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
index 831ddbbd0b33631b4c367550552ac44c98a4ab4b..5397853bb2bb2f19da9681676dbd9477c604883d 100644
--- a/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbAdhesionCorrectionFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbAdhesionCorrectionFilter_txx
-#define otbAdhesionCorrectionFilter_txx
+#ifndef otbAdhesionCorrectionFilter_hxx
+#define otbAdhesionCorrectionFilter_hxx
 
 #include "otbAdhesionCorrectionFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
index 1f376f666de80d68cc82a1c8794c92f2c0eaff34..0d86483ba51847d8858ca6d2c381daf5a6117ae3 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.h
@@ -148,7 +148,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbBijectionCoherencyFilter.txx"
+#include "otbBijectionCoherencyFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
index 7bef0a97de588c5f9525ef9c935d371865ecdc8b..201273cfe25332fef72caeb063601870e53a1775 100644
--- a/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbBijectionCoherencyFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbBijectionCoherencyFilter_txx
-#define otbBijectionCoherencyFilter_txx
+#ifndef otbBijectionCoherencyFilter_hxx
+#define otbBijectionCoherencyFilter_hxx
 
 #include "otbBijectionCoherencyFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
index 0f18ecb3068c538b7948b34791346bb30f3c996d..3e9cfd5d046161f99283ebb90583ca38a51a269e 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.h
@@ -109,7 +109,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLineOfSightOptimizer.txx"
+#include "otbLineOfSightOptimizer.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
index 83674d69841e329de6db31e9fd60537c954ca0f4..bf20e358db9c5e5f1fc0cd9ea5a057c8963c7257 100644
--- a/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
+++ b/Modules/Registration/Stereo/include/otbLineOfSightOptimizer.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLineOfSightOptimizer_txx
-#define otbLineOfSightOptimizer_txx
+#ifndef otbLineOfSightOptimizer_hxx
+#define otbLineOfSightOptimizer_hxx
 
 #include "otbLineOfSightOptimizer.h"
 
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
index 9818ce81aa99172346fb703aeec7d821f21942b3..643350c2ef6cf369a56f2e3ce02915cad6bd6135 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.h
@@ -318,7 +318,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMulti3DMapToDEMFilter.txx"
+#include "otbMulti3DMapToDEMFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
index a1f8d45ea3affc006fc19ec24c8001ed50dbdd19..fd58e1a132283fbf7172eb89b070574f51b2eeea 100644
--- a/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbMulti3DMapToDEMFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMulti3DMapToDEMFilter_txx
-#define otbMulti3DMapToDEMFilter_txx
+#ifndef otbMulti3DMapToDEMFilter_hxx
+#define otbMulti3DMapToDEMFilter_hxx
 
 #include "otbMulti3DMapToDEMFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
index c5dcde360c584991f427a5ec8eb3b4015aba35dd..078af7edb40a2b52e672fe1da39f9badb8178618 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.h
@@ -251,7 +251,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStereoSensorModelToElevationMapFilter.txx"
+#include "otbStereoSensorModelToElevationMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
index 9ea41b6efb6f0fa9c4f841f50d65b78354363d44..b847999ea8ae12a2d7688b1e575a44e7eb585b37 100644
--- a/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
+++ b/Modules/Registration/Stereo/include/otbStereoSensorModelToElevationMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStereoSensorModelToElevationMapFilter_txx
-#define otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_hxx
+#define otbStereoSensorModelToElevationMapFilter_hxx
 
 #include "otbStereoSensorModelToElevationMapFilter.h"
 
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
index 37eb7ad7bcb6a6ac0fbe217a2a494a19c14fe5f3..8d60cc2d61a614b352cbf9b7363ff4a3fa127c19 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.h
@@ -229,7 +229,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStereorectificationDisplacementFieldSource.txx"
+#include "otbStereorectificationDisplacementFieldSource.hxx"
 #endif
 
 #endif
diff --git a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
index 8e4c179c8345016e7782f35ff7975cb190d0489c..a3fedbf970720ca5a4ef2de3782a51b73b3e75ba 100644
--- a/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
+++ b/Modules/Registration/Stereo/include/otbStereorectificationDisplacementFieldSource.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStereoSensorModelToElevationMapFilter_txx
-#define otbStereoSensorModelToElevationMapFilter_txx
+#ifndef otbStereoSensorModelToElevationMapFilter_hxx
+#define otbStereoSensorModelToElevationMapFilter_hxx
 
 #include "otbStereorectificationDisplacementFieldSource.h"
 #include "itkProgressReporter.h"
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
index a45b596142851eacd4977c09c325da991f199dad..dfc2d58be5e585561e3330ffb2c5b8a3fc569c91 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.h
@@ -136,7 +136,7 @@ private:
 }//end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelObjectOpeningMuParserFilter.txx"
+#include "otbLabelObjectOpeningMuParserFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
index f6f2bd605f2241b7119544c4033b0cdffa2537d6..94964df858728d781087eb84b02d2d56a24958e3 100644
--- a/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
+++ b/Modules/Segmentation/CCOBIA/include/otbLabelObjectOpeningMuParserFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelObjectOpeningMuParserFilter_txx
-#define otbLabelObjectOpeningMuParserFilter_txx
+#ifndef otbLabelObjectOpeningMuParserFilter_hxx
+#define otbLabelObjectOpeningMuParserFilter_hxx
 
 #include "otbLabelObjectOpeningMuParserFilter.h"
 #include <iostream>
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
index a81aabc5cb32e8f80158e05f5cd21cef744ea114..fe78b20de9562d9fbaccbdb751984c25245862e6 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h
@@ -254,7 +254,7 @@ public:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.txx"
+#include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
index 08dff3c3dd8211db4023bb12c2e848c5a53fbc51..d0ee081daf47c164c957a2b3666cfcafc82d0e88 100644
--- a/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
+++ b/Modules/Segmentation/CCOBIA/include/otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
-#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_txx
+#ifndef otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_hxx
+#define otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter_hxx
 
 #include "otbStreamingConnectedComponentSegmentationOBIAToVectorDataFilter.h"
 #include "otbVectorDataTransformFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
index df55b8a0dd9fa11d8706a64ace6d1479125c5ab6..0d334e79c0e2dfa7e8e62c36d08737c743216ee1 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.h
@@ -152,7 +152,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageRegionMergingFilter.txx"
+#include "otbLabelImageRegionMergingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
index 34b7e59684d96246baaabe542f33122541f577eb..23180bc7986007b8b309e712c4cdd508484ef17d 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionMergingFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelImageRegionMergingFilter_txx
-#define otbLabelImageRegionMergingFilter_txx
+#ifndef otbLabelImageRegionMergingFilter_hxx
+#define otbLabelImageRegionMergingFilter_hxx
 
 #include "otbLabelImageRegionMergingFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
index 37a02d61116d5db88473a7fbfa62e549385d2eae..0438c12fc2f102b5dd453afa1effc6267ac48f1d 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.h
@@ -151,7 +151,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageRegionPruningFilter.txx"
+#include "otbLabelImageRegionPruningFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
index 498e3dab05273b55e053cfc18c7ee1748b7dba78..06af2e415b7022011fa441dcd535527b47bf4980 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageRegionPruningFilter.hxx
@@ -19,8 +19,8 @@
  */
 
 
-#ifndef otbLabelImageRegionPruningFilter_txx
-#define otbLabelImageRegionPruningFilter_txx
+#ifndef otbLabelImageRegionPruningFilter_hxx
+#define otbLabelImageRegionPruningFilter_hxx
 
 #include "otbLabelImageRegionPruningFilter.h"
 #include "itkImageRegionConstIteratorWithIndex.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
index 6132caa2ed3151cb2a4a0a42dabb90c32cfcf58a..805f091d748b1066247fe7e75bb26a39da011948 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.h
@@ -141,7 +141,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToOGRDataSourceFilter.txx"
+#include "otbLabelImageToOGRDataSourceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
index 8f714630c794bb49a0d15e875dc62d481545b30e..9b55a9e3778dcec56eef24a76daa27915ea4205f 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToOGRDataSourceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToOGRDataSourceFilter_txx
-#define otbLabelImageToOGRDataSourceFilter_txx
+#ifndef otbLabelImageToOGRDataSourceFilter_hxx
+#define otbLabelImageToOGRDataSourceFilter_hxx
 
 #include "otbLabelImageToOGRDataSourceFilter.h"
 #include "otbGdalDataTypeBridge.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
index 611415692085c40ce017fd77a20774ac94a31055..f58ea8951f032c6c9dfd9aa2cd33cbd7030c639f 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.h
@@ -124,7 +124,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelImageToVectorDataFilter.txx"
+#include "otbLabelImageToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
index fdc11febda858dca6dccd0f27e5534aaf242f669..de890899e70be2ce38e11dfcb4704648494ad67b 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelImageToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelImageToVectorDataFilter_txx
-#define otbLabelImageToVectorDataFilter_txx
+#ifndef otbLabelImageToVectorDataFilter_hxx
+#define otbLabelImageToVectorDataFilter_hxx
 
 #include "otbLabelImageToVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
index d73495a2745790fa8e5a6be5a72a4440d1dd3395..28de41fcec115f901e6615c68270f0f0880c42e9 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.h
@@ -129,7 +129,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelMapToVectorDataFilter.txx"
+#include "otbLabelMapToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
index 6cf464cd98a4c5a21cccfb8343bf4add6a65c7d0..dd8e36087a2083b74a5fa291247cb8c22667bbf6 100644
--- a/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbLabelMapToVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelMapToVectorDataFilter_txx
-#define otbLabelMapToVectorDataFilter_txx
+#ifndef otbLabelMapToVectorDataFilter_hxx
+#define otbLabelMapToVectorDataFilter_hxx
 
 #include "otbLabelMapToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
index 39e612bb81cbb461742806c8db230951d8610685..1f60b2d453808c2f6a81c25c13fa9ef5506b7fb7 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.h
@@ -174,7 +174,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbOGRDataSourceToLabelImageFilter.txx"
+#include "otbOGRDataSourceToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
index 71b45b9026dc47b17234dc4aaf10f57a1c43e3c6..30c3e9fba8a7625f2863aa806f0865fca919cf69 100644
--- a/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbOGRDataSourceToLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRDataSourceToLabelImageFilter_txx
-#define otbOGRDataSourceToLabelImageFilter_txx
+#ifndef otbOGRDataSourceToLabelImageFilter_hxx
+#define otbOGRDataSourceToLabelImageFilter_hxx
 
 #include "otbOGRDataSourceToLabelImageFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
index 032dd2405bc210d32ac6ac1dde0747a68f5ee774..3119c50d5a83d5c68024419a564eb1748a3e6379 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.h
@@ -161,7 +161,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToOGRDataFilter.txx"
+#include "otbPersistentImageToOGRDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
index 598033e1475267ca0822535e9041c6b9dbea735d..2a668c3adac410b4b56d49b8bdb12e1c113fa93f 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRDataFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToOGRDataFilter_txx
-#define otbPersistentImageToOGRDataFilter_txx
+#ifndef otbPersistentImageToOGRDataFilter_hxx
+#define otbPersistentImageToOGRDataFilter_hxx
 
 #include "otbPersistentImageToOGRDataFilter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
index ff28b5449c4a3dfe7038842b59681a70fe2bcc4a..f2b580dbd4cb5d0037428aa550ab809f2f856f1d 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.h
@@ -117,7 +117,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToOGRLayerFilter.txx"
+#include "otbPersistentImageToOGRLayerFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
index 29cfa84a63bfc10f83ceeb6c7d67199aaf75522b..f059b884aefe578e40368a43d9e4da2e8c37e296 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToOGRLayerFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToOGRLayerFilter_txx
-#define otbPersistentImageToOGRLayerFilter_txx
+#ifndef otbPersistentImageToOGRLayerFilter_hxx
+#define otbPersistentImageToOGRLayerFilter_hxx
 
 #include "otbPersistentImageToOGRLayerFilter.h"
 #include "otbStopwatch.h"
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
index e5df82c614918556e3d81a02a7a3c94ffa438fa1..288f2fd2420493ce25f89c284f6ca590ba5a5f07 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.h
@@ -121,7 +121,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbPersistentImageToVectorDataFilter.txx"
+#include "otbPersistentImageToVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
index 3f3191312ff623c7db4c7fa5409dea42d88c9c1e..46d7ce8927162bd345edbe86cb0f0939f92af3ed 100644
--- a/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbPersistentImageToVectorDataFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbPersistentImageToVectorDataFilter_txx
-#define otbPersistentImageToVectorDataFilter_txx
+#ifndef otbPersistentImageToVectorDataFilter_hxx
+#define otbPersistentImageToVectorDataFilter_hxx
 
 #include "otbPersistentImageToVectorDataFilter.h"
 
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
index d7d5fcc14acf2d9c94495665e4894dbffedc61bb..d708f1d99569f54512a469ff38f73a08723c71b0 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.h
@@ -170,7 +170,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbRasterizeVectorDataFilter.txx"
+#include "otbRasterizeVectorDataFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
index b3c2d3fd16d6ffb588d886e7b992cc83f80a834d..c140348c0483eda9f005435ab976d8c434654458 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRasterizeVectorDataFilter_txx
-#define otbRasterizeVectorDataFilter_txx
+#ifndef otbRasterizeVectorDataFilter_hxx
+#define otbRasterizeVectorDataFilter_hxx
 
 #include "otbRasterizeVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
index 1d7140543809334e3f726894878e0ad14b6216d4..cede7a2f5a7822daf843e0c03352b2cbfae990e1 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.h
@@ -187,7 +187,7 @@ private:
 
 
 #ifndef  OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelImageFilter.txx"
+#include "otbVectorDataToLabelImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
index 549b9612a5d27576412e3b414f5a163899955fa2..49afc91079839422acf465f1799feda1b2690133 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelImageFilter_txx
-#define otbVectorDataToLabelImageFilter_txx
+#ifndef otbVectorDataToLabelImageFilter_hxx
+#define otbVectorDataToLabelImageFilter_hxx
 
 #include "gdal_alg.h"
 #include "ogr_srs_api.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
index 405e850eaab708fdd604b0706c0a2632dbb0a171..d7dc68971b58ab6a0310f7b313549dac8848f502 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.h
@@ -208,7 +208,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelMapFilter.txx"
+#include "otbVectorDataToLabelMapFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
index fa29f1bb9694ba87b7322267e1141b4a5bde26c2..3d6f6b6161a04fd2174e6155a2b9e491da06f7b5 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelMapFilter_txx
-#define otbVectorDataToLabelMapFilter_txx
+#ifndef otbVectorDataToLabelMapFilter_hxx
+#define otbVectorDataToLabelMapFilter_hxx
 
 #include "otbVectorDataToLabelMapFilter.h"
 #include "itkBinaryImageToLabelMapFilter.h"
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
index da4e68fa9d1a9ae27a366f7c122900d640c377df..72c9f1b455ef4b87b14bc5daea60ec2c53c9c8b6 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.h
@@ -242,7 +242,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbVectorDataToLabelMapWithAttributesFilter.txx"
+#include "otbVectorDataToLabelMapWithAttributesFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
index 1d81abe61ef4e1063af3c0d0f3d014e81ef4dcd7..8aa57fe51e901f89b90d0963810d295cc49146b3 100644
--- a/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
+++ b/Modules/Segmentation/Conversion/include/otbVectorDataToLabelMapWithAttributesFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbVectorDataToLabelMapWithAttributesFilter_txx
-#define otbVectorDataToLabelMapWithAttributesFilter_txx
+#ifndef otbVectorDataToLabelMapWithAttributesFilter_hxx
+#define otbVectorDataToLabelMapWithAttributesFilter_hxx
 
 #include "otbVectorDataToLabelMapWithAttributesFilter.h"
 #include "itkBinaryImageToLabelMapFilter.h"
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
index f283f54ba21bd2c92614fc6afd67b69f540faf73..6c02a525f564d2003925e856306229d61018f453 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.h
@@ -127,7 +127,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeConfidenceConnectedImageFilter.txx"
+#include "otbLabelizeConfidenceConnectedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
index f4425c4a896db1bf1eb72e01138e1f0bf37bb125..75be6b89f7940afd2ba500284304aef1cf0f81cb 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConfidenceConnectedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeConfidenceConnectedImageFilter_txx
-#define otbLabelizeConfidenceConnectedImageFilter_txx
+#ifndef otbLabelizeConfidenceConnectedImageFilter_hxx
+#define otbLabelizeConfidenceConnectedImageFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
index 7adcf822b4a0edfb97905def6ccc586542878d63..ccef3babdde85ef72dc171f61d1f6ce03667371e 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.h
@@ -106,7 +106,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeConnectedThresholdImageFilter.txx"
+#include "otbLabelizeConnectedThresholdImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
index 0caed06cb598c78b09289040bda8b2798a444d3f..70cc8bd1d1d26353c243659d305c8597c5e1220f 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeConnectedThresholdImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeConnectedThresholdImageFilter_txx
-#define otbLabelizeConnectedThresholdImageFilter_txx
+#ifndef otbLabelizeConnectedThresholdImageFilter_hxx
+#define otbLabelizeConnectedThresholdImageFilter_hxx
 
 #include "itkNumericTraits.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
index 8ea03f494ed27fabd7388afc830e5b81a1687a9d..2af1d767b40f01021b6df7e09f0c87eaf9b07b86 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.h
@@ -135,7 +135,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeImageFilterBase.txx"
+#include "otbLabelizeImageFilterBase.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
index 05aa8497bb18c8086ef5eda9ec7e40e06b547f0d..67a6d301b60619cc0739556ea74575bf038308b7 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeImageFilterBase.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeImageFilterBase_txx
-#define otbLabelizeImageFilterBase_txx
+#ifndef otbLabelizeImageFilterBase_hxx
+#define otbLabelizeImageFilterBase_hxx
 
 #include "otbLabelizeImageFilterBase.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
index 8bd2f766d8c2e75c69b00d93b900b5251c1a73c5..8e00721e69a95584761778f9ffb5e57dfd74a1d4 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.h
@@ -128,7 +128,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbLabelizeNeighborhoodConnectedImageFilter.txx"
+#include "otbLabelizeNeighborhoodConnectedImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
index f639d18be253f572d8fc821c327a059192155772..f004e6c917e3e398e527d1806d8cdd68d808307e 100644
--- a/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbLabelizeNeighborhoodConnectedImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbLabelizeNeighborhoodConnectedImageFilter_txx
-#define otbLabelizeNeighborhoodConnectedImageFilter_txx
+#ifndef otbLabelizeNeighborhoodConnectedImageFilter_hxx
+#define otbLabelizeNeighborhoodConnectedImageFilter_hxx
 
 #include "otbLabelizeNeighborhoodConnectedImageFilter.h"
 
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
index 9b01f4b3159759f69e7e1069bc54cf61eff01384..6f395e8a3cfb8d37fd669349be5a8bf44c1cba28 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.h
@@ -154,7 +154,7 @@ private:
 } // end namespace otb
 
 #ifndef ITK_MANUAL_INSTANTIATION
-#include "otbRelabelComponentImageFilter.txx"
+#include "otbRelabelComponentImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
index 7cb9b1c93825b16c5e7122959557fb0051cdb296..0f969ceaad0d328eb3bdb2a5e23b12c70c2fdeb2 100644
--- a/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
+++ b/Modules/Segmentation/Labelling/include/otbRelabelComponentImageFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbRelabelComponentImageFilter_txx
-#define otbRelabelComponentImageFilter_txx
+#ifndef otbRelabelComponentImageFilter_hxx
+#define otbRelabelComponentImageFilter_hxx
 
 #include "otbRelabelComponentImageFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
index b065125bc7645c25002fa760a8584cb2f3b47e3c..b4bb5dae13fb223e51efe7d19e1cffdab31df2ab 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.h
@@ -151,7 +151,7 @@ private:
 } // end namespace itk
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftConnectedComponentSegmentationFilter.txx"
+#include "otbMeanShiftConnectedComponentSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
index d2729b2a7f5499a36f07495ae946d306924392f2..ba8d6b07f0727138610304ad537def48a7f8a9b6 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftConnectedComponentSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMeanShiftConnectedComponentSegmentationFilter_txx
-#define otbMeanShiftConnectedComponentSegmentationFilter_txx
+#ifndef otbMeanShiftConnectedComponentSegmentationFilter_hxx
+#define otbMeanShiftConnectedComponentSegmentationFilter_hxx
 
 #include "otbMeanShiftConnectedComponentSegmentationFilter.h"
 #include "itkExtractImageFilter.h"
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
index 992e77729756d7f584030f93a8f4747da3d7395e..99d7ab975a6c8fcb7074536b01f37e6ebe7b4b9d 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.h
@@ -191,7 +191,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMeanShiftSegmentationFilter.txx"
+#include "otbMeanShiftSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
index 4ab8355cd96db263e5a4eb227ebc874950c63871..2cbf159b6ab816886c26df3f272bbcc7e96ad74d 100644
--- a/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
+++ b/Modules/Segmentation/MeanShift/include/otbMeanShiftSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMeanShiftSegmentationFilter_txx
-#define otbMeanShiftSegmentationFilter_txx
+#ifndef otbMeanShiftSegmentationFilter_hxx
+#define otbMeanShiftSegmentationFilter_hxx
 
 #include "otbMeanShiftSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
index cae56e1625c5fd66abee1d008eb745f7fe1228a2..5edef4f6d7723f375218586fbd7125e66ee6ba69 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.h
@@ -281,7 +281,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHooverInstanceFilter.txx"
+#include "otbHooverInstanceFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
index 26e2e80ce73b9d17c81d320b5bf9fdb014805589..7c72d89d9edfdfe72da875f77b77a6ab938c8cb2 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
+++ b/Modules/Segmentation/Metrics/include/otbHooverInstanceFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHooverInstanceFilter_txx
-#define otbHooverInstanceFilter_txx
+#ifndef otbHooverInstanceFilter_hxx
+#define otbHooverInstanceFilter_hxx
 
 #include "otbHooverInstanceFilter.h"
 #include "otbMacro.h"
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
index efedebd57f8f0f921f122d49a9221e9b08fa47b0..40bcd6ee956ea11016f438d4d1ba66789a1407fb 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.h
@@ -119,7 +119,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHooverMatrixFilter.txx"
+#include "otbHooverMatrixFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
index 1acca788796903800e9bf23b55ba9b631529638f..d4863c6cfc22934bcd3a81360c5bbe831910e8d7 100644
--- a/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
+++ b/Modules/Segmentation/Metrics/include/otbHooverMatrixFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbHooverMatrixFilter_txx
-#define otbHooverMatrixFilter_txx
+#ifndef otbHooverMatrixFilter_hxx
+#define otbHooverMatrixFilter_hxx
 
 #include "otbHooverMatrixFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
index 3805d42514a9132d44b59fa0fcf0b039063177d5..1dd484e53de1637f58a7fbb1e374b18317ef39ff 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.h
@@ -98,6 +98,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbClosingOpeningMorphologicalFilter.txx"
+#include "otbClosingOpeningMorphologicalFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
index ac7fa0c080c28dcc1ea1f4a0890c68300faa5d98..9624d10ad77d5b713f46b0b54e5ea98ce2a9e47d 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbClosingOpeningMorphologicalFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbClosingOpeningMorphologicalFilter_txx
-#define otbClosingOpeningMorphologicalFilter_txx
+#ifndef otbClosingOpeningMorphologicalFilter_hxx
+#define otbClosingOpeningMorphologicalFilter_hxx
 
 #include "otbClosingOpeningMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
index e06bc3c8860c23abb50f1ef2d65990e9453bb2a4..4b2ef4d9bd4f79a25d6e820dba48a907c6c43c94 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.h
@@ -183,7 +183,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeodesicMorphologyDecompositionImageFilter.txx"
+#include "otbGeodesicMorphologyDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
index 5c56cbb99220c956c69a6bf87ff73ed4169c5f50..514b4e0e56177912beb3ab603de409082e268dec 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeodesicMorphologyDecompositionImageFilter_txx
-#define otbGeodesicMorphologyDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyDecompositionImageFilter_hxx
+#define otbGeodesicMorphologyDecompositionImageFilter_hxx
 
 #include "otbGeodesicMorphologyDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
index 91d51758e82ac7764a21ed27cd01fae2ef13cea9..3658cd4cd906665c4cd9279b0abf979283ab091c 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.h
@@ -156,7 +156,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.txx"
+#include "otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
index de79d9ee78caddb4c03361d50bf2df3e19a6eded..3c6425a009b223fd4fe71f9277616b630a741d1e 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbGeodesicMorphologyIterativeDecompositionImageFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
-#define otbGeodesicMorphologyIterativeDecompositionImageFilter_txx
+#ifndef otbGeodesicMorphologyIterativeDecompositionImageFilter_hxx
+#define otbGeodesicMorphologyIterativeDecompositionImageFilter_hxx
 
 #include "otbGeodesicMorphologyIterativeDecompositionImageFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
index d8c0718291acfbea5607769b840df71e2b1f2c1c..061859b87b87fd14f5beabe9af33f86774a006f4 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.h
@@ -121,7 +121,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbImageToProfileFilter.txx"
+#include "otbImageToProfileFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
index ac6ec11d87fd5c9a27ee700e88d302b698755e78..f29d085429aed3d92cca029ed9bc2ae95eed4ba5 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbImageToProfileFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbImageToProfileFilter_txx
-#define otbImageToProfileFilter_txx
+#ifndef otbImageToProfileFilter_hxx
+#define otbImageToProfileFilter_hxx
 
 #include "otbImageToProfileFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
index f61f87fc82bb53b93113a258d8af4305d343ac10..f2fb9c8fc7a863dd122a01d347105eac538ca997 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.h
@@ -130,7 +130,7 @@ double       m_Sigma;
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbMorphologicalProfilesSegmentationFilter.txx"
+#include "otbMorphologicalProfilesSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
index 864dac1cc6200bf5dbdaa9b0886c2d1c4b0453de..11a772035d919dc70ecb1d2993b118cec4e5668b 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbMorphologicalProfilesSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbMorphologicalProfilesSegmentationFilter_txx
-#define otbMorphologicalProfilesSegmentationFilter_txx
+#ifndef otbMorphologicalProfilesSegmentationFilter_hxx
+#define otbMorphologicalProfilesSegmentationFilter_hxx
 
 #include "otbMorphologicalProfilesSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
index 7cd8ef6b6e985aa61c61f1dfb2e115b65f4ba55c..584362aebce1d4bce411891f67a0208cf581f9cd 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.h
@@ -98,6 +98,6 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOpeningClosingMorphologicalFilter.txx"
+#include "otbOpeningClosingMorphologicalFilter.hxx"
 #endif
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
index 7d6d011d2964a058bdea0db4ee023dea1c2075c2..fc3f05561ccabc085ef29ac6ffeff19748e3c37e 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbOpeningClosingMorphologicalFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOpeningClosingMorphologicalFilter_txx
-#define otbOpeningClosingMorphologicalFilter_txx
+#ifndef otbOpeningClosingMorphologicalFilter_hxx
+#define otbOpeningClosingMorphologicalFilter_hxx
 
 #include "otbOpeningClosingMorphologicalFilter.h"
 #include "itkUnaryFunctorImageFilter.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
index 489773f83a56143004b7c2bcb2c55e5f14679274..f68a4e02726652ce7f0add8fd338799213f4e612 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.h
@@ -118,7 +118,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.txx"
+#include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
index 5b112476fb5704f1ef549a0a4017ba21495e297c..f95cd23a37bcbcb63a24093f54dabd225c5e7c25 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileDerivativeToMultiScaleCharacteristicsFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
-#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_txx
+#ifndef otbProfileDerivativeToMultiScaleCharacteristicsFilter_hxx
+#define otbProfileDerivativeToMultiScaleCharacteristicsFilter_hxx
 
 #include "otbProfileDerivativeToMultiScaleCharacteristicsFilter.h"
 #include "itkImageRegionIterator.h"
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
index 6d292404b1772048fb6c68fcf24f81729ddf5127..80230dff776078976def7bb921a8c87217e4baac 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.h
@@ -104,7 +104,7 @@ private:
 };
 } // End namespace otb
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbProfileToProfileDerivativeFilter.txx"
+#include "otbProfileToProfileDerivativeFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
index faedadd07ce5a55d913e12be0fbb539dd217c57e..e404d4a27acb8e198ffdfc8dc826d1c0b12a066c 100644
--- a/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
+++ b/Modules/Segmentation/MorphologicalProfiles/include/otbProfileToProfileDerivativeFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbProfileToProfileDerivativeFilter_txx
-#define otbProfileToProfileDerivativeFilter_txx
+#ifndef otbProfileToProfileDerivativeFilter_hxx
+#define otbProfileToProfileDerivativeFilter_hxx
 
 #include "otbProfileToProfileDerivativeFilter.h"
 
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
index e1b35d1d12d3c4ae61ead50147d182aa366c8e2b..b3702ad155522de6e79a96f313059dee0b38d472 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.h
@@ -157,7 +157,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbOGRLayerStreamStitchingFilter.txx"
+#include "otbOGRLayerStreamStitchingFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
index 7ca556f7b9efc7d9118e263d1b47caf311841c44..5359e967bfb7224311aa9d452965ea4cc9c4315c 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
+++ b/Modules/Segmentation/OGRProcessing/include/otbOGRLayerStreamStitchingFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbOGRLayerStreamStitchingFilter_txx
-#define otbOGRLayerStreamStitchingFilter_txx
+#ifndef otbOGRLayerStreamStitchingFilter_hxx
+#define otbOGRLayerStreamStitchingFilter_hxx
 
 #include "otbOGRLayerStreamStitchingFilter.h"
 #include "itkContinuousIndex.h"
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
index 0a908dd9d26fafc7df4b18925790d18a4dd10577..4ca6087be859a15c64141c5cd4c558e3f48ee083 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.h
@@ -360,7 +360,7 @@ private:
 }
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbStreamingImageToOGRLayerSegmentationFilter.txx"
+#include "otbStreamingImageToOGRLayerSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
index 86e702cb13cf2f4c7dbf64cdee6e6ffe1dad980a..26b08df09e6c89983107413650b0692a4e33dc0a 100644
--- a/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
+++ b/Modules/Segmentation/OGRProcessing/include/otbStreamingImageToOGRLayerSegmentationFilter.hxx
@@ -19,8 +19,8 @@
  * limitations under the License.
  */
 
-#ifndef otbStreamingImageToOGRLayerSegmentationFilter_txx
-#define otbStreamingImageToOGRLayerSegmentationFilter_txx
+#ifndef otbStreamingImageToOGRLayerSegmentationFilter_hxx
+#define otbStreamingImageToOGRLayerSegmentationFilter_hxx
 
 #include "otbStreamingImageToOGRLayerSegmentationFilter.h"
 
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
index 32239f115ac77d4bb0fb96e75acaa1d4b4049d16..5e7a124a3ff416602c500f6ff51a342a908d1518 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.h
@@ -97,7 +97,7 @@ private:
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWatershedSegmentationFilter.txx"
+#include "otbWatershedSegmentationFilter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
index b439f141e880afabc695875f0d16d3fc96957e68..078dc954f1af1cf5159c5271f3ddcd80976fcdce 100644
--- a/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
+++ b/Modules/Segmentation/Watersheds/include/otbWatershedSegmentationFilter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWatershedSegmentationFilter_txx
-#define otbWatershedSegmentationFilter_txx
+#ifndef otbWatershedSegmentationFilter_hxx
+#define otbWatershedSegmentationFilter_hxx
 
 #include "otbWatershedSegmentationFilter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
index 0894f663e61ea5bde95f1813c92386d36f38e251..be80a2386d124032df0d7c627b94ccdb45597ba8 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperApplication.h
@@ -1150,7 +1150,7 @@ private:
 
 
 //#ifndef OTB_MANUAL_INSTANTIATION
-//#include "otbWrapperApplication.txx"
+//#include "otbWrapperApplication.hxx"
 //#endif
 
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
index 79b714a22b321ce56658cd5226e82cbfb8fc9788..e98fe963ac876c5dbbc97b4bc522374d307f91cf 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.h
@@ -143,7 +143,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWrapperComplexInputImageParameter.txx"
+#include "otbWrapperComplexInputImageParameter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
index 86dd38fdc9993cf66f6c4a92b21b5dc9df541427..d4488055ab2c662b03090c4abb660c692d18f05b 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperComplexInputImageParameter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperComplexInputImageParameter_txx
-#define otbWrapperComplexInputImageParameter_txx
+#ifndef otbWrapperComplexInputImageParameter_hxx
+#define otbWrapperComplexInputImageParameter_hxx
 
 #include "otbWrapperComplexInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
index eb64c66a8a1cd314a0171fa2da17f43081807eec..19b88d40ceb8c50cdadf4a0b0100bf5378f6a55e 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.h
@@ -171,7 +171,7 @@ private:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include "otbWrapperInputImageParameter.txx"
+#include "otbWrapperInputImageParameter.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
index 72a3794cddc43ae99c4aef6d2f362b89b8074477..634193bee1b2b2dacd5a6bec0bbef78b8c7bb4b2 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperInputImageParameter_txx
-#define otbWrapperInputImageParameter_txx
+#ifndef otbWrapperInputImageParameter_hxx
+#define otbWrapperInputImageParameter_hxx
 
 #include "otbWrapperInputImageParameter.h"
 
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
index 90665af66b00d7d6e5a1726142050429bf64ef3e..07169d9ad134ded7d524af3b55b1ba9ee414b760 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.h
@@ -199,7 +199,7 @@ protected:
 } // End namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-# include "otbWrapperParameterList.txx"
+# include "otbWrapperParameterList.hxx"
 #endif
 
 #endif
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
index da857bcbf8bff3e78b988e2044f8f14cb4c144b6..c5d48e5abad6e279e9c0fe52d5abfff711b05837 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperParameterList.hxx
@@ -18,8 +18,8 @@
  * limitations under the License.
  */
 
-#ifndef otbWrapperParameterList_txx
-#define otbWrapperParameterList_txx
+#ifndef otbWrapperParameterList_hxx
+#define otbWrapperParameterList_hxx
 
 
 #include <algorithm>
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
index 0cb748297397bdb75c8ec7c04350dcae384376bd..37dbd86621e5815e7480bc9016f72f566ed33530 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h
@@ -90,7 +90,7 @@ private:
 }
 
 //#ifndef OTB_MANUAL_INSTANTIATION
-//#include "otbWrapperProxyParameter.txx"
+//#include "otbWrapperProxyParameter.hxx"
 //#endif
 
 #endif
diff --git a/Utilities/Doxygen/doxygen.config.in b/Utilities/Doxygen/doxygen.config.in
index c77823e62a62e27a128e9eb45880439187afe79e..e140ef2bcd784ea53f86cd615ee306a6b8f2b3fa 100644
--- a/Utilities/Doxygen/doxygen.config.in
+++ b/Utilities/Doxygen/doxygen.config.in
@@ -773,7 +773,7 @@ INPUT_ENCODING         = UTF-8
 
 FILE_PATTERNS          = *.cxx \
                          *.h \
-                         *.txx \
+                         *.hxx \
                          *.hxx \
                          *.dox
 
diff --git a/Utilities/Maintenance/BuildHeaderTest.py b/Utilities/Maintenance/BuildHeaderTest.py
index 8b4403b07be6da89e8aff9878cf41a580d383f1b..b1c116f4e14f01ef6ee71c33e1b612694d4da919 100644
--- a/Utilities/Maintenance/BuildHeaderTest.py
+++ b/Utilities/Maintenance/BuildHeaderTest.py
@@ -108,9 +108,9 @@ def main():
         else:
             max_idx = added_header_idx + maximum_number_of_headers
         for i in range(added_header_idx, max_idx):
-            # Use the .hxx or .txx if possible.
+            # Use the .hxx or .hxx if possible.
+            hxx_file = h_files[i][:-1] + 'hxx'
             hxx_file = h_files[i][:-1] + 'hxx'
-            txx_file = h_files[i][:-1] + 'txx'
             # Files that include VTK headers need to link to VTK.
             if h_files[i] in BANNED_HEADERS or h_files[i].lower().find('vtk') != -1:
                 to_include = '// #include "' + h_files[i] + '" // Banned in BuildHeaderTest.py\n'
@@ -118,8 +118,8 @@ def main():
                 hxx_file)):
                 to_include = '#include "' + hxx_file + '"\n'
             elif os.path.exists(os.path.join(module_source_path, 'include',
-                txx_file)):
-                to_include = '#include "' + txx_file + '"\n'
+                hxx_file)):
+                to_include = '#include "' + hxx_file + '"\n'
             else:
                 to_include = '#include "' + h_files[i] + '"\n'