diff --git a/modules/core/include/visp3/core/vpRGBa.h b/modules/core/include/visp3/core/vpRGBa.h
index 21dba9884e..5d70e4cee2 100644
--- a/modules/core/include/visp3/core/vpRGBa.h
+++ b/modules/core/include/visp3/core/vpRGBa.h
@@ -45,7 +45,7 @@
 #include <visp3/core/vpConfig.h>
 #include <visp3/core/vpColVector.h>
 
-#if (VISP_CXX_STANDARD > VISP_CXX_STANDARD_98)
+#if ((__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)))
 #include <type_traits>
 #endif
 
@@ -177,7 +177,7 @@ class VISP_EXPORT vpRGBa
   friend VISP_EXPORT vpRGBa operator*(const double &x, const vpRGBa &rgb);
 };
 
-#if (VISP_CXX_STANDARD > VISP_CXX_STANDARD_98)
+#if ((__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)))
 static_assert(std::is_trivially_assignable_v<vpRGBa, vpRGBa>);
 static_assert(std::is_trivially_copyable_v<vpRGBa>);
 #endif
diff --git a/modules/core/include/visp3/core/vpRGBf.h b/modules/core/include/visp3/core/vpRGBf.h
index 401ad92566..67a35372c5 100644
--- a/modules/core/include/visp3/core/vpRGBf.h
+++ b/modules/core/include/visp3/core/vpRGBf.h
@@ -43,7 +43,7 @@
 #include <visp3/core/vpConfig.h>
 #include <visp3/core/vpColVector.h>
 
-#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_17)
+#if ((__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)))
 #include <type_traits>
 #endif
 
@@ -149,7 +149,7 @@ class VISP_EXPORT vpRGBf
   friend VISP_EXPORT vpRGBf operator*(float x, const vpRGBf &rgb);
 };
 
-#if (VISP_CXX_STANDARD > VISP_CXX_STANDARD_98)
+#if ((__cplusplus >= 201703L) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)))
 static_assert(std::is_trivially_assignable_v<vpRGBf, vpRGBf>);
 static_assert(std::is_trivially_copyable_v<vpRGBf>);
 #endif
diff --git a/modules/tracker/rbt/include/visp3/rbt/vpRBProbabilistic3DDriftDetector.h b/modules/tracker/rbt/include/visp3/rbt/vpRBProbabilistic3DDriftDetector.h
index ab5acd3a81..53cd98e2b5 100644
--- a/modules/tracker/rbt/include/visp3/rbt/vpRBProbabilistic3DDriftDetector.h
+++ b/modules/tracker/rbt/include/visp3/rbt/vpRBProbabilistic3DDriftDetector.h
@@ -118,8 +118,6 @@ class VISP_EXPORT vpRBProbabilistic3DDriftDetector : public vpRBDriftDetector
         computeStddev();
       }
 
-
-
       /**
        * \brief Update the color distribution with a new sample c.
        *