diff --git a/Kernel_d/include/CGAL/Cartesian_d.h b/Kernel_d/include/CGAL/Cartesian_d.h
index f23ed661412..cb4d1f848c2 100644
--- a/Kernel_d/include/CGAL/Cartesian_d.h
+++ b/Kernel_d/include/CGAL/Cartesian_d.h
@@ -21,7 +21,7 @@
 #include <CGAL/representation_tags.h>
 #include <CGAL/Kernel_d/function_objects.h>
 #include <CGAL/Linear_algebraCd.h>
-#include <vector>
+#include <CGAL/Kernel/Same_uncertainty.h>
 
 #include <CGAL/Kernel_d/Kernel_classesCd.h>
 #include <CGAL/Kernel_d/PointCd.h>
@@ -71,7 +71,7 @@ public:
 
   typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d;
 
-    // Boolean   had originally been Bool. It was renamed to avoid a conflict
+    // Boolean had originally been Bool. It was renamed to avoid a conflict
     // between a macro defined in Xlib.h poorly chosen to have the same name,
     // that is 'Bool'.
     typedef typename Same_uncertainty_nt<bool, FT>::type
diff --git a/Kernel_d/include/CGAL/Homogeneous_d.h b/Kernel_d/include/CGAL/Homogeneous_d.h
index 5f8026fbbf5..b5f6981a468 100644
--- a/Kernel_d/include/CGAL/Homogeneous_d.h
+++ b/Kernel_d/include/CGAL/Homogeneous_d.h
@@ -22,7 +22,7 @@
 #include <CGAL/representation_tags.h>
 #include <CGAL/Kernel_d/function_objects.h>
 #include <CGAL/Linear_algebraHd.h>
-#include <vector>
+#include <CGAL/Kernel/Same_uncertainty.h>
 
 #include <CGAL/Kernel_d/Kernel_classesHd.h>
 #include <CGAL/Kernel_d/PointHd.h>
@@ -67,6 +67,24 @@ public:
 
   typedef typename Point_d_base::Cartesian_const_iterator Cartesian_const_iterator_d;
 
+  // Boolean had originally been Bool. It was renamed to avoid a conflict
+  // between a macro defined in Xlib.h poorly chosen to have the same name,
+  // that is 'Bool'.
+  typedef typename Same_uncertainty_nt<bool, RT>::type
+                                                      Boolean;
+  typedef typename Same_uncertainty_nt<CGAL::Sign, RT>::type
+                                                      Sign;
+  typedef typename Same_uncertainty_nt<CGAL::Comparison_result, RT>::type
+                                                      Comparison_result;
+  typedef typename Same_uncertainty_nt<CGAL::Orientation, RT>::type
+                                                      Orientation;
+  typedef typename Same_uncertainty_nt<CGAL::Oriented_side, RT>::type
+                                                      Oriented_side;
+  typedef typename Same_uncertainty_nt<CGAL::Bounded_side, RT>::type
+                                                      Bounded_side;
+  typedef typename Same_uncertainty_nt<CGAL::Angle, RT>::type
+                                                      Angle;
+
   typedef Dynamic_dimension_tag            Dimension;
 
   template <typename T>