diff --git a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
index 18f76232f41..bccdc935a1e 100644
--- a/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
+++ b/GraphicsView/include/CGAL/Qt/Basic_viewer_qt.h
@@ -1039,43 +1039,16 @@ private:
   QOpenGLShaderProgram rendering_program_p_l;
 };
 
-} // End namespace CGAL
-
 #else // CGAL_USE_BASIC_VIEWER
 
-namespace CGAL 
-{
-
-template<class T, class ColorFunctor>
-void draw(const T&, const char*, bool, const ColorFunctor&)
-{
-  std::cerr<<"Impossible to draw because CGAL_USE_BASIC_VIEWER is not defined."
-           <<std::endl;
-}
-  
-template<class T>
-void draw(const T&, const char*, bool)
-{
-  std::cerr<<"Impossible to draw because CGAL_USE_BASIC_VIEWER is not defined."
-           <<std::endl;
-}
-  
-template<class T>
-void draw(const T&, const char*)
-{
-  std::cerr<<"Impossible to draw because CGAL_USE_BASIC_VIEWER is not defined."
-           <<std::endl;
-}
-  
-template<class T>
-void draw(const T&)
-{
-  std::cerr<<"Impossible to draw because CGAL_USE_BASIC_VIEWER is not defined."
-           <<std::endl;
-}
-
-} // End namespace CGAL
+  template<class T>
+  void draw(const T& t, const char* ="", bool=false)
+  { 
+    std::cerr<<"Impossible to draw, CGAL_USE_BASIC_VIEWER is not defined."<<std::endl;
+  }
 
 #endif // CGAL_USE_BASIC_VIEWER
 
+} // End namespace CGAL
+
 #endif // CGAL_BASIC_VIEWER_QT_H
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 e792b745282..bb00e58a5e4 100644
--- a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
+++ b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h
@@ -25,6 +25,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Linear_cell_complex_base.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -198,48 +199,43 @@ protected:
   const ColorFunctor& m_fcolor;
 };
   
-template<class LCC, class ColorFunctor>
-void draw(const LCC& alcc,
-          const char* title,
-          bool nofill,
-          const ColorFunctor& fcolor)
+// Specialization of draw function.
+#define CGAL_LCC_TYPE CGAL::Linear_cell_complex_base                    \
+  <d_, ambient_dim, Traits_, Items_, Alloc_, Map, Refs, Storage_>
+
+template < unsigned int d_, unsigned int ambient_dim,
+           class Traits_,
+           class Items_,
+           class Alloc_,
+           template<unsigned int,class,class,class,class>
+           class Map,
+           class Refs,
+           class Storage_>
+void draw(const CGAL_LCC_TYPE& alcc,
+          const char* title="LCC for CMap Basic Viewer",
+          bool nofill=false)
 {
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"lccviewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimpleLCCViewerQt<LCC, ColorFunctor> mainwindow(app.activeWindow(),
-                                                    alcc,
-                                                    title,
-                                                    nofill,
-                                                    fcolor);
+    DefaultColorFunctorLCC fcolor;
+    SimpleLCCViewerQt<CGAL_LCC_TYPE, DefaultColorFunctorLCC>
+      mainwindow(app.activeWindow(), alcc, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class LCC>
-void draw(const LCC& alcc, const char* title, bool nofill)
-{
-  DefaultColorFunctorLCC c;
-  draw(alcc, title, nofill, c);
-}
-  
-template<class LCC>
-void draw(const LCC& alcc, const char* title)
-{ draw(alcc, title, false); }
-  
-template<class LCC>
-void draw(const LCC& alcc)
-{ draw(alcc, "Basic LCC Viewer"); }
-  
+#undef CGAL_LCC_TYPE
+
 } // End namespace CGAL
 
 #endif // CGAL_USE_BASIC_VIEWER
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 9511ee04c78..d6af8f862f2 100644
--- a/Point_set_3/include/CGAL/draw_point_set_3.h
+++ b/Point_set_3/include/CGAL/draw_point_set_3.h
@@ -26,6 +26,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Point_set_3.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -76,33 +77,31 @@ protected:
 protected:
   const PointSet& pointset;
 };
