diff --git a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.txx
index a31617b1a3036a298c57965cfa76ca8b37891684..855b94bb1cc99a35e8d8f1dc6a668e10372268d2 100644
--- a/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbBoostMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbBoostMachineLearningModelFactory_txx
+#define otbBoostMachineLearningModelFactory_txx
+
 #include "otbBoostMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ BoostMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.txx
index 6d6fda5ab95b112de2400ce4aa79be9bbdee4b6b..de861f1dde39b9b0526c3e13386a857b1ec4e324 100644
--- a/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbGradientBoostedTreeMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbGradientBoostedTreeMachineLearningModelFactory_txx
+#define otbGradientBoostedTreeMachineLearningModelFactory_txx
+
 #include "otbGradientBoostedTreeMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ GradientBoostedTreeMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.txx
index 70499ac015c9f89ec7dc36852556b22289d5496f..d5a8c2ead90dc92d5f10bf2e1bc37bde1dfb90f9 100644
--- a/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbKNearestNeighborsMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbKNearestNeighborsMachineLearningModelFactory_txx
+#define otbKNearestNeighborsMachineLearningModelFactory_txx
+
 #include "otbKNearestNeighborsMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ KNearestNeighborsMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.txx
index fd5f7bcca173ec4f5810a8cc173686b9f6cccc36..a4771f102b964376f84a0e85fb04575786fcba44 100644
--- a/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbLibSVMMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbLibSVMMachineLearningModelFactory_txx
+#define otbLibSVMMachineLearningModelFactory_txx
+
 #include "otbLibSVMMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ LibSVMMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.txx
index 8daca7d2eed44246b7749a8e364d9345bd281381..c5c5cea552a85b2f16b244e63d339c488d239d77 100644
--- a/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbMachineLearningModelFactory_txx
+#define otbMachineLearningModelFactory_txx
+
 #include "otbMachineLearningModelFactory.h"
 #include "otbConfigure.h"
 
@@ -212,3 +215,5 @@ MachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.txx
index 83d1bc526e409638190145c5913626ab12054b79..613d1f850c323b995958bf065e1fdafafb5d4178 100644
--- a/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbNeuralNetworkMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbNeuralNetworkMachineLearningModelFactory_txx
+#define otbNeuralNetworkMachineLearningModelFactory_txx
+
 #include "otbNeuralNetworkMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ NeuralNetworkMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.txx
index 879c79678f24bb0a0b31d133a69e342933b3b9c4..5c9796e2e71ad37ebecc6a39c07646a610801fcb 100644
--- a/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbNormalBayesMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbNormalBayesMachineLearningModelFactory_txx
+#define otbNormalBayesMachineLearningModelFactory_txx
+
 #include "otbNormalBayesMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ NormalBayesMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.txx
index 591b5802d650a4d2dfce478685a58b96695f1bbf..dc27f006712520dcb9622d2fbcc64d305a0b8ab3 100644
--- a/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbRandomForestsMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbRandomForestsMachineLearningModelFactory_txx
+#define otbRandomForestsMachineLearningModelFactory_txx
+
 #include "otbRandomForestsMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ RandomForestsMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.txx b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.txx
index ddf96df72009d9fb1af3f30bc638c7297df1761b..160daeb79faf7447b80948b3912b919c2ef9f802 100644
--- a/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.txx
+++ b/Modules/Learning/Supervised/include/otbSVMMachineLearningModelFactory.txx
@@ -15,6 +15,9 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbSVMMachineLearningModelFactory_txx
+#define otbSVMMachineLearningModelFactory_txx
+
 #include "otbSVMMachineLearningModelFactory.h"
 
 #include "itkCreateObjectFunction.h"
@@ -62,3 +65,5 @@ SVMMachineLearningModelFactory<TInputValue,TOutputValue>
 }
 
 } // end namespace otb
+
+#endif
diff --git a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx
index 7bcab2be19d32d3510d89fd17937a460df64e37c..09711a6f009a8905ed446e599b62f47e8a79a54b 100644
--- a/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx
+++ b/Modules/Segmentation/Conversion/include/otbRasterizeVectorDataFilter.txx
@@ -15,6 +15,8 @@
      PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#ifndef otbRasterizeVectorDataFilter_txx
+#define otbRasterizeVectorDataFilter_txx
 
 #include "otbRasterizeVectorDataFilter.h"
 #include "otbOGRIOHelper.h"
@@ -209,3 +211,4 @@ RasterizeVectorDataFilter<TVectorData, TInputImage, TOutputImage>
 
 } // end namespace otb
 
+#endif