diff --git a/BGL/include/CGAL/boost/graph/named_function_params.h b/BGL/include/CGAL/boost/graph/named_function_params.h
index 76d81bcb3fb..095b122381a 100644
--- a/BGL/include/CGAL/boost/graph/named_function_params.h
+++ b/BGL/include/CGAL/boost/graph/named_function_params.h
@@ -19,6 +19,8 @@
 #ifndef CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H
 #define CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 
 #include <CGAL/boost/graph/properties.h>
@@ -198,4 +200,6 @@ struct lookup_named_param_def<Tag1, CGAL::cgal_bgl_named_params<T, Tag, Base>, D
 };
 } // boost
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_BOOST_GRAPH_NAMED_FUNCTION_PARAMS_HPP
diff --git a/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h b/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
index 71cf96304f6..09fe353349b 100644
--- a/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
+++ b/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
@@ -21,6 +21,8 @@
 #ifndef CGAL_SPLIT_GRAPH_INTO_POLYLINES
 #define CGAL_SPLIT_GRAPH_INTO_POLYLINES
 
+#include <CGAL/disable_warnings.h>
+
 #include <map> 
 #include <vector>
 #include <utility>
@@ -375,4 +377,6 @@ split_graph_into_polylines(const Graph& graph,
 
 } //end of namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_SPLIT_GRAPH_INTO_POLYLINES
diff --git a/CGAL_ImageIO/include/CGAL/Image_3.h b/CGAL_ImageIO/include/CGAL/Image_3.h
index d31fc7f1a08..e13a7e81e08 100644
--- a/CGAL_ImageIO/include/CGAL/Image_3.h
+++ b/CGAL_ImageIO/include/CGAL/Image_3.h
@@ -23,6 +23,8 @@
 #ifndef CGAL_IMAGE_3_H
 #define CGAL_IMAGE_3_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <CGAL/array.h>
 
@@ -531,5 +533,7 @@ Image_3::labellized_trilinear_interpolation
 #if defined(BOOST_MSVC)
 #  pragma warning(pop)
 #endif
- 
+
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_IMAGE_3_H
diff --git a/Installation/include/CGAL/disable_warnings.h b/Installation/include/CGAL/disable_warnings.h
index 757751cab4d..f148bab4645 100644
--- a/Installation/include/CGAL/disable_warnings.h
+++ b/Installation/include/CGAL/disable_warnings.h
@@ -23,6 +23,7 @@
 #  pragma warning(push)
 #  pragma warning(disable: 4099) // struct class mixed
 #  pragma warning(disable: 4127) // conditional expression is constant
+#  pragma warning(disable: 4180)  // qualifier applied to function type has no meaning; ignored
 #  pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #  pragma warning(disable: 4510) // default constructor could not be generated
 #  pragma warning(disable: 4512) //  assignment operator could not be generated
diff --git a/Mesh_3/include/CGAL/Gray_image_mesh_domain_3.h b/Mesh_3/include/CGAL/Gray_image_mesh_domain_3.h
index 6687abfb0f1..7a2f33e94b4 100644
--- a/Mesh_3/include/CGAL/Gray_image_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Gray_image_mesh_domain_3.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Random.h>
 #include <CGAL/Labeled_mesh_domain_3.h>
@@ -139,6 +140,6 @@ private:
 
 }  // end namespace CGAL
 
-
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_GRAY_IMAGE_MESH_DOMAIN_3_H
diff --git a/Mesh_3/include/CGAL/Implicit_mesh_domain_3.h b/Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
index a309d0c006c..a690ed5ee7b 100644
--- a/Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Implicit_mesh_domain_3.h
@@ -29,11 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
-#if defined(BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
-#endif
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Labeled_mesh_domain_3.h>
 #include <CGAL/Implicit_to_labeling_function_wrapper.h>
@@ -91,8 +87,6 @@ private:
 
 }  // end namespace CGAL
 
