diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp
index 892c7afdbf..e6cc73930b 100644
--- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp
+++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-all.cpp
@@ -38,7 +38,6 @@
 
 // ViSP includes
 #include <visp3/core/vpConfig.h>
-#include <visp3/core/vpCannyEdgeDetection.h>
 #include <visp3/core/vpException.h>
 #include <visp3/core/vpMouseButton.h>
 #include <visp3/core/vpTime.h>
diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp
index 8920ebba45..e9fa415227 100644
--- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp
+++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-lms.cpp
@@ -33,7 +33,6 @@
 //! \example tutorial-pf-curve-fitting-lms.cpp
 
 #include <visp3/core/vpConfig.h>
-#include <visp3/core/vpCannyEdgeDetection.h>
 #include <visp3/core/vpException.h>
 #include <visp3/core/vpMouseButton.h>
 #include <visp3/core/vpTime.h>
diff --git a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp
index 0cd5e36329..1bc29b4cea 100644
--- a/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp
+++ b/tutorial/particle-filter-curve-fitting/tutorial-pf-curve-fitting-pf.cpp
@@ -33,7 +33,6 @@
 //! \example tutorial-pf-curve-fitting-pf.cpp
 
 #include <visp3/core/vpConfig.h>
-#include <visp3/core/vpCannyEdgeDetection.h>
 #include <visp3/core/vpException.h>
 #include <visp3/core/vpMouseButton.h>
 #include <visp3/core/vpTime.h>
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h b/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h
index dae7a131e4..a1f35a3d1a 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h
+++ b/tutorial/particle-filter-curve-fitting/vpTutoCommonData.h
@@ -41,6 +41,7 @@
 #include <visp3/gui/vpDisplayFactory.h>
 #include <visp3/io/vpVideoReader.h>
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -340,3 +341,4 @@ typedef struct vpTutoCommonData
 }
 #endif
 #endif
+#endif
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp
index 440ef676fc..164bbf72af 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp
+++ b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.cpp
@@ -32,6 +32,7 @@
 
 #include "vpTutoMeanSquareFitting.h"
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -104,3 +105,6 @@ double vpTutoMeanSquareFitting::model(const float &u)
 }
 }
 #endif
+#else
+void dummy_vpTutoMeanSquareFitting() { }
+#endif
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.h b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.h
index afbcbb51a1..a68bd7c5b7 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.h
+++ b/tutorial/particle-filter-curve-fitting/vpTutoMeanSquareFitting.h
@@ -41,6 +41,7 @@
 
 #include "vpTutoParabolaModel.h"
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -160,3 +161,4 @@ class vpTutoMeanSquareFitting
 }
 #endif
 #endif
+#endif
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoParabolaModel.h b/tutorial/particle-filter-curve-fitting/vpTutoParabolaModel.h
index 5889bcf2ad..a817911de5 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoParabolaModel.h
+++ b/tutorial/particle-filter-curve-fitting/vpTutoParabolaModel.h
@@ -37,6 +37,7 @@
 #include <visp3/core/vpColVector.h>
 #include <visp3/core/vpMatrix.h>
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -173,3 +174,4 @@ class vpTutoParabolaModel
 }
 #endif
 #endif
+#endif
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp
index bbf480addf..e869b7810b 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp
+++ b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.cpp
@@ -34,6 +34,7 @@
 
 #include <visp3/core/vpGaussRand.h>
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -148,3 +149,6 @@ std::vector< vpImagePoint > addSaltAndPepperNoise(const std::vector< vpImagePoin
 }
 }
 #endif
+#else
+void dummy_vpTutoSegmentation() { }
+#endif
diff --git a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.h b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.h
index 6626e99907..344d5c91dd 100644
--- a/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.h
+++ b/tutorial/particle-filter-curve-fitting/vpTutoSegmentation.h
@@ -41,6 +41,7 @@
 
 #include "vpTutoCommonData.h"
 
+#if (VISP_CXX_STANDARD >= VISP_CXX_STANDARD_11)
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 namespace tutorial
 {
@@ -70,3 +71,4 @@ std::vector< VISP_NAMESPACE_ADDRESSING vpImagePoint > addSaltAndPepperNoise(cons
 }
 #endif
 #endif
+#endif