diff --git a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
index 89bbbfb18a5..d8174aa5177 100644
--- a/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
@@ -66,11 +66,11 @@ public:
   typedef Constraint_hierarchy_2<Vertex_handle, bool> Constraint_hierarchy;
 
   // for user interface with the constraint hierarchy
-  typedef Constraint_hierarchy::H_vertex_it         Vertices_in_constraint;
-  typedef Constraint_hierarchy::H_context           Context;
-  typedef Constraint_hierarchy::H_context_iterator  Context_iterator;
-  typedef Constraint_hierarchy::H_c_iterator        Constraint_iterator;
-  typedef Constraint_hierarchy::H_sc_iterator       Subconstraint_iterator;
+  typedef typename Constraint_hierarchy::H_vertex_it    Vertices_in_constraint;
+  typedef typename Constraint_hierarchy::H_context      Context;
+  typedef typename Constraint_hierarchy::H_context_iterator  Context_iterator;
+  typedef typename Constraint_hierarchy::H_c_iterator   Constraint_iterator;
+  typedef typename Constraint_hierarchy::H_sc_iterator  Subconstraint_iterator;
  
 
 protected:
diff --git a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
index b9e1abb108e..2708494ca28 100644
--- a/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
+++ b/Packages/Triangulation_2/include/CGAL/Constraint_hierarchy_2.h
@@ -47,9 +47,9 @@ public:
   typedef Constraint_hierarchy_2<T,Data>       Hierarchy;
   typedef std::pair<T, T>                      H_constraint;
   typedef std::list<T>                         H_vertex_list;
-  typedef std::list<T>::iterator               H_vertex_it;
   typedef std::list<H_constraint>              H_constraint_list;
-  typedef std::list<H_constraint>::iterator    H_constraint_it;
+  typedef typename std::list<T>::iterator               H_vertex_it;
+  typedef typename std::list<H_constraint>::iterator    H_constraint_it;
 
   class H_context {
     friend class Hierarchy;
@@ -63,7 +63,7 @@ public:
     int number_of_vertices() {return enclosing->size();}
   };                                           
   typedef std::list<H_context>                 H_context_list;
-  typedef std::list<H_context>::iterator       H_context_iterator;
+  typedef typename std::list<H_context>::iterator       H_context_iterator;
 
   typedef std::map<T, Data>                             H_vertex_map;
   typedef std::map<H_constraint, H_vertex_list*>        H_c_to_sc_map;