diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traversal_traits.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traversal_traits.h
index ab6242aa6b7..8a04a2f4b37 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traversal_traits.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/AABB_traversal_traits.h
@@ -108,7 +108,7 @@ private:
     max_bbox[1] = m_bbox.ymax();
     min_bbox[2] = m_bbox.zmin();
     max_bbox[2] = m_bbox.zmax();
-    const GeomTraits::Point_3& source = query.source();
+    const typename GeomTraits::Point_3& source = query.source();
     origin[0] = source.x();
     origin[1] = source.y();
     origin[2] = source.z();
diff --git a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h
index 1328508900c..8d0dcd427d0 100644
--- a/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h
+++ b/Surface_mesh_segmentation/include/CGAL/internal/Surface_mesh_segmentation/Expectation_maximization.h
@@ -155,7 +155,7 @@ public:
       // pdf values scaled so that their sum will equal to 1.
       for(std::size_t point_i = 0; point_i < points.size(); ++point_i) {
         double probability = probabilities[center_i][point_i] / sum;
-        probability = (CGAL::max)(probability, epsilon);
+        probability = (std::max)(probability, epsilon);
         probabilities[center_i][point_i] = -log(probability);
       }
 #else