-#if defined(BOOST_MSVC)
-#  pragma warning(pop)
-#endif
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_IMPLICIT_MESH_DOMAIN_3_H
diff --git a/Mesh_3/include/CGAL/Implicit_to_labeling_function_wrapper.h b/Mesh_3/include/CGAL/Implicit_to_labeling_function_wrapper.h
index 23abb8f208c..9adcf57f50c 100644
--- a/Mesh_3/include/CGAL/Implicit_to_labeling_function_wrapper.h
+++ b/Mesh_3/include/CGAL/Implicit_to_labeling_function_wrapper.h
@@ -33,7 +33,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
+#include <CGAL/disable_warnings.h>
 
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
@@ -291,4 +291,6 @@ public:
 #  pragma warning(pop)
 #endif
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_IMPLICIT_TO_LABELING_FUNCTION_WRAPPER_H
diff --git a/Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
index 4cc8d534e16..e1d75276105 100644
--- a/Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_image_mesh_domain_3.h
@@ -30,7 +30,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Random.h>
 #include <CGAL/Labeled_mesh_domain_3.h>
@@ -158,6 +158,6 @@ private:
 
 }  // end namespace CGAL
 
-
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_LABELED_IMAGE_MESH_DOMAIN_3_H
diff --git a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
index 7035fa02d5d..103bf98007a 100644
--- a/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Labeled_mesh_domain_3.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -721,4 +722,6 @@ Labeled_mesh_domain_3<F,BGT,Null>::Construct_initial_points::operator()(
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // LABELLED_MESH_TRAITS_3_H_
diff --git a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
index 68dfd5ddb8f..7babbbb2626 100644
--- a/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
+++ b/Mesh_3/include/CGAL/Mesh_3/C3T3_helpers.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 #include <CGAL/use.h>
@@ -3943,4 +3944,6 @@ check_no_inside_vertices(const Facet_vector& facets) const
 } // end namespace Mesh_3
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_C3T3_HELPERS_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
index 3a766a312b3..99c0ef07a34 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Dump_c3t3.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <string>
 #include <CGAL/Mesh_3/io_signature.h>
@@ -133,4 +134,6 @@ void dump_c3t3(const C3t3& c3t3, std::string prefix) {
 
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_DUMP_C3T3_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Image_to_labeled_function_wrapper.h b/Mesh_3/include/CGAL/Mesh_3/Image_to_labeled_function_wrapper.h
index 402f35d6bf4..745c059784b 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Image_to_labeled_function_wrapper.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Image_to_labeled_function_wrapper.h
@@ -30,6 +30,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Image_3.h>
 #include <CGAL/function_objects.h>
@@ -153,4 +154,6 @@ private:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_IMAGE_TO_LABELED_FUNCTION_WRAPPER_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h b/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
index 2f44f981c50..5349a6ba5e3 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
@@ -33,11 +33,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
-#if defined(BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
-#endif
+#include <CGAL/disable_warnings.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/Implicit_to_labeling_function_wrapper.h>"
@@ -153,8 +149,6 @@ private:
 
 
 
-#if defined(BOOST_MSVC)
-#  pragma warning(pop)
-#endif
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MESH_3_IMPLICIT_TO_LABELED_FUNCTION_WRAPPER_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
index d627ae37498..1c8c1af7d9e 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Labeled_mesh_domain_3.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/Labeled_mesh_domain_3.h>"
@@ -630,4 +631,6 @@ Labeled_mesh_domain_3<F,BGT>::Construct_initial_points::operator()(
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // LABELLED_MESH_TRAITS_3_H_
diff --git a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h
index afa97499325..763f31c59b0 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Lloyd_move.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -566,4 +567,6 @@ private:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_LLOYD_MOVE_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
index 3a97613c68e..25d6ce8af69 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_complex_3_in_triangulation_3_base.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -564,7 +565,7 @@ private:
           end = triangulation().finite_vertices_end();
         vit != end; ++vit)
     {
-      vit->set_c2t3_cache(0, -1);
+      vit->set_c2t3_cache(0, (std::numeric_limits<size_type>::max)());
     }
 
     edge_facet_counter_.clear();
@@ -595,7 +596,7 @@ private:
 #endif // CGAL_LINKED_WITH_TBB
 
           const std::size_t n = edge_va->cached_number_of_incident_facets();
-          edge_va->set_c2t3_cache(n+1, -1);
+          edge_va->set_c2t3_cache(n+1, (std::numeric_limits<size_type>::max)());
         }
       }
     }