-  
-template<class PointSet>
-void draw(const PointSet& apointset, const char* title)
+
+// Specialization of draw function.  
+template<class P, class V>
+void draw(const Point_set_3<P, V>& apointset,
+          const char* title="Point_set_3 Basic Viewer")
 {
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"point_set_viewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimplePointSetViewerQt<PointSet> mainwindow(app.activeWindow(), 
-                                                apointset,
-                                                title);
+    SimplePointSetViewerQt<Point_set_3<P, V> > mainwindow(app.activeWindow(), 
+                                                          apointset,
+                                                          title);
     mainwindow.show();
     app.exec();
   }
 }
   
-template<class PointSet>
-void draw(const PointSet& apointset)
-{ draw(apointset, "Basic Point_set Viewer"); }
-
 } // End namespace CGAL
 
 #endif // CGAL_USE_BASIC_VIEWER
diff --git a/Polyhedron/include/CGAL/draw_polyhedron.h b/Polyhedron/include/CGAL/draw_polyhedron.h
index b8464757097..7a1781ced0c 100644
--- a/Polyhedron/include/CGAL/draw_polyhedron.h
+++ b/Polyhedron/include/CGAL/draw_polyhedron.h
@@ -26,6 +26,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Polyhedron_3.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -193,45 +194,40 @@ protected:
   bool m_nofaces;
   const ColorFunctor& m_fcolor;
 };
-  
-template<class Polyhedron, class ColorFunctor>
-void draw(const Polyhedron& apoly,
-          const char* title,
-          bool nofill,
-          const ColorFunctor& fcolor)
-{  
+
+// Specialization of draw function.
+#define CGAL_POLY_TYPE CGAL::Polyhedron_3 \
+  <PolyhedronTraits_3, PolyhedronItems_3, T_HDS, Alloc>
+
+template<class PolyhedronTraits_3,
+         class PolyhedronItems_3,
+         template < class T, class I, class A>
+         class T_HDS,
+         class Alloc>
+void draw(const CGAL_POLY_TYPE& apoly,
+          const char* title="Polyhedron Basic Viewer",
+          bool nofill=false)
+{
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"polyhedron_viewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimplePolyhedronViewerQt<Polyhedron, ColorFunctor>
+    DefaultColorFunctorPolyhedron fcolor;
+    SimplePolyhedronViewerQt<CGAL_POLY_TYPE, DefaultColorFunctorPolyhedron>
       mainwindow(app.activeWindow(), apoly, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class Polyhedron>
-void draw(const Polyhedron& apoly, const char* title, bool nofill)
-{
-  DefaultColorFunctorPolyhedron c;
-  draw(apoly, title, nofill, c);
-}
-
-template<class Polyhedron>
-void draw(const Polyhedron& apoly, const char* title)
-{ draw(apoly, title, false); }
-
-template<class Polyhedron>
-void draw(const Polyhedron& apoly)
-{ draw(apoly, "Basic Polyhedron Viewer"); }
+#undef CGAL_POLY_TYPE
 
 } // End namespace CGAL
 
diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h
index 3e5f602d94c..1710a19c814 100644
--- a/Surface_mesh/include/CGAL/draw_surface_mesh.h
+++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h
@@ -41,6 +41,7 @@ void draw(const SM& asm);
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Surface_mesh.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -201,48 +202,31 @@ protected:
   const ColorFunctor& m_fcolor;
 };
 
-template<class SM, class ColorFunctor>
-void draw(const SM& amesh,
-          const char* title,
-          bool nofill,
-          const ColorFunctor& fcolor)
+// Specialization of draw function.
+template<class K>
+void draw(const Surface_mesh<K>& amesh,
+          const char* title="Surface_mesh Basic Viewer",
+          bool nofill=false)
 {
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"surface_mesh_viewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimpleSurfaceMeshViewerQt<SM, ColorFunctor> mainwindow(app.activeWindow(),
-                                                           amesh,
-                                                           title,
-                                                           nofill,
-                                                           fcolor);
+    DefaultColorFunctorSM fcolor;
+    SimpleSurfaceMeshViewerQt<Surface_mesh<K>, DefaultColorFunctorSM>
+      mainwindow(app.activeWindow(), amesh, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class SM>
-void draw(const SM& amesh, const char* title, bool nofill)
-{
-  DefaultColorFunctorSM c;
-  draw(amesh, title, nofill, c);
-}
-
-template<class SM>
-void draw(const SM& amesh, const char* title)
-{ draw(amesh, title, false); }
-
-template<class SM>
-void draw(const SM& amesh)
-{ draw(amesh, "Basic Surface_mesh Viewer"); }
-
 } // End namespace CGAL
 
 #endif // CGAL_USE_BASIC_VIEWER
diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h
index a1cfc460fdb..bc0e6a2a42f 100644
--- a/Triangulation_2/include/CGAL/draw_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h
@@ -26,6 +26,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Triangulation_2.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -135,48 +136,35 @@ protected:
   bool m_nofaces;
   const ColorFunctor& m_fcolor;
 };
