diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h
index 4b2eba5998d..7fa3d16d65b 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Algebraic_real_rep.h
@@ -27,6 +27,8 @@
 #ifndef CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
 #define CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <CGAL/Polynomial_type_generator.h>
 #include <CGAL/Polynomial_traits_d.h>
@@ -524,4 +526,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_ALGEBRAIC_KERNEL_D_ALGEBRAIC_REAL_REP_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h
index c092c3e4781..b52e4299e47 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_Bezier_curve_traits_2.h
@@ -24,7 +24,7 @@
 #define CGAL_ARR_BEZIER_CURVE_TRAITS_2_H
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
-
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_Bezier_curve_traits_2 class.
@@ -881,4 +881,5 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
index 95f52e13f2d..effec887209 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_algebraic_segment_traits_2.h
@@ -24,6 +24,8 @@
 #ifndef CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
 #define CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/config.h>
 
 #include <CGAL/Algebraic_kernel_d/flags.h>
@@ -657,4 +659,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_ARR_ALGEBRAIC_SEGMENT_TRAITS
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
index b842d1f0ba9..d73aa50113b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_batched_point_location.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Arrangement_on_surface_2.h>
 #include <CGAL/No_intersection_surface_sweep_2.h>
 #include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@@ -145,4 +147,6 @@ locate(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
index db406ce7471..bda5c76ac68 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_bounded_planar_topology_traits_2.h
@@ -26,6 +26,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  *
  * Definition of the Arr_bounded_planar_topology_traits_2<GeomTraits> class.
@@ -551,4 +553,6 @@ public:
 
 #include <CGAL/Arr_topology_traits/Arr_bounded_planar_topology_traits_2_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h
index c7578731a16..bdbd53d20a4 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_circle_segment_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The header file for the Arr_circle_segment_traits_2<Kenrel> class.
@@ -749,4 +750,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
index a1f2345716f..84d87759842 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_circular_arc_traits_2.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * This file was developed at Inria, France, and copied over to the
@@ -180,4 +181,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_CIRCULAR_KERNEL_CIRCULAR_ARC_TRAITS_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h
index 42e816756bb..463588b9b1f 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_circular_line_arc_traits_2.h
@@ -29,6 +29,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * This file was developed at Inria, France, and copied over to the
@@ -620,4 +622,6 @@ namespace CGAL {
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_CIRCULAR_KERNEL_VARIANT_TRAITS_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
index 15375234466..69e7e29b755 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_conic_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The conic traits-class for the arrangement package.
@@ -875,5 +876,7 @@ public:
   //@}
 };
 
