diff --git a/Convex_hull_3/doc/Convex_hull_3/dependencies b/Convex_hull_3/doc/Convex_hull_3/dependencies
index 91aa0419c6f..e7570eb006a 100644
--- a/Convex_hull_3/doc/Convex_hull_3/dependencies
+++ b/Convex_hull_3/doc/Convex_hull_3/dependencies
@@ -8,4 +8,4 @@ Convex_hull_2
 Convex_hull_d
 Triangulation_3
 Polyhedron
-Surface_mesh
\ No newline at end of file
+Surface_mesh
diff --git a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp
index 755ec1395fc..a6e70a483f6 100644
--- a/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp
+++ b/Convex_hull_3/examples/Convex_hull_3/dynamic_hull_SM_3.cpp
@@ -3,7 +3,7 @@
 #include <CGAL/Delaunay_triangulation_3.h>
 #include <CGAL/Surface_mesh.h>
 #include <CGAL/algorithm.h>
-#include <CGAL/star_to_face_graph.h>
+#include <CGAL/link_to_face_graph.h>
 #include <CGAL/convexity_check_3.h>
 
 #include <list>
@@ -41,7 +41,7 @@ int main()
   //copy the convex hull of points into a polyhedron and use it
   //to get the number of points on the convex hull
   Polyhedron_3 chull;
-  CGAL::star_to_face_graph(T, T.infinite_vertex(), chull);
+  CGAL::link_to_face_graph(T, T.infinite_vertex(), chull);
   
   std::cout << "After removal of 25 points, there are "
             << num_vertices(chull) << " points on the convex hull." << std::endl;
diff --git a/Convex_hull_3/include/CGAL/convex_hull_3.h b/Convex_hull_3/include/CGAL/convex_hull_3.h
index b3f7e3f8fa1..cfb22000d60 100644
--- a/Convex_hull_3/include/CGAL/convex_hull_3.h
+++ b/Convex_hull_3/include/CGAL/convex_hull_3.h
@@ -328,7 +328,7 @@ find_visible_set(TDS_2& tds,
                  const typename Traits::Point_3& point, 
                  typename TDS_2::Face_handle start,
                  std::list<typename TDS_2::Face_handle>& visible,
-                 boost::unordered_map<typename TDS_2::Vertex_handle, typename TDS_2::Edge>& outside,
+                 std::map<typename TDS_2::Vertex_handle, typename TDS_2::Edge>& outside,
                  const Traits& traits)
 {
    typedef typename Traits::Plane_3                   Plane_3;
@@ -474,7 +474,7 @@ ch_quickhull_3_scan(TDS_2& tds,
   typedef typename Traits::Point_3			  Point_3;
   typedef std::list<Point_3>                              Outside_set;
   typedef typename std::list<Point_3>::iterator           Outside_set_iterator;
-  typedef boost::unordered_map<typename TDS_2::Vertex_handle, typename TDS_2::Edge> Border_edges;
+  typedef std::map<typename TDS_2::Vertex_handle, typename TDS_2::Edge> Border_edges;
 
   std::list<Face_handle>                     visible_set;
   typename std::list<Face_handle>::iterator  vis_set_it;
@@ -825,6 +825,7 @@ template <class InputIterator, class Polyhedron_3, class Traits>
 void convex_hull_3(InputIterator first, InputIterator beyond,
                    Polyhedron_3& polyhedron,  const Traits& traits)
 {
+  std::cerr << typeid(Traits).name() << std::endl;
   typedef typename Traits::Point_3                Point_3;  
   typedef std::list<Point_3>                      Point_3_list;
   typedef typename Point_3_list::iterator         P3_iterator;