+
+// Specialization of draw function.
+#define CGAL_T2_TYPE CGAL::Triangulation_2<Gt, Tds>
   
-template<class T2, class ColorFunctor>
-void draw(const T2& at2,
-          const char* title,
-          bool nofill,
-          const ColorFunctor& fcolor)
+template<class Gt, class Tds>
+void draw(const CGAL_T2_TYPE& at2,
+          const char* title="Triangulation_2 Basic Viewer",
+          bool nofill=false)
 {
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"t2_viewer","\0"};
-    QApplication app(argc,const_cast<char**>(argv)); 
-    SimpleTriangulation2ViewerQt<T2, ColorFunctor> mainwindow(app.activeWindow(),
-                                                              at2,
-                                                              title,
-                                                              nofill,
-                                                              fcolor);
+    QApplication app(argc,const_cast<char**>(argv));
+    DefaultColorFunctorT2 fcolor;
+    SimpleTriangulation2ViewerQt<CGAL_T2_TYPE, DefaultColorFunctorT2>
+      mainwindow(app.activeWindow(), at2, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class T2>
-void draw(const T2& at2, const char* title, bool nofill)
-{
-  DefaultColorFunctorT2 c;
-  draw(at2, title, nofill, c);
-}
-
-template<class T2>
-void draw(const T2& at2, const char* title)
-{ draw(at2, title, false); }
-
-template<class T2>
-void draw(const T2& at2)
-{ draw(at2, "Basic T2 Viewer"); }
+#undef CGAL_T2_TYPE
 
 } // End namespace CGAL
 
diff --git a/Triangulation_3/include/CGAL/draw_triangulation_3.h b/Triangulation_3/include/CGAL/draw_triangulation_3.h
index 709bd15924f..4294339f2d0 100644
--- a/Triangulation_3/include/CGAL/draw_triangulation_3.h
+++ b/Triangulation_3/include/CGAL/draw_triangulation_3.h
@@ -26,6 +26,7 @@
 
 #ifdef CGAL_USE_BASIC_VIEWER
 
+#include <CGAL/Triangulation_3.h>
 #include <CGAL/Random.h>
 
 namespace CGAL
@@ -141,49 +142,35 @@ protected:
   bool m_nofaces;
   const ColorFunctor& m_fcolor;
 };
-  
-template<class T3, class ColorFunctor>
-void draw(const T3& at3,
-          const char* title,
-          bool nofill,
-          const ColorFunctor& fcolor)
-{
 
+// Specialization of draw function.
+#define CGAL_T3_TYPE CGAL::Triangulation_3<Gt, Tds, Lock_data_structure>
+
+template<class Gt, class Tds, class Lock_data_structure>
+void draw(const CGAL_T3_TYPE& at3,
+          const char* title="T3 Basic Viewer",
+          bool nofill=false)
+{
 #if defined(CGAL_TEST_SUITE)
   bool cgal_test_suite=true;
 #else
   bool cgal_test_suite=false;
 #endif
-
+  
   if (!cgal_test_suite)
   {
     int argc=1;
     const char* argv[2]={"t3_viewer","\0"};
     QApplication app(argc,const_cast<char**>(argv));
-    SimpleTriangulation3ViewerQt<T3, ColorFunctor> mainwindow(app.activeWindow(),
-                                                              at3,
-                                                              title,
-                                                              nofill,
-                                                              fcolor);
+    DefaultColorFunctorT3 fcolor;
+    SimpleTriangulation3ViewerQt<CGAL_T3_TYPE, DefaultColorFunctorT3>
+      mainwindow(app.activeWindow(), at3, title, nofill, fcolor);
     mainwindow.show();
     app.exec();
   }
 }
 
-template<class T3>
-void draw(const T3& at3, const char* title, bool nofill)
-{
-  DefaultColorFunctorT3 c;
-  draw(at3, title, nofill, c);
-}
-
-template<class T3>
-void draw(const T3& at3, const char* title)
-{ draw(at3, title, false); }
-
-template<class T3>
-void draw(const T3& at3)
-{ draw(at3, "Basic T3 Viewer"); }
+#undef CGAL_T3_TYPE
 
 } // End namespace CGAL