diff --git a/AABB_tree/include/CGAL/AABB_segment_primitive_3.h b/AABB_tree/include/CGAL/AABB_segment_primitive_3.h
index f13523ba40c..b9459de0208 100644
--- a/AABB_tree/include/CGAL/AABB_segment_primitive_3.h
+++ b/AABB_tree/include/CGAL/AABB_segment_primitive_3.h
@@ -12,8 +12,8 @@
 //
 
 
-#ifndef CGAL_AABB_SEGMENT_PRIMITIVE_H_
-#define CGAL_AABB_SEGMENT_PRIMITIVE_H_
+#ifndef CGAL_AABB_SEGMENT_PRIMITIVE_3_H_
+#define CGAL_AABB_SEGMENT_PRIMITIVE_3_H_
 
 #include <CGAL/license/AABB_tree.h>
 
@@ -74,7 +74,7 @@ namespace internal {
 template < class GeomTraits,
            class Iterator,
            class CacheDatum=Tag_false>
-class AABB_segment_primitive
+class AABB_segment_primitive_3
 #ifndef DOXYGEN_RUNNING
   : public AABB_primitive<  Iterator,
                             Input_iterator_property_map<Iterator>,
@@ -90,12 +90,12 @@ class AABB_segment_primitive
                           CacheDatum > Base;
 public:
   ///constructor from an iterator
-  AABB_segment_primitive(Iterator it) : Base(it){}
+  AABB_segment_primitive_3(Iterator it) : Base(it){}
 };
 
 }  // end namespace CGAL
 
 #include <CGAL/enable_warnings.h>
 
-#endif // CGAL_AABB_SEGMENT_PRIMITIVE_H_
+#endif // CGAL_AABB_SEGMENT_PRIMITIVE_3_H_
 
diff --git a/AABB_tree/include/CGAL/AABB_triangle_primitive_3.h b/AABB_tree/include/CGAL/AABB_triangle_primitive_3.h
index 1fc1b140c58..569e579f12b 100644
--- a/AABB_tree/include/CGAL/AABB_triangle_primitive_3.h
+++ b/AABB_tree/include/CGAL/AABB_triangle_primitive_3.h
@@ -12,8 +12,8 @@
 //
 
 
-#ifndef CGAL_AABB_TRIANGLE_PRIMITIVE_H_
-#define CGAL_AABB_TRIANGLE_PRIMITIVE_H_
+#ifndef CGAL_AABB_TRIANGLE_PRIMITIVE_3_H_
+#define CGAL_AABB_TRIANGLE_PRIMITIVE_3_H_
 
 #include <CGAL/license/AABB_tree.h>
 
@@ -75,7 +75,7 @@ namespace internal {
 template < class GeomTraits,
            class Iterator,
            class CacheDatum=Tag_false>
-class AABB_triangle_primitive
+class AABB_triangle_primitive_3
 #ifndef DOXYGEN_RUNNING
   : public AABB_primitive<  Iterator,
                             Input_iterator_property_map<Iterator>,
@@ -91,12 +91,12 @@ class AABB_triangle_primitive
                           CacheDatum > Base;
 public:
   ///constructor from an iterator
-  AABB_triangle_primitive(Iterator it) : Base(it){}
+  AABB_triangle_primitive_3(Iterator it) : Base(it){}
 };
 
 }  // end namespace CGAL
 
 #include <CGAL/enable_warnings.h>
 
-#endif // CGAL_AABB_TRIANGLE_PRIMITIVE_H_
+#endif // CGAL_AABB_TRIANGLE_PRIMITIVE_3_H_