diff --git a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
index 4fe28c42136975575a0877d298564b3f990a353a..0606b5b150a401c7432e8eda1192ae88694cff3a 100644
--- a/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
+++ b/Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
@@ -33,8 +33,10 @@
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wcast-align"
 #pragma GCC diagnostic ignored "-Wunknown-pragmas"
-#pragma GCC diagnostic ignored "-Wheader-guard"
 #pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wheader-guard"
+#endif
 #endif
 #include <shark/Models/Classifier.h>
 #include "otb_shark.h"
diff --git a/Modules/ThirdParty/Shark/include/otbSharkUtils.h b/Modules/ThirdParty/Shark/include/otbSharkUtils.h
index 04c57b6d4e7f5a022b0c4fafa86ac41b134f690c..01d935b21eb1e46c588f8cf9d6eb490e2d143657 100644
--- a/Modules/ThirdParty/Shark/include/otbSharkUtils.h
+++ b/Modules/ThirdParty/Shark/include/otbSharkUtils.h
@@ -30,6 +30,9 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wsign-compare"
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wheader-guard"
+#endif
 #endif
 #include "otb_shark.h"
 #include "shark/Data/Dataset.h"
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
index e7c41235d84c27d526c2a235db7e105b56c5608a..c54bb98a0dd6f35d6694f12668fb2efc7d0e0501 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperDirectoryParameter.h
@@ -68,7 +68,7 @@ public:
   }
 
   // Reimplement the SetActive method
-  void SetActive(  const bool value ) override
+  void SetActive( bool value ) override
   {
     Superclass::SetActive( value );
     m_StringParam->SetActive( value );
diff --git a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
index 72f9393ea95e1d10c94ecc255d02e1b0b70f9431..2f2efc8a8f1f436571f5721b048968beb58b53fb 100644
--- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperRAMParameter.h
@@ -83,7 +83,7 @@ public:
   }
 
   // Reimplement the SetActive method
-  void SetActive(  const bool value ) override
+  void SetActive( bool value ) override
   {
     Superclass::SetActive( value );
     m_UnsignedIntParam->SetActive( value );