diff --git a/BGL/include/CGAL/boost/graph/Dual.h b/BGL/include/CGAL/boost/graph/Dual.h
index 1f240d1fead..bf90734a024 100644
--- a/BGL/include/CGAL/boost/graph/Dual.h
+++ b/BGL/include/CGAL/boost/graph/Dual.h
@@ -91,7 +91,7 @@ public:
   typedef typename GTP::halfedge_descriptor halfedge_descriptor;
   typedef typename GTP::edge_descriptor     edge_descriptor;
   typedef typename GTP::directed_category   directed_category;
-  typedef boost::allow_parallel_edge_tag    edge_parallel_category; 
+  typedef boost::allow_parallel_edge_tag    edge_parallel_category;
   typedef typename GTP::traversal_category  traversal_category;
 
   typedef typename GTP::faces_size_type          vertices_size_type;
@@ -112,11 +112,11 @@ public:
   static face_descriptor     null_face()     { return face_descriptor(); }
   static halfedge_descriptor null_halfedge() { return halfedge_descriptor(); }
 };
- 
+
 template<typename P>
-struct graph_traits< const CGAL::Dual<P> >  
+struct graph_traits< const CGAL::Dual<P> >
   : public graph_traits< CGAL::Dual<P> >
-{}; 
+{};
 
 namespace internal{
 
@@ -262,7 +262,7 @@ num_halfedges(const CGAL::Dual<P>& dual)
 {
   return num_halfedges(dual.primal());
 }
-     
+
 template <typename P>
 typename boost::graph_traits<CGAL::Dual<P> >::faces_size_type
 num_faces(const CGAL::Dual<P>& dual)
@@ -274,34 +274,34 @@ template <typename P>
 Iterator_range<typename boost::graph_traits<Dual<P> >::vertex_iterator>
 vertices(const CGAL::Dual<P>& dual)
 {
-  return faces(dual.primal()); 
+  return faces(dual.primal());
 }
 
 template <typename P>
 Iterator_range<typename boost::graph_traits<Dual<P> >::face_iterator>
 faces(const CGAL::Dual<P>& dual)
 {
-  return vertices(dual.primal()); 
+  return vertices(dual.primal());
 }
-    
+
 template <typename P>
 Iterator_range<typename boost::graph_traits<Dual<P> >::halfedge_iterator>
 halfedges(const CGAL::Dual<P>& dual)
 {
-  return halfedges(dual.primal()); 
+  return halfedges(dual.primal());
 }
-  
+
 template <typename P>
 Iterator_range<typename boost::graph_traits<Dual<P> >::edge_iterator>
 edges(const CGAL::Dual<P>& dual)
 {
-  return edges(dual.primal()); 
+  return edges(dual.primal());
 }
 
 template <typename P>
 std::pair<typename boost::graph_traits<Dual<P> >::edge_descriptor, bool>
-edge(typename boost::graph_traits<Dual<P> >::vertex_descriptor u, 
-     typename boost::graph_traits<Dual<P> >::vertex_descriptor v, 
+edge(typename boost::graph_traits<Dual<P> >::vertex_descriptor u,
+     typename boost::graph_traits<Dual<P> >::vertex_descriptor v,
      const Dual<P>& dual)
 {
   typename boost::graph_traits<Dual<P> >::out_edge_iterator e, e_end;
@@ -309,7 +309,7 @@ edge(typename boost::graph_traits<Dual<P> >::vertex_descriptor u,
     if(target(*e, dual) == v)
       return std::make_pair(*e, true);
   }
-  
+
   return std::make_pair(typename boost::graph_traits<Dual<P> >::edge_descriptor(), false);
 }
 
@@ -329,7 +329,7 @@ source(typename boost::graph_traits<Dual<P> >::halfedge_descriptor h,
   const typename Dual<P>::Primal& primal = dual.primal();
   return face(h,primal);
 }
- 
+
 template <typename P>
 typename boost::graph_traits<Dual<P> >::vertex_descriptor
 target(typename boost::graph_traits<Dual<P> >::halfedge_descriptor h,
@@ -338,7 +338,7 @@ target(typename boost::graph_traits<Dual<P> >::halfedge_descriptor h,
   const typename Dual<P>::Primal& primal = dual.primal();
   return face(opposite(h,primal),primal);
 }
- 
+
 
 template <typename P>
 typename boost::graph_traits<Dual<P> >::vertex_descriptor
@@ -348,7 +348,7 @@ source(typename boost::graph_traits<Dual<P> >::edge_descriptor h,
   const typename Dual<P>::Primal& primal = dual.primal();
   return face(halfedge(h,primal),primal);
 }
- 
+
 template <typename P>
 typename boost::graph_traits<Dual<P> >::vertex_descriptor
 target(typename boost::graph_traits<Dual<P> >::edge_descriptor h,
@@ -394,7 +394,7 @@ halfedge(typename boost::graph_traits<Dual<P> >::vertex_descriptor u,
     if(target(*e, dual) == v)
       return std::make_pair(halfedge(*e, dual), true);
   }
-  
+
   return std::make_pair(boost::graph_traits<Dual<P> >::null_halfedge(), false);
 }
 
@@ -422,7 +422,7 @@ next(typename boost::graph_traits<Dual<P> >::halfedge_descriptor h,
 {
   const typename Dual<P>::Primal& primal = dual.primal();
   return prev(opposite(h,primal),primal);
-}  
+}
 
 template <typename P>
 typename boost::graph_traits<Dual<P> >::halfedge_descriptor
@@ -431,7 +431,7 @@ prev(typename boost::graph_traits<Dual<P> >::halfedge_descriptor h,
 {
   const typename Dual<P>::Primal& primal = dual.primal();
   return opposite(next(h,primal),primal);
-}  
+}
 
 template <typename P>
 Iterator_range<typename boost::graph_traits<Dual<P> >::out_edge_iterator>
@@ -450,7 +450,7 @@ in_edges(typename boost::graph_traits<Dual<P> >::vertex_descriptor v,
   const typename Dual<P>::Primal& primal = dual.primal();
   return opposite_edges_around_face(halfedge(v,primal),primal);
 }
-       
+
 template <typename P>
 typename boost::graph_traits<Dual<P> >::degree_size_type
 out_degree(typename boost::graph_traits<Dual<P> >::vertex_descriptor v,
@@ -467,8 +467,8 @@ in_degree(typename boost::graph_traits<Dual<P> >::vertex_descriptor v,
 {
   return out_degree(v,dual);
 }
-         
-        
+
+
 } // namespace CGAL
 
 #include <CGAL/enable_warnings.h>
diff --git a/BGL/test/BGL/graph_concept_Dual.cpp b/BGL/test/BGL/graph_concept_Dual.cpp
index cbf02488e33..cc88b547231 100644
--- a/BGL/test/BGL/graph_concept_Dual.cpp
+++ b/BGL/test/BGL/graph_concept_Dual.cpp
@@ -8,7 +8,7 @@
 typedef CGAL::Simple_cartesian<double> Kernel;
 typedef CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_with_id_3> Polyhedron;
 
-template<typename Primal> 
+template<typename Primal>
 void concept_check_dual() {
   typedef CGAL::Dual<Primal>          Graph;
   typedef boost::graph_traits<Graph>  Traits;
diff --git a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h
index d6e9574fd87..ecafa701d1d 100644
--- a/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h
+++ b/HalfedgeDS/include/CGAL/boost/graph/graph_traits_HalfedgeDS_default.h
@@ -21,14 +21,14 @@
 
 namespace CGAL {
 
-template <class Traits_, class HalfedgeDSItems, 
+template <class Traits_, class HalfedgeDSItems,
           class Alloc>
 class HalfedgeDS_default;
 } // namespace CGAL
 
 namespace boost {
 
-  
+
 
 template<class T, class I, class A>
 struct graph_traits< CGAL::HalfedgeDS_default<T,I,A> >
@@ -45,7 +45,7 @@ struct graph_traits< CGAL::HalfedgeDS_default<T,I,A> const >
 } // namespace boost
 
 namespace CGAL {
-  
+
 template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> const>::vertices_size_type
 num_vertices(const HalfedgeDS_default<T,I,A>& p)
@@ -174,7 +174,7 @@ out_edges( typename boost::graph_traits< HalfedgeDS_default<T,I,A> const>::verte
 
 //
 // MutableHalfedgeGraph
-// 
+//
 
 template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::vertex_descriptor
@@ -203,9 +203,9 @@ remove_vertex(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::vertex_
 template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor
 add_edge(HalfedgeDS_default<T,I,A>& g)
-{ 
+{
   return typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor(
-    g.edges_push_back(typename HalfedgeDS_default<T,I,A>::Halfedge(), 
+    g.edges_push_back(typename HalfedgeDS_default<T,I,A>::Halfedge(),
                             typename HalfedgeDS_default<T,I,A>::Halfedge()));
 }
 
@@ -245,7 +245,7 @@ set_next(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_des
 }
 
 //
-// MutableFaceGraph 
+// MutableFaceGraph
 //
 
 template<class T, class I, class A>
@@ -265,7 +265,7 @@ add_face(InputIterator begin, InputIterator end, HalfedgeDS_default<T,I,A>& g)
 template<class T, class I, class A>
 void
 remove_face(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::face_descriptor f
-            , HalfedgeDS_default<T,I,A>& g) 
+            , HalfedgeDS_default<T,I,A>& g)
 {
   g.faces_erase(f);
 }
@@ -314,7 +314,7 @@ template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor
 edge(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descriptor h
      , const HalfedgeDS_default<T,I,A>&)
-{ 
+{
   return typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor(h);
 }
 
@@ -322,7 +322,7 @@ template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descriptor
 halfedge(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor e
          , const HalfedgeDS_default<T,I,A>&)
-{ 
+{
   return e.halfedge();
 }
 
@@ -330,7 +330,7 @@ template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descriptor
 halfedge(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::vertex_descriptor v
          , const HalfedgeDS_default<T,I,A>&)
-{ 
+{
   return v->halfedge();
 }
 
@@ -340,7 +340,7 @@ std::pair< typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_d
 halfedge(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::vertex_descriptor u
          , typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::vertex_descriptor v
          , const HalfedgeDS_default<T,I,A>& g)
-{ 
+{
   std::pair< typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::edge_descriptor
              , bool> e = edge(u, v, g);
   return std::make_pair(e.first.halfedge(), e.second);
@@ -411,7 +411,7 @@ num_halfedges(const HalfedgeDS_default<T,I,A>& p)
 template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::face_descriptor
 face(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descriptor h
-     , const HalfedgeDS_default<T,I,A>&) 
+     , const HalfedgeDS_default<T,I,A>&)
 {
   return h->face();
 }
@@ -419,7 +419,7 @@ face(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descrip
 template<class T, class I, class A>
 typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::halfedge_descriptor
 halfedge(typename boost::graph_traits< HalfedgeDS_default<T,I,A> >::face_descriptor f
-         , const HalfedgeDS_default<T,I,A>&) 
+         , const HalfedgeDS_default<T,I,A>&)
 {
   return f->halfedge();
 }
@@ -442,7 +442,7 @@ num_faces(const HalfedgeDS_default<T,I,A>& p)
 
 template <class T>
 struct HDS_property_map;
-  
+
 template <>
 struct HDS_property_map<vertex_point_t>
 {
diff --git a/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h b/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h
index 6f24f6f6d7a..279334c6e69 100644
--- a/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h
+++ b/Linear_cell_complex/include/CGAL/boost/graph/properties_Linear_cell_complex_for_combinatorial_map.h
@@ -236,7 +236,7 @@ get(boost::halfedge_external_index_t, CGAL_LCC_TYPE const&)
 {
   CGAL_LCC_TYPE& ncmap=const_cast<CGAL_LCC_TYPE&>(cmap);
   return typename boost::property_map<CGAL_LCC_TYPE, boost::halfedge_external_index_t>::
-    const_type(halfedges(ncmap).begin(), halfedges(ncmap).end(), num_halfedges(ncmap)); 
+    const_type(halfedges(ncmap).begin(), halfedges(ncmap).end(), num_halfedges(ncmap));
 }
 
 template<CGAL_LCC_ARGS>
@@ -245,7 +245,7 @@ get(boost::vertex_external_index_t, CGAL_LCC_TYPE const&)
 {
  CGAL_LCC_TYPE& ncmap=const_cast<CGAL_LCC_TYPE&>(cmap);
   return typename boost::property_map<CGAL_LCC_TYPE, boost::vertex_external_index_t>::
-    const_type(vertices(ncmap).begin(), vertices(ncmap).end(), num_vertices(ncmap)); 
+    const_type(vertices(ncmap).begin(), vertices(ncmap).end(), num_vertices(ncmap));
 }
 
 template<CGAL_LCC_ARGS>