diff --git a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
index f74834d250b..b4538e58628 100644
--- a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
+++ b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h
@@ -78,7 +78,7 @@ void draw(const CGAL::Polygon_set_2<T, C>& aps2,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"t2_viewer","\0"};
+    const char* argv[1]={"t2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimplePolygonSet2ViewerQt<CGAL::Polygon_set_2<T, C> >
       mainwindow(app.activeWindow(), aps2, title);
diff --git a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
index 5e1a46e52c7..b6e0b779f3a 100644
--- a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
+++ b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
@@ -408,7 +408,7 @@ void draw(const CGAL_LCC_TYPE& alcc,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"lccviewer","\0"};
+    const char* argv[1]={"lccviewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimpleLCCViewerQt<CGAL_LCC_TYPE, DrawingFunctorLCC>
       mainwindow(app.activeWindow(), &alcc, title, nofill, drawing_functor);
diff --git a/Nef_3/include/CGAL/draw_nef_3.h b/Nef_3/include/CGAL/draw_nef_3.h
index 8a1f4a74931..321f817f3d8 100644
--- a/Nef_3/include/CGAL/draw_nef_3.h
+++ b/Nef_3/include/CGAL/draw_nef_3.h
@@ -256,7 +256,7 @@ void draw(const CGAL_NEF3_TYPE &anef,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc = 1;
-    const char *argv[2] = {"nef_polyhedron_viewer", "\0"};
+    const char *argv[1] = {"nef_polyhedron_viewer"};
     QApplication app(argc, const_cast<char **>(argv));
     DefaultColorFunctorNefPolyhedron fcolor;
     SimpleNefPolyhedronViewerQt<CGAL_NEF3_TYPE,
diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
index fe0a13cf13a..4520d379b13 100644
--- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
+++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h
@@ -263,7 +263,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"p2t2_viewer","\0"};
+    const char* argv[1]={"p2t2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     DefaultColorFunctorP2T2 fcolor;
     SimplePeriodic2Triangulation2ViewerQt<CGAL_P2T2_TYPE,
diff --git a/Point_set_3/include/CGAL/draw_point_set_3.h b/Point_set_3/include/CGAL/draw_point_set_3.h
index edecd4572fb..cea7222af41 100644
--- a/Point_set_3/include/CGAL/draw_point_set_3.h
+++ b/Point_set_3/include/CGAL/draw_point_set_3.h
@@ -104,7 +104,7 @@ void draw(const Point_set_3<P, V>& apointset,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"point_set_viewer","\0"};
+    const char* argv[1]={"point_set_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimplePointSetViewerQt<Point_set_3<P, V> > mainwindow(app.activeWindow(),
                                                           apointset,
diff --git a/Polygon/include/CGAL/draw_polygon_2.h b/Polygon/include/CGAL/draw_polygon_2.h
index 0e50e967fdb..1aa421184a4 100644
--- a/Polygon/include/CGAL/draw_polygon_2.h
+++ b/Polygon/include/CGAL/draw_polygon_2.h
@@ -125,7 +125,7 @@ void draw(const CGAL::Polygon_2<T, C>& ap2,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"t2_viewer","\0"};
+    const char* argv[1]={"t2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimplePolygon2ViewerQt<CGAL::Polygon_2<T, C> >
       mainwindow(app.activeWindow(), ap2, title);
diff --git a/Polygon/include/CGAL/draw_polygon_with_holes_2.h b/Polygon/include/CGAL/draw_polygon_with_holes_2.h
index fd2ab34a7e5..a38f5a3c2de 100644
--- a/Polygon/include/CGAL/draw_polygon_with_holes_2.h
+++ b/Polygon/include/CGAL/draw_polygon_with_holes_2.h
@@ -145,7 +145,7 @@ void draw(const CGAL::Polygon_with_holes_2<T, C>& ap2,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"t2_viewer","\0"};
+    const char* argv[1]={"t2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimplePolygonWithHoles2ViewerQt<CGAL::Polygon_with_holes_2<T, C> >
       mainwindow(app.activeWindow(), ap2, title);
diff --git a/Polyhedron/include/CGAL/draw_polyhedron.h b/Polyhedron/include/CGAL/draw_polyhedron.h
index 22f4aed5413..80ed7768039 100644
--- a/Polyhedron/include/CGAL/draw_polyhedron.h
+++ b/Polyhedron/include/CGAL/draw_polyhedron.h
@@ -47,7 +47,7 @@ void draw(const CGAL_POLY_TYPE& apoly,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"polyhedron_viewer","\0"};
+    const char* argv[1]={"polyhedron_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimpleFaceGraphViewerQt
       mainwindow(app.activeWindow(), apoly, title, nofill);
diff --git a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h
index 8bf2a8bf393..3837d363331 100644
--- a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h
+++ b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h
@@ -162,7 +162,7 @@ void draw(const CGAL_SS_TYPE& ass2,
   if (!cgal_test_suite)
   {
     int argc=1;
-    const char* argv[2]={"ss2_viewer","\0"};
+    const char* argv[1]={"ss2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     DefaultColorFunctorSS2 fcolor;
     SimpleStraightSkeleton2ViewerQt<CGAL_SS_TYPE, DefaultColorFunctorSS2>
diff --git a/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h b/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h
index 39a89eac77c..0f36d86962d 100644
--- a/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h
+++ b/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h
@@ -263,7 +263,7 @@ void draw_surface_mesh_with_small_faces(CGAL::Surface_mesh<K>& amesh)
   if (!cgal_test_suite)
   {
     int argc=1;
-    const char* argv[2]={"surface_mesh_viewer","\0"};
+    const char* argv[1]={"surface_mesh_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimpleSurfaceMeshWithSmallFacesViewerQt<CGAL::Surface_mesh<K>>
       mainwindow(app.activeWindow(), amesh);
diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h
index 6f34dfefc44..017e07d1fe2 100644
--- a/Surface_mesh/include/CGAL/draw_surface_mesh.h
+++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h
@@ -55,7 +55,7 @@ void draw(const Surface_mesh<K>& amesh,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"surface_mesh_viewer","\0"};
+    const char* argv[1]={"surface_mesh_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     SimpleFaceGraphViewerQt mainwindow(app.activeWindow(), amesh, title,
                                        nofill);
diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h
index 6a1e01e22fe..6b8ae90e6fa 100644
--- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h
+++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h
@@ -412,7 +412,7 @@ void draw(const Mesh& alcc,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"lccviewer","\0"};
+    const char* argv[1]={"lccviewer"};
     QApplication app(argc,const_cast<char**>(argv));
     Face_graph_with_path_viewer<Mesh, DrawingFunctor> mainwindow(app.activeWindow(),
                                                                  alcc, &paths, amark,
diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h
index 3561dbbc04a..65bad5ccafc 100644
--- a/Triangulation_2/include/CGAL/draw_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h
@@ -147,7 +147,7 @@ void draw(const CGAL_T2_TYPE& at2,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"t2_viewer","\0"};
+    const char* argv[1]={"t2_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     DefaultColorFunctorT2 fcolor;
     SimpleTriangulation2ViewerQt<CGAL_T2_TYPE, DefaultColorFunctorT2>
diff --git a/Triangulation_3/include/CGAL/draw_triangulation_3.h b/Triangulation_3/include/CGAL/draw_triangulation_3.h
index 3e5bbaec9f5..ac35b93af03 100644
--- a/Triangulation_3/include/CGAL/draw_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/draw_triangulation_3.h
@@ -153,7 +153,7 @@ void draw(const CGAL_T3_TYPE& at3,
   {
     CGAL::Qt::init_ogl_context(4,3);
     int argc=1;
-    const char* argv[2]={"t3_viewer","\0"};
+    const char* argv[1]={"t3_viewer"};
     QApplication app(argc,const_cast<char**>(argv));
     DefaultColorFunctorT3 fcolor;
     SimpleTriangulation3ViewerQt<CGAL_T3_TYPE, DefaultColorFunctorT3>
diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
index 3ccb450b14f..a7f0c7b0774 100644
--- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
+++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h
@@ -319,7 +319,7 @@ void draw(const CGAL_VORONOI_TYPE &av2,
   if (!cgal_test_suite) {
     CGAL::Qt::init_ogl_context(4,3);
     int argc = 1;
-    const char *argv[2] = {"voronoi_2_viewer", "\0"};
+    const char *argv[1] = {"voronoi_2_viewer"};
     QApplication app(argc, const_cast<char **>(argv));
     DefaultColorFunctorV2 fcolor;
     SimpleVoronoiDiagram2ViewerQt<CGAL_VORONOI_TYPE, DefaultColorFunctorV2>