diff --git a/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h b/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h
index fdaaaa3016f..77f6e81d460 100644
--- a/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h
+++ b/Arrangement_on_surface_2/include/CGAL/CORE_algebraic_number_traits.h
@@ -590,7 +590,7 @@ public:
                                   poly.getCoeff(1),
                                   poly.getCoeff(0),
                                   buffer);
-      unsigned int  num_of_roots = std::distance(&buffer[0], end_buffer);
+      std::ptrdiff_t num_of_roots = std::distance(&buffer[0], end_buffer);
 
       for (i = 0; i < num_of_roots; ++i)
       {
diff --git a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
index 99270a0bebd..4731b57d575 100644
--- a/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
+++ b/Classification/include/CGAL/Classification/Sum_of_weighted_features_classifier.h
@@ -113,7 +113,7 @@ private:
         std::vector<float> v;
         m_classifier (m_training_set[k], v);
 
-        float min = std::numeric_limits<float>::max();
+        float min = (std::numeric_limits<float>::max)();
         for(std::size_t l = 0; l < v.size(); ++ l)
           if (v[l] < min)
           {
@@ -904,7 +904,7 @@ private:
           std::vector<float> v;
           (*this) (training_sets[j][k], v);
 
-          float min = std::numeric_limits<float>::max();
+          float min = (std::numeric_limits<float>::max)();
           for(std::size_t l = 0; l < m_labels.size(); ++ l)
             if (v[l] < min)
             {
diff --git a/Generator/include/CGAL/Combination_enumerator.h b/Generator/include/CGAL/Combination_enumerator.h
index cd925117e47..7e40c7dd7e1 100644
--- a/Generator/include/CGAL/Combination_enumerator.h
+++ b/Generator/include/CGAL/Combination_enumerator.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_COMBINATION_ENUMERATOR_H
 #define CGAL_COMBINATION_ENUMERATOR_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <vector>
 
@@ -136,4 +138,6 @@ public:
 
 } // end of namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_COMBINATION_ENUMERATOR_H
diff --git a/Generator/include/CGAL/Random_polygon_2_sweep.h b/Generator/include/CGAL/Random_polygon_2_sweep.h
index 42ab45bcd6b..d1e25acae16 100644
--- a/Generator/include/CGAL/Random_polygon_2_sweep.h
+++ b/Generator/include/CGAL/Random_polygon_2_sweep.h
@@ -27,6 +27,8 @@
 #ifndef CGAL_RANDOM_POLYGON_2_SWEEP_H
 #define CGAL_RANDOM_POLYGON_2_SWEEP_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/enum.h>
 #include <CGAL/Polygon_2/polygon_assertions.h>
 #include <set>
@@ -582,4 +584,6 @@ void make_simple_polygon(Iterator points_begin, Iterator points_end,
 
 } // end of namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_RANDOM_POLYGON_2_SWEEP_H
diff --git a/Mesh_3/include/CGAL/exude_mesh_3.h b/Mesh_3/include/CGAL/exude_mesh_3.h
index dcb07518d24..3c5c64053e8 100644
--- a/Mesh_3/include/CGAL/exude_mesh_3.h
+++ b/Mesh_3/include/CGAL/exude_mesh_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/sliver_criteria.h>
 #include <CGAL/Mesh_3/Slivers_exuder.h>
@@ -85,4 +86,6 @@ exude_mesh_3_impl(C3T3& c3t3,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_EXUDE_MESH_3_H
diff --git a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
index 5700ad2f18e..6c73d536ddb 100644
--- a/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
+++ b/Mesh_3/include/CGAL/lloyd_optimize_mesh_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/global_parameters.h>
 #include <CGAL/Mesh_3/Mesh_global_optimizer.h>
@@ -108,5 +109,6 @@ lloyd_optimize_mesh_3_impl(C3T3& c3t3,
   
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_LLOYD_OPTIMIZE_MESH_3_H
diff --git a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
index da6088326ad..4a6c9a240f1 100644
--- a/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
+++ b/Mesh_3/include/CGAL/odt_optimize_mesh_3.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/global_parameters.h>
 #include <CGAL/Mesh_3/Mesh_global_optimizer.h>
@@ -107,5 +107,6 @@ odt_optimize_mesh_3_impl(C3T3& c3t3,
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_ODT_OPTIMIZE_MESH_3_H
diff --git a/Mesh_3/include/CGAL/perturb_mesh_3.h b/Mesh_3/include/CGAL/perturb_mesh_3.h
index 6b7c01f57f5..9d3b7540abf 100644
--- a/Mesh_3/include/CGAL/perturb_mesh_3.h
+++ b/Mesh_3/include/CGAL/perturb_mesh_3.h
@@ -28,7 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/global_parameters.h>
 #include <CGAL/Mesh_3/sliver_criteria.h>
@@ -134,4 +134,6 @@ perturb_mesh_3_impl(C3T3& c3t3,
 } //namespace CGAL
 
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_PERTURB_MESH_3_H
diff --git a/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h b/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h
index e4d9ef739ce..cbe9f1e3fe3 100644
--- a/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h
+++ b/Polygon/include/CGAL/Polygon_2/Polygon_2_simplicity.h
@@ -26,6 +26,8 @@
 #ifndef CGAL_POLYGON_2_SIMPLICITY_H
 #define CGAL_POLYGON_2_SIMPLICITY_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/enum.h>
 #include <CGAL/Polygon_2/polygon_assertions.h>
 #include <set>
@@ -501,4 +503,6 @@ bool is_simple_polygon(Iterator points_begin, Iterator points_end,
 
 } // end of namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif