diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_lcc.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_lcc.cpp
index 5f6692f4f83..8e492372e9c 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_lcc.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_lcc.cpp
@@ -48,7 +48,11 @@ int main(int argc, char* argv[])
 
   std::cout<<"Cycle 1 (pink): "; display_cycle_info(lcc, cycle1);
   std::cout<<"Cycle 2 (green): "; display_cycle_info(lcc, cycle2);
-  if (draw) { CGAL::draw(lcc, {cycle1, cycle2}); }
+  if (draw)
+  {
+    auto cycles={cycle1, cycle2};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_surface_mesh.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_surface_mesh.cpp
index a6ec92e76a7..5fb35c3c070 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_surface_mesh.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_surface_mesh.cpp
@@ -51,7 +51,11 @@ int main(int argc, char* argv[])
 
   std::cout<<"Cycle 1 (pink): "; display_cycle_info(sm, cycle1);
   std::cout<<"Cycle 2 (green): "; display_cycle_info(sm, cycle2);
-  if (draw) { CGAL::draw(sm, {cycle1, cycle2}); }
+  if (draw)
+  {
+    auto cycles={cycle1, cycle2};
+    CGAL::draw(sm, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/facewidth.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/facewidth.cpp
index 43f4b2d6a99..e35579bd8ee 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/facewidth.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/facewidth.cpp
@@ -35,7 +35,9 @@ int main(int argc, char* argv[])
   {
     std::cout<<"  Number of faces: "<<cycle.size()<<std::endl;
 
+#ifdef CGAL_USE_BASIC_VIEWER
     if (draw) { draw_facewidth(lcc, cycle); }
+#endif
   }
 
   return EXIT_SUCCESS;
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/open_path_homotopy.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/open_path_homotopy.cpp
index b8340e878a5..28e3c4b439b 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/open_path_homotopy.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/open_path_homotopy.cpp
@@ -63,7 +63,10 @@ int main(int argc, char* argv[])
            <<" base point homotopic with path p3 (orange)."<<std::endl;
 
   if (draw)
-  { CGAL::draw(sm, {p1, p2, p3}); }
+  {
+    auto cycles={p1, p2, p3};
+    CGAL::draw(sm, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_double_torus.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_double_torus.cpp
index f7118e7b187..38974891b36 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_double_torus.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_double_torus.cpp
@@ -57,7 +57,10 @@ int main(int argc, char** argv)
            <<" homotopic with path p3 (orange)."<<std::endl;
 
   if (draw)
-  { CGAL::draw(lcc, {p1, p2, p3}); }
+  {
+    auto cycles={p1, p2, p3};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_torus.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_torus.cpp
index 98e10e16548..0a2fd9dada8 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_torus.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_torus.cpp
@@ -48,7 +48,10 @@ int main(int argc, char** argv)
            <<" homotopic with path p2 (green)."<<std::endl;
 
   if (draw)
-  { CGAL::draw(lcc, {p1, p2}); }
+  {
+    auto cycles={p1, p2};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_with_sm_and_polyhedron.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_with_sm_and_polyhedron.cpp
index 02be9b57f17..30f70fc69c0 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_with_sm_and_polyhedron.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_homotopy_with_sm_and_polyhedron.cpp
@@ -37,7 +37,10 @@ void test(const FaceGraph& mesh, bool draw, const char* title)
   std::cout<<"Path p1 "<<(res2?"IS":"IS NOT")<<" homotopic with path p2."<<std::endl;
 
   if (draw)
-  { CGAL::draw(mesh, {p1, p2}, title); }
+  {
+    auto cycles={p1, p2};
+    CGAL::draw(mesh, cycles, title);
+  }
 }
 ///////////////////////////////////////////////////////////////////////////////
 int main(int argc, char** argv)
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp
index 4bbe27c670b..1b376d86b94 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus.cpp
@@ -107,7 +107,10 @@ int main(int argc, char** argv)
            <<" simple."<<std::endl;
 
   if (draw)
-  { CGAL::draw(lcc, {p1, p2, p3}); }
+  {
+    auto cycles={p1, p2, p3};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus_2.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus_2.cpp
index f5bfed7f529..939748dfa17 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus_2.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/path_simplicity_double_torus_2.cpp
@@ -74,7 +74,10 @@ int main(int argc, char** argv)
            <<" simple."<<std::endl;
 
   if (draw)
-  { CGAL::draw(lcc, {p}); }
+  {
+    auto cycles={p};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle.cpp
index 403d41cf682..e116ad336cc 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle.cpp
@@ -54,7 +54,11 @@ int main(int argc, char* argv[])
 
   std::cout<<"Cycle 1 (pink): "; display_cycle_info(lcc, cycle1);
   std::cout<<"Cycle 2 (green): "; display_cycle_info(lcc, cycle2);
-  if (draw) { CGAL::draw(lcc, {cycle1, cycle2}); }
+  if (draw)
+  {
+    auto cycles={cycle1, cycle2};
+    CGAL::draw(lcc, cycles);
+  }
 
   return EXIT_SUCCESS;
 }
diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_2.cpp b/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_2.cpp
index 43460c8ad25..ed6810799c4 100644
--- a/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_2.cpp
+++ b/Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_2.cpp
@@ -116,7 +116,11 @@ int main(int argc, char* argv[])
     std::cout<<"  Number of edges in cycle: "<<cycle.length()<<std::endl;
     std::cout<<"  Cycle length: "<<cycle_length<<std::endl;
     std::cout<<"  Root: "<<lcc.point(root)<<std::endl;
-    if (draw) { CGAL::draw(lcc, {cycle}); }
+    if (draw)
+    {
+      auto cycles={cycle};
+      CGAL::draw(lcc, cycles);
+    }
   }
 
   return EXIT_SUCCESS;