diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h
index 758094add12..f6710fc352d 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_2.h
@@ -571,8 +571,8 @@ public:
       CGAL_KINETIC_LOG(CGAL::Kinetic::LOG_SOME, "DELAUNAY ERROR not flipping unflippable edge" << std::endl);
       //make this better
       double ub=to_interval(traits_.simulator_handle()->next_event_time()).second;
-      ub= std::max(ub+.0000001, 
-		   nextafter(ub, std::numeric_limits<double>::max()));
+      ub= (std::max)(ub+.0000001, 
+		     nextafter(ub, (std::numeric_limits<double>::max)()));
       Time t=ub;
       //cert.pop_failure_time();
       Event_key k =traits_.simulator_handle()->new_event(t, O2_event(cert, e, this));
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h
index f15e0116af3..94dd59c8b18 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/Delaunay_triangulation_cell_base_3.h
@@ -93,7 +93,7 @@ class Delaunay_triangulation_cell_base_3: public Cell_base
             CGAL_precondition(i!= j);
 //if (i <j) std::swap(i,j);
             unsigned int sum= i+j;
-            if (std::max(i,j) != 3) --sum;
+            if ((std::max)(i,j) != 3) --sum;
             CGAL_assertion( sum <6);
             return sum;
         }
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
index f6b8eeaa474..cde1a6887d3 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/Regular_triangulation_3.h
@@ -433,7 +433,7 @@ protected:
       }
 
       std::sort(kneighborsp.begin(), kneighborsp.end());
-      for (unsigned int i=0; i< std::max(neighborsp.size(), kneighborsp.size()); ++i) {
+      for (unsigned int i=0; i< (std::max)(neighborsp.size(), kneighborsp.size()); ++i) {
 	Point_key nr;
 	if (i < neighborsp.size()) nr= neighborsp[i];
 	Point_key nk;
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h b/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h
index f520f63e006..abf55e87bdb 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/Two_list_pointer_event_queue.h
@@ -182,7 +182,7 @@ struct Two_list_event_queue_item_allocator
     ::operator delete(static_cast<void*>(p));
   }
   size_type max_size() const throw() {
-    return std::numeric_limits<size_type>::max()/sizeof(dummy_value_type);
+    return (std::numeric_limits<size_type>::max)()/sizeof(dummy_value_type);
   }
   template <class TT>
   void construct(pointer p, const TT &) {
@@ -318,7 +318,7 @@ public:
     //if (end_time != std::numeric_limits<Priority>::infinity()){
     set_end_priority(end_time);
       /*} else {
-      NT end=std::numeric_limits<int>::max();
+      NT end=(std::numeric_limits<int>::max)();
       std::cerr << "WARNING Infinity is being rounded down to " << end << std::endl;
       set_end_priority(end);
       }*/
diff --git a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h
index 312856a8043..9c7705b1498 100644
--- a/Kinetic_data_structures/include/CGAL/Polynomial/basic.h
+++ b/Kinetic_data_structures/include/CGAL/Polynomial/basic.h
@@ -171,7 +171,7 @@ inline Rt infinity()
 {
   //BOOST_STATIC_ASSERT(std::numeric_limits<Rt>::is_specialized);
     if (std::numeric_limits<Rt>::has_infinity) return std::numeric_limits<Rt>::infinity();
-    else return std::numeric_limits<Rt>::max();
+    else return (std::numeric_limits<Rt>::max)();
 }