diff --git a/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h b/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h
index 41abdec292e..9817e94a70c 100644
--- a/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h
+++ b/Surface_mesh_topology/include/CGAL/Face_graph_wrapper.h
@@ -454,7 +454,7 @@ public:
       return internal::Index_from_halfedge_descriptor<HEG>::
         run(mmap.get_fg(), *it);
     }
-    
+
   private:
     const Self & mmap;
     mutable typename Self::size_type msize;
@@ -493,12 +493,12 @@ public:
   Dart_handle dart_handle(size_type i)
   {
     CGAL_assertion(darts().is_used(i));
-    return internal::Halfedge_descriptor_from_index<HEG>::run(get_fg(), i); 
+    return internal::Halfedge_descriptor_from_index<HEG>::run(get_fg(), i);
   }
   Dart_const_handle dart_handle(size_type i) const
   {
     CGAL_assertion(darts().is_used(i));
-    return internal::Halfedge_descriptor_from_index<HEG>::run(get_fg(), i); 
+    return internal::Halfedge_descriptor_from_index<HEG>::run(get_fg(), i);
   }
 
   template <unsigned int i>
diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Functors_for_face_graph_wrapper.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Functors_for_face_graph_wrapper.h
index 1bcfc1197c7..b83e770f109 100644
--- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Functors_for_face_graph_wrapper.h
+++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Functors_for_face_graph_wrapper.h
@@ -29,7 +29,7 @@
 namespace CGAL {
 ////////////////////////////////////////////////////////////////////////////////
 template<typename P>
-class Surface_mesh;  
+class Surface_mesh;
 ////////////////////////////////////////////////////////////////////////////////
 namespace internal {
 ////////////////////////////////////////////////////////////////////////////////
@@ -94,7 +94,7 @@ struct Index_from_halfedge_descriptor<CGAL::Surface_mesh<P> >
 
   static size_type run(const Mesh& /*m*/, halfedge_descriptor h)
   { std::cout<<"V2"<<std::endl; return (size_type)(h); }
-};    
+};
 ////////////////////////////////////////////////////////////////////////////////
 template<typename Mesh>
 struct Halfedge_descriptor_from_index
@@ -102,7 +102,7 @@ struct Halfedge_descriptor_from_index
   typedef boost::uint32_t size_type;
   typedef typename boost::template graph_traits<Mesh>::halfedge_descriptor
   halfedge_descriptor;
-  
+
   static halfedge_descriptor run(const Mesh& m, size_type i)
   {
     for (typename boost::template graph_traits<Mesh>::halfedge_iterator
@@ -116,18 +116,18 @@ struct Halfedge_descriptor_from_index<CGAL::Surface_mesh<P> >
 {
   using Mesh=CGAL::Surface_mesh<P>;
   typedef boost::uint32_t size_type;
-  typedef typename boost::template graph_traits<Mesh>::halfedge_descriptor 
+  typedef typename boost::template graph_traits<Mesh>::halfedge_descriptor
   halfedge_descriptor;
 
   static halfedge_descriptor run(const Mesh& /*m*/, size_type i)
   { std::cout<<"V2"<<std::endl; return halfedge_descriptor(i); }
-};    
+};
 ////////////////////////////////////////////////////////////////////////////////
 template<typename Mesh>
 struct Is_index_used
 {
   typedef boost::uint32_t size_type;
-  
+
   static bool run(const Mesh& m, size_type i)
   { return i<m.size_of_halfedges(); }
 };
@@ -140,7 +140,7 @@ struct Is_index_used<CGAL::Surface_mesh<P> >
   static bool run(const Mesh& m, size_type i)
   { return i<(m.number_of_halfedges()+m.number_of_removed_halfedges()) &&
              !m.is_removed(typename Mesh::Halfedge_index(i)); }
-};    
+};
 ////////////////////////////////////////////////////////////////////////////////
 } // namespace internal
 } // namespace CGAL
diff --git a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Iterators_for_face_graph_wrapper.h b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Iterators_for_face_graph_wrapper.h
index 88beaa7f184..ead6702b2f1 100644
--- a/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Iterators_for_face_graph_wrapper.h
+++ b/Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Iterators_for_face_graph_wrapper.h
@@ -59,7 +59,7 @@ namespace internal {
       CGAL_assertion(&mmap==&(other.mmap));
       m_it=other.m_it;
     }
-    
+
     operator Dart_handle() const
     { return operator*(); }
 
@@ -93,7 +93,7 @@ namespace internal {
     Self operator--(int)
     { Self res=*this; operator --(); return res; }
 
-    
+
     Dart_handle operator*() const
     {
       CGAL_assertion(m_it!=halfedges(this->mmap.get_fg()).end());
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 2938f14ac89..5e2115d5d9c 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
@@ -269,7 +269,7 @@ protected:
       if (m_current_dart==lcc.darts().end())
       { m_current_dart=lcc.darts().begin(); }
       else
-      { ++m_current_dart; } 
+      { ++m_current_dart; }
       if (m_current_dart==lcc.darts().end())
       { displayMessage(QString("Draw all darts.")); }
       else
@@ -279,7 +279,7 @@ protected:
     }
     else if ((e->key()==::Qt::Key_D) && (modifiers==::Qt::ControlModifier))
     {
-      if (m_current_dart==lcc.darts().begin()) 
+      if (m_current_dart==lcc.darts().begin())
       { m_current_dart=lcc.darts().end(); }
       else
       { --m_current_dart; }
@@ -297,7 +297,7 @@ protected:
       compute_elements();
       redraw();
     }
-    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::NoButton))    
+    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::NoButton))
     {
       m_current_path=(m_current_path+1)%(m_paths->size()+2);
       if (m_current_path==m_paths->size())
@@ -311,7 +311,7 @@ protected:
       compute_elements();
       redraw();
     }
-    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::ControlModifier))    
+    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::ControlModifier))
     {
       m_current_path=(m_current_path==0?m_paths->size()+1:m_current_path-1);
       if (m_current_path==m_paths->size())
@@ -325,7 +325,7 @@ protected:
       compute_elements();
       redraw();
     }
-    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::ShiftModifier))    
+    else if ((e->key()==::Qt::Key_P) && (modifiers==::Qt::ShiftModifier))
     {
       m_current_path=m_paths->size();
       displayMessage(QString("Draw all paths."));