diff --git a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h
index ea0739da1e2..e8c6d1ef965 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_bbox_3_do_intersect.h
@@ -34,7 +34,7 @@ namespace CGALi {
   template <class K>
   bool do_intersect(const CGAL::Bbox_3& c1, 
     const CGAL::Bbox_3& c2,
-    const K& kernel)
+    const K&)
   {
     for(int i = 0; i < 3; ++i)
       if(c1.max(i) < c2.min(i) || c1.min(i) > c2.max(i))
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h
index e1431547d35..d76d634acf8 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_line_3_do_intersect.h
@@ -33,7 +33,7 @@ namespace CGALi {
   template <class K>
   bool do_intersect(const typename K::Line_3& line, 
     const CGAL::Bbox_3& bbox,
-    const K& kernel)
+    const K&)
   {
     typedef typename K::FT FT;
     typedef typename K::Point_3 Point;
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h
index 29a23ea679f..d141537c86d 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_ray_3_do_intersect.h
@@ -31,7 +31,7 @@ namespace CGALi {
   template <class K>
   bool do_intersect(const typename K::Ray_3& ray, 
     const CGAL::Bbox_3& bbox,
-    const K& kernel)
+    const K&)
   {
     typedef typename K::FT FT;
     typedef typename K::Point_3 Point;
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h
index e4af5304517..ba13fc5499a 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_segment_3_do_intersect.h
@@ -33,7 +33,7 @@ namespace CGALi {
   template <class K>
   bool do_intersect(const typename K::Segment_3& segment, 
     const CGAL::Bbox_3& bbox,
-    const K& kernel)
+    const K&)
   {
     typedef typename K::FT FT;
     typedef typename K::Point_3 Point;
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h
index aeb4f9491e9..14730bdbfaa 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Bbox_3_triangle_3_do_intersect.h
@@ -172,7 +172,7 @@ namespace CGALi {
   template <class K>
   bool do_intersect(const typename K::Triangle_3& triangle,
     const CGAL::Bbox_3& bbox,
-    const K& kernel)
+    const K&)
   {
     if(! do_bbox_intersect<K>(triangle, bbox))
       return false;
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h
index 905b1ec47f5..2a7f8916eff 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_line_3_intersection.h
@@ -35,7 +35,7 @@ template <class K>
 Object
 intersection(const typename K::Triangle_3 &t,
              const typename K::Line_3 &l,
-             const K& k)
+             const K&)
 {
   return CGAL::intersection(t.supporting_plane(),
                             l);
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h
index 5ea07470668..ceb7e0b6fa3 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_ray_3_intersection.h
@@ -29,7 +29,7 @@ template <class K>
 Object
 intersection(const typename K::Triangle_3  &t,
 	     const typename K::Ray_3 &r,
-	     const K& k)
+	     const K&)
 {
 	// TOFIX: here we assume that we have already tested
 	// do_intersection between the triangle and the ray
diff --git a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
index b8a8f03a3b5..a8323fe30a7 100644
--- a/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
+++ b/AABB_tree/include/CGAL/AABB_intersections/Triangle_3_segment_3_intersection.h
@@ -29,7 +29,7 @@ template <class K>
 Object
 intersection(const typename K::Triangle_3  &t,
 	     const typename K::Segment_3 &s,
-	     const K& k)
+	     const K&)
 {
 	// TOFIX: here we assume that we have already tested
 	// do_intersection between the triangle and the segment
diff --git a/AABB_tree/include/CGAL/AABB_traits.h b/AABB_tree/include/CGAL/AABB_traits.h
index d7074f9704c..01312d9e7e2 100644
--- a/AABB_tree/include/CGAL/AABB_traits.h
+++ b/AABB_tree/include/CGAL/AABB_traits.h
@@ -70,6 +70,7 @@ public:
   typedef typename GeomTraits::Construct_min_vertex_3 Construct_min_vertex_3;
   typedef typename GeomTraits::Construct_max_vertex_3 Construct_max_vertex_3;
   typedef typename GeomTraits::Compute_squared_radius_3 Compute_squared_radius_3;
+  typedef typename GeomTraits::Compute_squared_distance_3 Compute_squared_distance_3;
   typedef typename GeomTraits::Cartesian_const_iterator_3 Cartesian_const_iterator_3;
   typedef typename GeomTraits::Construct_cartesian_const_iterator_3
                      Construct_cartesian_const_iterator_3;
diff --git a/AABB_tree/include/CGAL/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h
index 15e736da7e9..8cdc30656e7 100644
--- a/AABB_tree/include/CGAL/AABB_tree.h
+++ b/AABB_tree/include/CGAL/AABB_tree.h
@@ -592,7 +592,7 @@ namespace CGAL {
                                         const Point& hint) const
     {
         const Point closest = this->closest_point(query, hint);
-        return CGAL::squared_distance(query, closest);
+        return typename Tr::Compute_squared_distance_3()(query, closest);
     }
 
     // squared distance without user-specified hint
@@ -601,7 +601,7 @@ namespace CGAL {
         AABB_tree<Tr>::squared_distance(const Point& query) const
     {
         const Point closest = this->closest_point(query);
-        return CGAL::squared_distance(query, closest);
+        return typename Tr::Compute_squared_distance_3()(query, closest);
     }
 
     // closest point with user-specified hint
diff --git a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
index 05b2434eeec..c47121d7b55 100644
--- a/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
+++ b/AABB_tree/test/AABB_tree/aabb_distance_triangle_test.cpp
@@ -71,7 +71,7 @@ void test_kernels(const char *filename)
 
     std::cout << std::endl;
     std::cout << "Simple cartesian float kernel" << std::endl;
-    test<CGAL::Simple_cartesian<float> >(filename);
+//    test<CGAL::Simple_cartesian<float> >(filename);
 
     std::cout << std::endl;
     std::cout << "Cartesian float kernel" << std::endl;