@@ -609,7 +610,7 @@ private:
     if( v->is_c2t3_cache_valid() )
     {
       const std::size_t n = v->cached_number_of_components();
-      if(n != std::size_t(-1)) return n;
+      if(n != (std::numeric_limits<size_type>::max)()) return n;
     }
 
     Union_find<Facet> facets;
@@ -1076,4 +1077,6 @@ rescan_after_load_of_triangulation() {
 }  // end namespace Mesh_3
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_MESH_COMPLEX_3_IN_TRIANGULATION_3_BASE_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
index dac39698dac..d8dace6924a 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_global_optimizer.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -733,7 +734,7 @@ operator()(int nb_iterations, Visitor visitor)
   big_moves_size_ =
     (std::max)(std::size_t(1), std::size_t(moving_vertices.size()/500));
 
-  std::size_t nb_vertices_moved = -1;
+  std::size_t nb_vertices_moved = (std::numeric_limits<size_t>::max)();
   bool convergence_stop = false;
 
   // Iterate
@@ -1178,4 +1179,6 @@ sq_circumradius_length(const Cell_handle& cell, const Vertex_handle& v) const
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_MESH_GLOBAL_OPTIMIZER_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h
index 853fbee7997..ed6f08ef8bc 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesh_sizing_field.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #ifdef CGAL_LINKED_WITH_TBB
 # include <tbb/enumerable_thread_specific.h>
@@ -323,4 +324,6 @@ interpolate_on_facet_vertices(const Bare_point& p, const Cell_handle& cell) cons
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_MESH_SIZING_FIELD_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
index a9c77ccb3e2..e102873d68e 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_3.h
@@ -30,6 +30,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -771,5 +772,6 @@ Mesher_3<C3T3,MC,MD>::debug_info_header() const
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MESH_3_MESHER_3_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
index af3bf453045..dc629bd5b20 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Mesher_level.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <string>
 
@@ -1223,4 +1224,6 @@ private:
 #include <CGAL/Mesher_level_visitors.h>
 #include <CGAL/Mesh_3/Mesher_level_default_implementations.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_MESHER_LEVEL_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
index 044eaf0433c..3929cd67770 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Protect_edges_sizing_field.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -2002,4 +2003,6 @@ repopulate_edges_around_corner(const Vertex_handle& v, ErasedVeOutIt out)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_PROTECT_EDGES_SIZING_FIELD_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
index a21cd5c5638..35cd8ac92be 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_3.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/Mesher_level.h>
 #include <CGAL/Mesh_3/Mesher_level_default_implementations.h>
