diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
index 3648714c35f..98fffb396bc 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/Polyline_simplification_2.cpp
@@ -36,6 +36,8 @@ void error_handler ( char const* what, char const* expr, char const* file, int l
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Polyline_constrained_triangulation_2.h>
 #include <CGAL/Polyline_simplification_2/simplify.h>
+#include <CGAL/Polyline_simplification_2/Squared_distance_cost.h>
+#include <CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h>
 
 // Qt headers
 #include <QtGui>
diff --git a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
index 7d05b75cb78..de2e4901daa 100644
--- a/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
+++ b/Polyline_simplification_2/demo/Polyline_simplification_2/include/CGAL/Qt/Polyline_simplification_2_graphics_item.h
@@ -198,8 +198,8 @@ PolylineSimplificationGraphicsItem<PCT>::paintVertices(QPainter *painter)
       for(Vertices_in_constraint_iterator it = this->t->vertices_in_constraint_begin(*cit);
         it != this->t->vertices_in_constraint_end(*cit);
         it++){
-        QPointF point = matrix.map(convert(it->point));  
-        if ( it->fixed )       
+        QPointF point = matrix.map(convert((*it)->point()));  
+        if ( (*it)->fixed )       
           painter->setPen(this->fixedVerticesPen());
         else 
           painter->setPen(this->verticesPen());
diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h
index 6a25321b57b..7f9e7de924e 100644
--- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h
+++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Hybrid_squared_distance_cost.h
@@ -63,9 +63,9 @@ public:
     Compute_squared_distance compute_squared_distance = pct.geom_traits().compute_squared_distance_2_object() ;
     Construct_segment        construct_segment        = pct.geom_traits().construct_segment_2_object() ;
 
-    Point const& lP = p->point;
-    Point const& lQ = q->point;
-    Point const& lR = r->point;
+    Point const& lP = (*p)->point();
+    Point const& lQ = (*q)->point();
+    Point const& lR = (*r)->point();
 
     Segment lP_R = construct_segment(lP, lR) ;
 
@@ -73,14 +73,14 @@ public:
     ++p;
 
     for ( ;p != r; ++p )
-      d1 = (std::max)(d1, compute_squared_distance( lP_R, p->point ) ) ;
+      d1 = (std::max)(d1, compute_squared_distance( lP_R, (*p)->point() ) ) ;
 
     FT d2 = (std::numeric_limits<double>::max)() ;
 
-    Vertex_circulator vc = q->vertex->incident_vertices(), done(vc);
+    Vertex_circulator vc = (*q)->incident_vertices(), done(vc);
     do {
-      if((vc != pct.infinite_vertex()) && (vc != p->vertex) && (vc != r->vertex)){
-        d2 = (std::min)(d2, compute_squared_distance(vc->point(), q->point));
+      if((vc != pct.infinite_vertex()) && (vc != *p) && (vc != *r)){
+        d2 = (std::min)(d2, compute_squared_distance(vc->point(), (*q)->point()));
       }
       ++vc;
     }while(vc != done);
diff --git a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h
index f38bb4910f2..9e2f72c93eb 100644
--- a/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h
+++ b/Polyline_simplification_2/include/CGAL/Polyline_simplification_2/Scaled_squared_distance_cost.h
@@ -60,8 +60,8 @@ public:
     Compute_squared_distance compute_squared_distance = pct.geom_traits().compute_squared_distance_2_object() ;
     Construct_segment        construct_segment        = pct.geom_traits().construct_segment_2_object() ;
     
-    Point const& lP = p->point;
-    Point const& lR = r->point;
+    Point const& lP = (*p)->point();
+    Point const& lR = (*r)->point();
      
     Segment lP_R = construct_segment(lP, lR) ;
 
@@ -69,14 +69,14 @@ public:
     ++p;
 
     for ( ;p != r; ++p )
-      d1 = (std::max)(d1, compute_squared_distance( lP_R, p->point ) ) ;
+      d1 = (std::max)(d1, compute_squared_distance( lP_R, (*p)->point() ) ) ;
 
     double d2 = (std::numeric_limits<double>::max)() ;
 
-    Vertex_circulator vc = q->vertex->incident_vertices(), done(vc);
+    Vertex_circulator vc = (*q)->incident_vertices(), done(vc);
     do {
-      if((vc != pct.infinite_vertex()) && (vc != p->vertex) && (vc != r->vertex)){
-        d2 = (std::min)(d2, compute_squared_distance(vc->point(), q->point));
+      if((vc != pct.infinite_vertex()) && (vc != *p) && (vc != *r)){
+        d2 = (std::min)(d2, compute_squared_distance(vc->point(), (*q)->point()));
       }
       ++vc;
     }while(vc != done);