diff --git a/Box_intersection_d/include/CGAL/box_intersection_d.h b/Box_intersection_d/include/CGAL/box_intersection_d.h
index 1a638b5804b..4058085cd96 100644
--- a/Box_intersection_d/include/CGAL/box_intersection_d.h
+++ b/Box_intersection_d/include/CGAL/box_intersection_d.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Box_intersection_d.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/Box_intersection_d/segment_tree.h>
 #include <CGAL/Box_intersection_d/Box_d.h>
@@ -398,4 +399,6 @@ void box_self_intersection_all_pairs_d(
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif
diff --git a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h
index 56fc0129092..161704f638f 100644
--- a/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h
+++ b/HalfedgeDS/include/CGAL/halfedgeDS_cut_component.h
@@ -29,6 +29,8 @@
 #ifndef CGAL_HALFEDGEDS_CUT_COMPONENT_H
 #define CGAL_HALFEDGEDS_CUT_COMPONENT_H 1
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <CGAL/HalfedgeDS_decorator.h>
 
@@ -150,5 +152,8 @@ halfedgeDS_cut_component( HDS&                           hds,
 }   
 
 } //namespace CGAL
+
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_HALFEDGEDS_CUT_COMPONENT_H //
 // EOF //
diff --git a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h
index f9ac9b28f29..ef71376a8ca 100644
--- a/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h
+++ b/Polyhedron/include/CGAL/Polyhedron_incremental_builder_3.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Polyhedron.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/Random_access_adaptor.h>
@@ -915,5 +916,7 @@ remove_unconnected_vertices( Tag_true) {
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POLYHEDRON_INCREMENTAL_BUILDER_3_H //
 // EOF //
diff --git a/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h b/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h
index c79e98ecce1..153d5b2eac3 100644
--- a/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h
+++ b/Polyhedron/include/CGAL/polyhedron_cut_plane_3.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/Polyhedron.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/Kernel_traits.h>
@@ -153,5 +154,8 @@ polyhedron_cut_plane_3( Poly& poly,
 }
 
 } //namespace CGAL
+
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POLYHEDRON_CUT_PLANE_3_H //
 // EOF //
diff --git a/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h b/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h
index 02f2833b727..5c27930709d 100644
--- a/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h
+++ b/Polyhedron_IO/include/CGAL/IO/Polyhedron_scan_OFF.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Polyhedron.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/IO/File_header_OFF.h>
@@ -151,5 +152,8 @@ Polyhedron_scan_OFF<HDS>:: operator()( HDS& target) {
 }
 
 } //namespace CGAL
+
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_IO_POLYHEDRON_SCAN_OFF_H //
 // EOF //
diff --git a/STL_Extension/include/CGAL/In_place_list.h b/STL_Extension/include/CGAL/In_place_list.h
index ccc514b85a0..47f82f39cd3 100644
--- a/STL_Extension/include/CGAL/In_place_list.h
+++ b/STL_Extension/include/CGAL/In_place_list.h
@@ -28,6 +28,8 @@
 #ifndef CGAL_IN_PLACE_LIST_H
 #define CGAL_IN_PLACE_LIST_H 1
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <cstddef>
 #include <iterator>
@@ -810,4 +812,6 @@ namespace std {
 
 } // namespace std
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_IN_PLACE_LIST_H