diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h b/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h
index 48b49b2ff8e..6ee6d4ebae3 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/internal/infinity_or_max.h
@@ -28,7 +28,7 @@ template <class T>
 T infinity_or_max()
 {
     if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity();
-    else return std::numeric_limits<T>::max();
+    else return (std::numeric_limits<T>::max)();
 }
 
 
@@ -36,7 +36,7 @@ template <class T>
 T infinity_or_max(T)
 {
     if (std::numeric_limits<T>::has_infinity) return std::numeric_limits<T>::infinity();
-    else return std::numeric_limits<T>::max();
+    else return (std::numeric_limits<T>::max)();
 }
 
 
diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h
index 07094262573..5cc6ed3afcd 100644
--- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h
+++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Double_with_infinity.h
@@ -27,7 +27,7 @@ CGAL_POLYNOMIAL_BEGIN_INTERNAL_NAMESPACE
 
  template <bool S, bool Q>
   struct Double_with_infinity_default {
-    static double value(){return std::numeric_limits<double>::max();};
+    static double value(){return (std::numeric_limits<double>::max)();};
   };
   template<bool O>
   struct Double_with_infinity_default<true,O> {
@@ -76,7 +76,7 @@ namespace std {
   public:
     static const bool is_specialized = true;
     static const bool has_infinity=true;
-    static double infinity() throw() {return std::numeric_limits<double>::max();}
+    static double infinity() throw() {return (std::numeric_limits<double>::max)();}
   };
 };
 
diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h
index b594e40d90a..80e5b910aef 100644
--- a/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h
+++ b/Kinetic_data_structures/include/CGAL/Polynomial/internal/Sturm_root_rep.h
@@ -887,7 +887,7 @@ public:
   double compute_double(double acc = 1e-10) const
   {
           if (idx < 0) {
-                        double inf=std::numeric_limits<double>::has_infinity? std::numeric_limits<double>::infinity() : std::numeric_limits<double>::max();
+                        double inf=std::numeric_limits<double>::has_infinity? std::numeric_limits<double>::infinity() : (std::numeric_limits<double>::max)();
     if ( idx == -1 ){
                 return inf;
     } else return -inf;