@@ -108,10 +109,12 @@ struct Get_Is_facet_bad<Facet_criteria, true> {
       Facet, unsigned int, Facet, unsigned int> &f) const
     {
 #ifdef _DEBUG
+      /*
       int f1_current_erase_counter = CGAL::cpp11::get<0>(f).first->erase_counter();
       int f1_saved_erase_counter = CGAL::cpp11::get<1>(f);
       int f2_current_erase_counter = CGAL::cpp11::get<2>(f).first->erase_counter();
       int f2_saved_erase_counter = CGAL::cpp11::get<3>(f);
+      */
       //f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1
 
       /*if (f1_current_erase_counter - f1_saved_erase_counter + f2_current_erase_counter - f2_saved_erase_counter == 1)
@@ -1861,4 +1864,6 @@ after_insertion_handle_incident_facet(Facet& facet)
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_REFINE_FACETS_3_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h
index b459c533430..44140fa72b3 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Refine_facets_manifold_base.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/utility.h>
 #include <set>
@@ -671,5 +672,6 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MESH_3_REFINE_FACETS_MANIFOLD_BASE_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
index 1bdd2976dcb..c219b476e65 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Sliver_perturber.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -1668,4 +1669,6 @@ enqueue_task(const PVertex &pv,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_SLIVERS_PERTURBER_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
index 4732593f45f..46b586f5dc7 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Slivers_exuder.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 #include <CGAL/Mesh_3/Concurrent_mesher_config.h>
@@ -1874,5 +1875,6 @@ check_ratios(const Sliver_values& criterion_values,
 
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // end CGAL_MESH_3_SLIVERS_EXUDER_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h b/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
index 5f2fcc627d4..4d647990344 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Worksharing_data_structures.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #ifdef CGAL_LINKED_WITH_TBB
 
@@ -850,4 +851,6 @@ namespace CGAL { namespace Mesh_3 {
 
 #endif // CGAL_LINKED_WITH_TBB
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_WORKSHARING_DATA_STRUCTURES_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/sliver_criteria.h b/Mesh_3/include/CGAL/Mesh_3/sliver_criteria.h
index 1bf88a9cd79..88e0bf3f50c 100644
--- a/Mesh_3/include/CGAL/Mesh_3/sliver_criteria.h
+++ b/Mesh_3/include/CGAL/Mesh_3/sliver_criteria.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/min_dihedral_angle.h>
 #include <CGAL/Mesh_3/radius_ratio.h>
@@ -242,7 +243,6 @@ private:
   
 } // end namespace CGAL
 
-
-
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MESH_3_SLIVER_CRITERIA_H
diff --git a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
index f92c6650813..8ed98d78517 100644
--- a/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
+++ b/Mesh_3/include/CGAL/Mesh_3/vertex_perturbation.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -1383,4 +1384,6 @@ private:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_VERTEX_PERTURBATION_H
diff --git a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
index b39d377682d..4a650644dcb 100644
--- a/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
+++ b/Mesh_3/include/CGAL/Mesh_complex_3_in_triangulation_3.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
-
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/iterator.h>
 
@@ -793,4 +793,6 @@ operator>> (std::istream& is,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_COMPLEX_3_IN_TRIANGULATION_3_H
diff --git a/Mesh_3/include/CGAL/Mesh_criteria_3.h b/Mesh_3/include/CGAL/Mesh_criteria_3.h
index 3222c365e79..2360fb78a3c 100644
--- a/Mesh_3/include/CGAL/Mesh_criteria_3.h
+++ b/Mesh_3/include/CGAL/Mesh_criteria_3.h
@@ -30,6 +30,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 #include <CGAL/Mesh_3/global_parameters.h>
@@ -212,5 +213,6 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MESH_CRITERIA_3_H
diff --git a/Mesh_3/include/CGAL/Mesh_triangulation_3.h b/Mesh_3/include/CGAL/Mesh_triangulation_3.h
index 902477365d4..3846a0401b3 100644
--- a/Mesh_3/include/CGAL/Mesh_triangulation_3.h
+++ b/Mesh_3/include/CGAL/Mesh_triangulation_3.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -120,4 +121,6 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_TRIANGULATION_3_H
diff --git a/Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h b/Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h
index e9af855d0c3..6d0da3e7c67 100644
--- a/Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h
+++ b/Mesh_3/include/CGAL/Meshes/Filtered_multimap_container.h
@@ -133,10 +133,6 @@ namespace CGAL {
           it_list != m_local_lists.end() ;
           ++it_list )
       {
-#ifdef _DEBUG
-        size_t multimap_size = container.size();
-        size_t local_list_size = it_list->size();
-#endif
         container.insert(it_list->begin(), it_list->end());
         it_list->clear();
       }
@@ -213,9 +209,6 @@ namespace CGAL {
 
     void splice_local_lists_impl()
     {
-#ifdef _DEBUG
-      size_t s = size();
-#endif
       Base::splice_local_lists_impl(container);
     }
 
@@ -231,9 +224,6 @@ namespace CGAL {
 
     bool no_longer_element_to_refine_impl()
     {
-#ifdef _DEBUG
-      size_t multimap_size = container.size();
-#endif
       bool is_empty = container.empty();
       while( !is_empty && !test(container.begin()->second) )
       {
diff --git a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
index 146a927967f..471eea3604a 100644
--- a/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_complex_mesh_domain_3.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -1142,5 +1143,6 @@ reindex_patches(const std::vector<Surf_p_index>& map)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_POLYHEDRAL_COMPLEX_MESH_DOMAIN_3_H
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
index 86e634162e3..c0527785dda 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_3.h
@@ -30,6 +30,8 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Mesh_3/global_parameters.h>
 #include <CGAL/Mesh_3/Robust_intersection_traits_3.h>
 
@@ -910,5 +912,6 @@ Is_in_domain::operator()(const Point_3& p) const
 
 }  // end namespace CGAL
 
-
+#include <CGAL/enable_warnings.h>
+  
 #endif // POLYHEDRAL_MESH_TRAITS_3_H_
diff --git a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
index 9d2e05f04c9..994b347da8f 100644
--- a/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
+++ b/Mesh_3/include/CGAL/Polyhedral_mesh_domain_with_features_3.h
@@ -30,6 +30,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 
@@ -602,5 +603,6 @@ add_featured_edges_to_graph(const Polyhedron& p,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_POLYHEDRAL_MESH_DOMAIN_WITH_FEATURES_3_H
diff --git a/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h b/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h
index f52b95b2132..8eee712d970 100644
--- a/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h
+++ b/Mesh_3/include/CGAL/internal/Mesh_3/Handle_IO_for_pair_of_int.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <utility>
 #include <CGAL/Mesh_3/io_signature.h>
@@ -105,4 +106,6 @@ public:
 };
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_INTERNAL_MESH_3_INTERNAL_HANDLE_IO_FOR_PAIR_OF_INT_H
diff --git a/Mesh_3/include/CGAL/make_mesh_3.h b/Mesh_3/include/CGAL/make_mesh_3.h
index 078e201c3b4..4ab9b5ec5f1 100644
--- a/Mesh_3/include/CGAL/make_mesh_3.h
+++ b/Mesh_3/include/CGAL/make_mesh_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Mesh_3/config.h>
 #include <CGAL/Mesh_3/global_parameters.h>
@@ -480,5 +481,6 @@ void make_mesh_3_impl(C3T3& c3t3,
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_MAKE_MESH_3_H
diff --git a/Mesh_3/include/CGAL/refine_mesh_3.h b/Mesh_3/include/CGAL/refine_mesh_3.h
index dcfe1d6565e..c96792e7dd7 100644
--- a/Mesh_3/include/CGAL/refine_mesh_3.h
+++ b/Mesh_3/include/CGAL/refine_mesh_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/config.h>
 #include <CGAL/Mesh_3/config.h>
@@ -581,5 +582,6 @@ void refine_mesh_3_impl(C3T3& c3t3,
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_REFINE_MESH_3_H
diff --git a/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h b/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
index 067ac651d14..d2d2089ae13 100644
--- a/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
+++ b/Mesh_3/include/CGAL/remove_far_points_in_mesh_3.h
@@ -28,6 +28,7 @@
 
 #include <CGAL/license/Mesh_3.h>
 
+#include <CGAL/disable_warnings.h>
 
 namespace CGAL {
   
@@ -91,4 +92,6 @@ remove_far_points_in_mesh_3(C3T3& c3t3)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_REMOVE_FAR_POINTS_IN_MESH_3_H
diff --git a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp b/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
index 68099de91f1..d6cd39136df 100644
--- a/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
+++ b/Mesh_3/test/Mesh_3/test_c3t3_io.cpp
@@ -8,6 +8,8 @@
 
 #include <string>
 
+#include <CGAL/disable_warnings.h>
+
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
 
 //
diff --git a/Mesh_3/test/Mesh_3/test_meshing_implicit_function.cpp b/Mesh_3/test/Mesh_3/test_meshing_implicit_function.cpp
index 807c96d3d87..28ce9021278 100644
--- a/Mesh_3/test/Mesh_3/test_meshing_implicit_function.cpp
+++ b/Mesh_3/test/Mesh_3/test_meshing_implicit_function.cpp
@@ -26,6 +26,8 @@
 #include "test_meshing_utilities.h"
 #include <CGAL/Implicit_mesh_domain_3.h>
 
+#include <CGAL/disable_warnings.h>
+
 template <typename K, typename Concurrency_tag = CGAL::Sequential_tag>
 struct Implicit_tester : public Tester<K>
 {
diff --git a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
index cec7c8cfde2..77d2021187d 100644
--- a/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
+++ b/Mesh_3/test/Mesh_3/test_meshing_polyhedron.cpp
@@ -33,6 +33,8 @@
 
 #include <CGAL/Mesh_3/Dump_c3t3.h>
 
+#include <CGAL/disable_warnings.h>
+
 template <typename K, typename Concurrency_tag = CGAL::Sequential_tag>
 struct Polyhedron_tester : public Tester<K>
 {
diff --git a/Mesh_3/test/Mesh_3/test_meshing_utilities.h b/Mesh_3/test/Mesh_3/test_meshing_utilities.h
index c2d79bedce8..1cca6130d1b 100644
--- a/Mesh_3/test/Mesh_3/test_meshing_utilities.h
+++ b/Mesh_3/test/Mesh_3/test_meshing_utilities.h
@@ -41,6 +41,8 @@
 #include <CGAL/AABB_tree.h>
 #include <CGAL/AABB_traits.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <limits>
 #include <vector>
 #include <boost/optional/optional_io.hpp>
@@ -422,4 +424,6 @@ struct Tester
   }
 };
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_TEST_TEST_MESHING_UTILITIES
diff --git a/Mesh_3/test/Mesh_3/test_utilities.h b/Mesh_3/test/Mesh_3/test_utilities.h
index ba515d69669..39189ca5708 100644
--- a/Mesh_3/test/Mesh_3/test_utilities.h
+++ b/Mesh_3/test/Mesh_3/test_utilities.h
@@ -32,7 +32,8 @@
 
 #include <CGAL/Mesh_triangulation_3.h>
 #include <CGAL/Mesh_complex_3_in_triangulation_3.h>
-#include <CGAL/Mesh_complex_3_in_triangulation_3.h>
+
+#include <CGAL/disable_warnings.h>
 
 typedef CGAL::Exact_predicates_inexact_constructions_kernel K_e_i;
 typedef CGAL::Exact_predicates_exact_constructions_kernel K_e_e;
@@ -54,4 +55,6 @@ public:
 } // end namespace details
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_3_TEST_TEST_UTILITIES_H
diff --git a/Mesher_level/include/CGAL/Mesher_level_default_implementations.h b/Mesher_level/include/CGAL/Mesher_level_default_implementations.h
index 72221325a2d..f4c8f7666f5 100644
--- a/Mesher_level/include/CGAL/Mesher_level_default_implementations.h
+++ b/Mesher_level/include/CGAL/Mesher_level_default_implementations.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H
 #define CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Mesher_level.h>
 
 namespace CGAL {
@@ -136,4 +138,6 @@ struct No_before_conflicts {
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESHER_LEVEL_DEFAULT_IMPLEMENTATIONS_H
diff --git a/Mesher_level/include/CGAL/Mesher_level_visitors.h b/Mesher_level/include/CGAL/Mesher_level_visitors.h
index 67f239cdd00..091ba40df38 100644
--- a/Mesher_level/include/CGAL/Mesher_level_visitors.h
+++ b/Mesher_level/include/CGAL/Mesher_level_visitors.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_MESHER_LEVEL_VISITORS_H
 #define CGAL_MESHER_LEVEL_VISITORS_H
 
+#include <CGAL/disable_warnings.h>
+
 namespace CGAL {
 
 template <typename Previous_level>
@@ -127,4 +129,6 @@ struct Combine_mesh_visitor {
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESHER_LEVEL_VISITORS_H
diff --git a/Mesher_level/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h b/Mesher_level/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
index 3565f5b7d5a..112dc01d300 100644
--- a/Mesher_level/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
+++ b/Mesher_level/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
@@ -21,6 +21,8 @@
 #ifndef CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
 #define CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <vector>
 #include <CGAL/Mesher_level.h>
 #include <CGAL/Mesher_level_default_implementations.h>
@@ -141,4 +143,6 @@ struct Triangulation_mesher_level_traits_3 :
 
 } // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H