diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_using_list_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_using_list_2.h
index f95ee7997ad..edafed645e8 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_using_list_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_data_structure_using_list_2.h
@@ -328,8 +328,9 @@ is_edge(const Vertex* va, const Vertex* vb, Face* &fr,  int & i) const
 // if true is returned (fr,i) is the edge ab
 // with face fr on the right of a->b
 {
-  Face* fc=va->face(), *start(fc);
-  if (fc == NULL) return false;
+  Face* fc=va->face(); 
+  Face* start(fc);
+  if (fc == 0) return false;
   int inda, indb;
   do {
     inda=fc->index(va);
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h
index a136a6fa55d..9243c5efbce 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_default_data_structure_2.h
@@ -321,7 +321,8 @@ is_edge(const Vertex* va, const Vertex* vb, Face* &fr,  int & i) const
 // (fr,i) is the edge ab
   // with face fr on the right of a->b
 {
-  Face* fc=va->face(), *start(fc);
+  Face* fc=va->face();
+  Face* start(fc);
   if (fc == NULL) return false;
   int inda, indb;
   do {
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h
index ba697ff23db..3d39ebc5c6d 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_face_2.h
@@ -109,7 +109,7 @@ Triangulation_ds_vertex_2<Vb,Fb> *
 Triangulation_ds_face_2<Vb,Fb>::
 vertex(int i) const
 {
-  return( (Vertex*) (Fb::vertex(i)));
+  return( static_cast<Vertex*>(Fb::vertex(i)) );
 } 
 
 template < class Vb, class Fb >
@@ -162,7 +162,7 @@ Triangulation_ds_face_2<Vb,Fb>*
 Triangulation_ds_face_2<Vb,Fb>::  
 neighbor(int i) const
 {
-  return ((Face*) Fb::neighbor(i));
+  return (static_cast<Face*>(Fb::neighbor(i)) );
 }
     
 template < class Vb, class Fb >
diff --git a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h
index af5085cb693..2c74b85190b 100644
--- a/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Triangulation_ds_vertex_2.h
@@ -55,7 +55,7 @@ public:
   void set_face(Face* f)  { Vb::set_face(f);  }
 
   //ACCESS
-  Face* face() const {return ( (Face *) (Vb::face()) );}
+  Face* face() const {return ( static_cast<Face *>(Vb::face()) );}
   int degree() const ;
 
   inline Vertex_circulator incident_vertices() const    {