+#include <CGAL/enable_warnings.h>
+
 } //namespace CGAL
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h
index 021be56c98c..6f3c5cc106d 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_consolidated_curve_data_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_consolidated_curve_data_traits_2<Traits,Data> class.
@@ -99,4 +100,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
index 39a7d71acc2..1ca8328129a 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_counting_traits_2.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * A counting traits-class for the arrangement package.
@@ -1066,4 +1067,6 @@ Out_stream& operator<<(Out_stream& os,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h
index b8b5ab5c530..73c2e53e6c2 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_curve_data_traits_2.h
@@ -24,6 +24,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  * Definition of the Arr_curve_data_traits_2<> class template.
  */
@@ -441,4 +443,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h
index 4a8ed9f327c..dd620de73e9 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The definition of the base DCEL class for planar arrangements and its
@@ -1459,4 +1460,6 @@ protected:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h b/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h
index f85574e4e04..6ff5b89a702 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_default_dcel.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The definition of the Arr_default_dcel<Traits> class.
@@ -67,4 +68,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h b/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
index 15a73425737..03811b5f78b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_default_overlay_traits.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  *
  * Definition of default overlay-traits classes.
@@ -91,4 +93,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_directional_non_caching_segment_basic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_directional_non_caching_segment_basic_traits_2.h
index 9432272dad4..89cf0732b4f 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_directional_non_caching_segment_basic_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_directional_non_caching_segment_basic_traits_2.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Arr_non_caching_segment_basic_traits_2.h>
 
@@ -154,4 +155,6 @@ public:
 
 }
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_enums.h b/Arrangement_on_surface_2/include/CGAL/Arr_enums.h
index 773ca21fb44..97d0eee0fc1 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_enums.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_enums.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the enumeration types for the arrangement package.
@@ -216,4 +217,6 @@ InputStream& operator>>(
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h b/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h
index 418a3c22152..a2075678328 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_extended_dcel.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The definition of the extended DCEL classes.
@@ -285,4 +286,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_face_index_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_face_index_map.h
index 71c387c2874..82c0582372a 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_face_index_map.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_face_index_map.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_face_index_map<Arrangement> class.
@@ -278,4 +279,6 @@ unsigned int get (const CGAL::Arr_face_index_map<Arrangement>& index_map,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
index 7ea72a35bd3..c9eeead641f 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_partition_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The partition traits class for geodesic arcs on the sphere enables 
@@ -616,4 +617,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif  // CGAL_ARR_GEODESIC_ARC_ON_SPHERE_PARTITION_TRAITS_2_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
index 6587512b759..a1d2e8524fa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_geodesic_arc_on_sphere_traits_2.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 // #define CGAL_FULL_X_MONOTONE_GEODESIC_ARC_ON_SPHERE_IS_SUPPORTED 1
 
@@ -3255,4 +3256,5 @@ operator>>(InputStream& is,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h
index c6cf7b83af1..6a38a2474b2 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_landmarks_point_location.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_landmarks_point_location<Arrangement> template.
@@ -318,4 +319,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_landmarks_pl_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
index 23db01a9417..4c198686042 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_line_arc_traits_2.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * This file was developed at Inria, France, and copied over to the
@@ -128,4 +129,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_CIRCULAR_KERNEL_LINE_ARC_TRAITS_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
index ea1e037c97d..ecb5c98a70b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_linear_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The traits-class for handling linear objects (lines, rays and segments)
@@ -2026,4 +2027,6 @@ InputStream& operator>> (InputStream& is, Arr_linear_object_2<Kernel>& lobj)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h
index d255763a603..f7b4b665bb3 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_naive_point_location.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Arr_point_location_result.h>
 #include <CGAL/Arrangement_2/Arr_traits_adaptor_2.h>
@@ -120,4 +121,6 @@ public:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_naive_point_location_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h
index de5189f8fd4..6d6f1cd9304 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_basic_traits_2.h
@@ -30,6 +30,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file The basic non-caching segment traits-class for the arrangement
  * package. This traits class handles x-monotone non-intersecting segments.
@@ -282,4 +283,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h
index a8f065fe852..8c0d0475475 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_non_caching_segment_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file The non-caching segment traits-class for the arrangement package.
  * This traits class handles general segments. It is a model of the
@@ -433,4 +434,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_observer.h b/Arrangement_on_surface_2/include/CGAL/Arr_observer.h
index 4ed7287903b..1f2492da4f0 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_observer.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_observer.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Arr_enums.h>
 
@@ -678,4 +679,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
index 0758ae41dd3..adc8a1c29ae 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_overlay_2.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  *
  * Definition of the global Arr_overlay_2() function.
@@ -260,4 +262,6 @@ overlay(const Arrangement_on_surface_2<GeometryTraitsA_2, TopologyTraitsA>& arr1
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_point_location_result.h b/Arrangement_on_surface_2/include/CGAL/Arr_point_location_result.h
index c0cf18c725b..48a440c78fa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_point_location_result.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_point_location_result.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 // The macro CGAL_ARR_POINT_LOCATION_VERSION controls which version of the
 // point location is used. Currently two values are supported:
@@ -118,4 +119,6 @@ struct Arr_point_location_result {
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_basic_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_basic_traits_2.h
index b56f3e38d90..cb2b238c139 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_basic_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_basic_traits_2.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The traits-class for the general piece-wise (polycurve) type of curves of the
@@ -2728,4 +2729,6 @@ protected:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
index 95773584a4e..34c7931e702 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The traits-class for the general piece-wise (polycurve) type of curves of the
@@ -1188,4 +1189,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
index e366f2a44cc..50c2b365ea6 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_polyline_traits_2.h
@@ -27,6 +27,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The traits-class for the linear piece-wiese(polyline) type of curves of the
@@ -608,4 +609,6 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
index 4edc8804d8e..aac79dc26fa 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/assertions.h>
 #include <CGAL/tags.h>
@@ -1315,5 +1316,6 @@ public:
 
 }   //namespace CGAL {
 
+#include <CGAL/enable_warnings.h>
 
 #endif  //CGAL_ARR_RATIONAL_ARC_TRAITS_D_1_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
index cf7a478dc66..a2d3eab19c7 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_segment_traits_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The segment traits-class for the arrangement package.
@@ -1175,5 +1176,6 @@ InputStream& operator>>(InputStream& is, Arr_segment_2<Kernel>& seg)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h
index 416adc2d48a..b6dfc3ecc52 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_simple_point_location.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_simple_point_location<Arrangement> template.
@@ -195,4 +196,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_simple_point_location_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
index 98829dd0fa3..2a0eac365ec 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
@@ -24,6 +24,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  *
  * The topology traits for great spherical arcs embedded on a sphere for the
@@ -668,4 +670,6 @@ protected:
 
 #include <CGAL/Arr_topology_traits/Arr_spherical_topology_traits_2_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
index e255c02a6b9..972ba00c8fc 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/config.h>
 #include <boost/type_traits.hpp>
@@ -646,5 +647,7 @@ public:
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
index afc4d0b3abe..8e6b69a3329 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
@@ -23,6 +23,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * A tracing traits-class for the arrangement package.
@@ -1274,4 +1275,6 @@ OutputStream & operator<<(OutputStream & os, Comparison_result cr)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
index f97bf34abfe..8fcd8f42684 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_trapezoid_ric_point_location.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_trapezoid_ric_point_location<Arrangement> template.
@@ -426,4 +427,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_trapezoid_ric_pl_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
index d96ab406150..6a606cdc2ae 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * Definition of the Arr_triangulation_point_location<Arrangement> template.
@@ -390,4 +392,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_triangulation_pl_functions.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
index ed4f703b667..20f3db2581b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_unb_planar_topology_traits_2.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 /*! \file
  *
  * Definition of the Arr_unb_planar_topology_traits_2<GeomTraits> class.
@@ -594,4 +596,6 @@ protected:
 
 #include <CGAL/Arr_topology_traits/Arr_unb_planar_topology_traits_2_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_index_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_index_map.h
index 5f115dc3943..e2884d39996 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_index_map.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_index_map.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * Definition of the Arr_vertex_index_map<Arrangement> class.
@@ -282,4 +284,6 @@ unsigned int get (const CGAL::Arr_vertex_index_map<Arrangement>& index_map,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
index e242fcd6477..48c8201e8fd 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_vertical_decomposition_2.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Arrangement_on_surface_2.h>
 #include <CGAL/No_intersection_surface_sweep_2.h>
 #include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
@@ -148,4 +150,6 @@ decompose(const Arrangement_on_surface_2<GeometryTraits_2, TopologyTraits>& arr,
 
 } // namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h
index c3b75ec548c..4f5ccf3f8eb 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_walk_along_line_point_location.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the Arr_walk_along_line_point_location<Arrangement> template.
@@ -206,4 +207,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_walk_along_line_pl_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
index 5a986059879..2b266454b9b 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The header file for the Arrangement_2<Traits,Dcel> class.
@@ -255,4 +256,6 @@ protected:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
index 357d4bc9064..5957bf5451e 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_2.h
@@ -31,6 +31,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The header file for the Arrangement_on_surface_2<Traits,Dcel> class.
@@ -3010,4 +3011,5 @@ bool do_intersect(Arrangement_on_surface_2<GeomTraits, TopTraits>& arr,
 #include <CGAL/Arrangement_2/Arrangement_on_surface_2_impl.h>
 #include <CGAL/Arrangement_2/Arrangement_on_surface_2_global.h>
 
+#include <CGAL/enable_warnings.h>
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h
index 0a0544ea8fb..302288e0e21 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_on_surface_with_history_2.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The header file for the Arrangement_on_surface_with_history_2 class.
@@ -995,4 +996,6 @@ overlay (const Arrangement_on_surface_with_history_2<GeomTraits, TopTraits1>&
 // The function definitions can be found under:
 #include <CGAL/Arrangement_2/Arr_on_surface_with_history_2_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h
index 7ae37721419..166f7ffc9ac 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_with_history_2.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * The header file for the Arrangement_with_history_2<Traits,Dcel> class.
@@ -274,4 +275,6 @@ protected:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h b/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
index aea27c8a9fa..c84efe2068c 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
@@ -26,6 +26,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * Defintion of the Arrangement_zone_2 class.
@@ -443,4 +445,6 @@ private:
 // The function definitions can be found under:
 #include <CGAL/Arrangement_2/Arrangement_zone_2_impl.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif
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 30c0fe8a039..fdaaaa3016f 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
@@ -24,6 +24,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * The number-type traits for CORE algebraic numbers.
@@ -621,4 +623,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
index 1fdabf63dd4..0b0b88b5c59 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Arrangement_2.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 
 /*! \file
  * Definition of the specialized boost::graph_traits<Arrangement_2> class.
@@ -610,4 +612,6 @@ edges (const CGAL::Arrangement_on_surface_2<GeomTraits, TopTraits>& arr)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
index a8927c3db2a..dd8a4f14226 100644
--- a/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/graph_traits_Dual_Arrangement_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 /*! \file
  * Definition of the specialized Dual<Arrangement_2> class,
@@ -749,4 +750,6 @@ edges (const CGAL::Dual<CGAL::
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h
index b6958af15fa..765d810c4e0 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Construction_test.h
@@ -14,6 +14,8 @@
 #include "utils.h"
 #include "IO_base_test.h"
 
+#include <CGAL/disable_warnings.h>
+
 /*! Construction test */
 template <typename T_Geom_traits, typename T_Topol_traits>
 class Construction_test :
@@ -675,4 +677,6 @@ bool Construction_test<T_Geom_traits, T_Topol_traits>::perform()
   return true;
 }
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h
index 7607747636b..7089f8c15d6 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/IO_base_test.h
@@ -3,6 +3,7 @@
 
 template <typename GeomTraits_>
 class IO_base_test {
+  IO_base_test<GeomTraits_>& operator=(const IO_base_test<GeomTraits_>&);
 public:
   typedef GeomTraits_                                   Geom_traits;
   typedef typename Geom_traits::Point_2                 Point_2;
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
index bf4b8837a30..23926c2926d 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Point_location_test.h
@@ -17,6 +17,8 @@
 #include <CGAL/Arr_point_location_result.h>
 #include <CGAL/Arr_triangulation_point_location.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include "IO_test.h"
 
 /*! Point location test */
@@ -927,4 +929,6 @@ verify(Variants_vector objs[MAX_NUM_POINT_LOCATION_STRATEGIES],
   return result;
 }
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
index 50a232dd127..0457ad0504f 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_base_test.h
@@ -52,6 +52,7 @@
 
 template <typename Geom_traits_T>
 class Traits_base_test : public IO_test<Geom_traits_T> {
+  Traits_base_test<Geom_traits_T>&  operator=(const Traits_base_test<Geom_traits_T>&);
 protected:
   typedef Geom_traits_T                                 Traits;
   typedef IO_test<Traits>                               Base;
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h
index 6b1941d3134..b035ef73c33 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/Traits_test.h
@@ -24,6 +24,7 @@
 template <typename Geom_traits_T>
 class Traits_test : public Traits_base_test<Geom_traits_T> {
 private:
+  Traits_test<Geom_traits_T>&  operator=(const Traits_test<Geom_traits_T>&);
   typedef Geom_traits_T                                 Traits;
   typedef Traits_base_test<Traits>                      Base;
   typedef typename Base::Enum_type                      Enum_type;
@@ -1456,7 +1457,7 @@ compare_x_at_limit_wrapper_imp(std::istringstream& str_stream,
   std::cout << "Test: compare_x_at_limit( ";
 
   CGAL::Comparison_result real_answer;
-  unsigned int id1, id2;
+  unsigned int id1 = 0, id2 = 0 ;
   // first argument must be a number (either a point or a xcurve)
   str_stream >> id1;
   std::pair<Enum_type, unsigned int> next_input =
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
index 45e19e2b1f1..b3b5f39c226 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/test_rational_function_traits_2.cpp
@@ -29,6 +29,7 @@ typedef Traits_2::Point_2                          Point_2;
 
 template <typename Cmp_object>
 struct Cmp {
+  Cmp<Cmp_object>& operator=(const  Cmp<Cmp_object>&);
   const Cmp_object& m_cmp_object;
   Cmp(const Cmp_object& cmp_object) : m_cmp_object(cmp_object) {}
   bool operator()(const Point_2& p1, const Point_2& p2) const
diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/utils.h b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/utils.h
index 16120183fa6..6fe7467a20f 100644
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/utils.h
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/utils.h
@@ -4,6 +4,8 @@
 #include <CGAL/Arr_enums.h>
 #include <CGAL/Arr_tags.h>
 
+#include <CGAL/disable_warnings.h>
+
 template <typename T_Geom_traits>
 class Point_compare {
 private:
@@ -129,3 +131,5 @@ public:
     return (res == CGAL::SMALLER) ? true : false;
   }
 };
+
+#include <CGAL/enable_warnings.h>
diff --git a/Polynomial/include/CGAL/Polynomial.h b/Polynomial/include/CGAL/Polynomial.h
index f600d49b9d8..0d379d83b06 100644
--- a/Polynomial/include/CGAL/Polynomial.h
+++ b/Polynomial/include/CGAL/Polynomial.h
@@ -34,6 +34,8 @@
 #ifndef CGAL_POLYNOMIAL_H
 #define CGAL_POLYNOMIAL_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <cstdarg>
 #include <cctype>
 #include <vector>
@@ -71,6 +73,8 @@
 #include <CGAL/Polynomial_traits_d.h>
 #include <CGAL/polynomial_utils.h>
 
+#include <CGAL/enable_warnings.h>
+
 #endif  // CGAL_POLYNOMIAL_H
 
 // EOF
diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
index d42e576c009..e4dd712abd6 100644
--- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
+++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
@@ -1416,7 +1416,7 @@ namespace internal {
 
 inline static void swallow(std::istream &is, char d) {
   char c;
-  do c = is.get(); while (isspace(c));
+  do is.get(c); while (isspace(c));
   if (c != d) CGAL_error_msg( "input error: unexpected character in polynomial");
 }
 } // namespace internal
@@ -1435,7 +1435,7 @@ Polynomial<NT> Polynomial<NT>::input_ascii(std::istream &is) {
   internal::Creation_tag TAG;
   Polynomial<NT> p(TAG, degr+1);
 
-  do c = is.get(); while (isspace(c));
+  do is.get(c); while (isspace(c));
   do {
     if (c != '(') CGAL_error_msg( "input error: ( expected");
     is >> CGAL::iformat(i);
@@ -1445,7 +1445,7 @@ Polynomial<NT> Polynomial<NT>::input_ascii(std::istream &is) {
     internal::swallow(is, ',');
     is >> CGAL::iformat(p.coeff(i));
     internal::swallow(is, ')');
-    do c = is.get(); while (isspace(c));
+    do is.get(c); while (isspace(c));
   } while (c != ']');
 
   p.reduce();
diff --git a/Polynomial/include/CGAL/Polynomial_traits_d.h b/Polynomial/include/CGAL/Polynomial_traits_d.h
index 627fc69ef59..a6b83d024b2 100644
--- a/Polynomial/include/CGAL/Polynomial_traits_d.h
+++ b/Polynomial/include/CGAL/Polynomial_traits_d.h
@@ -24,6 +24,8 @@
 #ifndef CGAL_POLYNOMIAL_TRAITS_D_H
 #define CGAL_POLYNOMIAL_TRAITS_D_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <functional>
 #include <list>
@@ -1714,4 +1716,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POLYNOMIAL_TRAITS_D_H
diff --git a/Polynomial/include/CGAL/Polynomial_type_generator.h b/Polynomial/include/CGAL/Polynomial_type_generator.h
index b1963f46e3a..b3f40f66c2e 100644
--- a/Polynomial/include/CGAL/Polynomial_type_generator.h
+++ b/Polynomial/include/CGAL/Polynomial_type_generator.h
@@ -25,6 +25,8 @@
 #ifndef CGAL_POLYNOMIAL_TYPE_GENERATOR_H
 #define CGAL_POLYNOMIAL_TYPE_GENERATOR_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/Polynomial_traits_d.h>
 
 namespace CGAL {
@@ -43,4 +45,6 @@ struct Polynomial_type_generator<T,0>{ typedef T Type; };
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POLYNOMIAL_GENERATOR_H
diff --git a/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h b/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
index ef2a717c128..6386ffeaab3 100644
--- a/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
+++ b/Surface_sweep_2/include/CGAL/Surface_sweep_2/No_overlap_event_base.h
@@ -125,7 +125,7 @@ public:
             Arr_parameter_space ps_x, Arr_parameter_space ps_y)
   {
     m_point = point;
-    m_type = type;
+    m_type = static_cast<char>(type);
     m_ps_x = static_cast<char>(ps_x);
     m_ps_y = static_cast<char>(ps_y);
     m_closed = 1;
@@ -136,9 +136,9 @@ public:
                              Arr_parameter_space ps_x,
                              Arr_parameter_space ps_y)
   {
-    m_type = type;
-    m_ps_x = ps_x;
-    m_ps_y = ps_y;
+    m_type = static_cast<char>(type);
+    m_ps_x = static_cast<char>(ps_x);
+    m_ps_y = static_cast<char>(ps_y);
     m_closed = 0;
   }