diff --git a/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
index 648cc3ab572..83e01c72d6c 100644
--- a/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/AABB_primitive.h>
 #include <CGAL/boost/graph/property_maps.h>
@@ -178,5 +179,7 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_AABB_FACE_GRAPH_TRIANGLE_PRIMITIVE_H
 
diff --git a/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h b/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
index 38a7b187e9d..1a0dc4eb616 100644
--- a/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_halfedge_graph_segment_primitive.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/AABB_primitive.h>
 #include <CGAL/boost/graph/property_maps.h>
@@ -190,6 +191,7 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_HALFEDGE_GRAPH_SEGMENT_PRIMITIVE_H
 
diff --git a/AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h
index a2783046779..85798d83374 100644
--- a/AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_polyhedron_segment_primitive.h
@@ -29,6 +29,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_segment_primitive.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_halfedge_graph_segment_primitive.h>"
@@ -162,5 +163,6 @@ namespace CGAL {
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_POLYHEDRON_SEGMENT_PRIMITIVE_H_
diff --git a/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
index 377995c0648..363a718c03f 100644
--- a/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_polyhedron_triangle_primitive.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/AABB_polyhedron_triangle_primitive.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/AABB_face_graph_triangle_primitive.h>"
@@ -158,5 +159,6 @@ namespace CGAL {
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_POLYHEDRON_TRIANGLE_PRIMITIVE_H_
diff --git a/AABB_tree/include/CGAL/AABB_primitive.h b/AABB_tree/include/CGAL/AABB_primitive.h
index 9bfa88a306e..34a6ec4a737 100644
--- a/AABB_tree/include/CGAL/AABB_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_primitive.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h>
 #include <CGAL/property_map.h>
@@ -231,6 +232,7 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_PRIMITIVE_H
 
diff --git a/AABB_tree/include/CGAL/AABB_segment_primitive.h b/AABB_tree/include/CGAL/AABB_segment_primitive.h
index 03d1b6ac4de..00618eafd34 100644
--- a/AABB_tree/include/CGAL/AABB_segment_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_segment_primitive.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/AABB_primitive.h>
 #include <CGAL/result_of.h>
@@ -102,6 +103,7 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_SEGMENT_PRIMITIVE_H_
 
diff --git a/AABB_tree/include/CGAL/AABB_tree.h b/AABB_tree/include/CGAL/AABB_tree.h
index 79df2ecdb7b..7ef32c172ab 100644
--- a/AABB_tree/include/CGAL/AABB_tree.h
+++ b/AABB_tree/include/CGAL/AABB_tree.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <vector>
 #include <iterator>
@@ -1282,6 +1283,7 @@ public:
 
 #include <CGAL/internal/AABB_tree/AABB_ray_intersection.h>
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_TREE_H
 
diff --git a/AABB_tree/include/CGAL/AABB_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangle_primitive.h
index 1c301ae0afd..4b2035e00f4 100644
--- a/AABB_tree/include/CGAL/AABB_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_triangle_primitive.h
@@ -26,6 +26,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/AABB_primitive.h>
 #include <CGAL/result_of.h>
@@ -102,6 +103,7 @@ public:
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // CGAL_AABB_TRIANGLE_PRIMITIVE_H_
 
diff --git a/AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h
index e0b9ef64854..96f4b305f28 100644
--- a/AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_triangulation_3_triangle_primitive.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/AABB_tree.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
@@ -119,5 +120,6 @@ namespace CGAL {
 
 }  // end namespace CGAL
 
+#include <CGAL/enable_warnings.h>
 
 #endif // AABB_TRIANGULATION_3_TRIANGLE_PRIMITIVE_H_
diff --git a/AABB_tree/test/AABB_tree/AABB_test_util.h b/AABB_tree/test/AABB_tree/AABB_test_util.h
index 94d47513a42..55eeb4d84c8 100644
--- a/AABB_tree/test/AABB_tree/AABB_test_util.h
+++ b/AABB_tree/test/AABB_tree/AABB_test_util.h
@@ -30,6 +30,9 @@
 #include <CGAL/AABB_face_graph_triangle_primitive.h>
 #include <CGAL/AABB_halfedge_graph_segment_primitive.h>
 #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
+
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/internal/AABB_tree/Primitive_helper.h>
 #include <CGAL/use.h>
 
@@ -870,3 +873,5 @@ private:
   mutable double m_naive_time;
   mutable double m_tree_time;
 };
+
+#include <CGAL/enable_warnings.h>
diff --git a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h
index a4f62f339fc..7584aac800b 100644
--- a/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h
+++ b/Intersections_3/include/CGAL/internal/Intersections_3/Bbox_3_Triangle_3_do_intersect.h
@@ -26,6 +26,8 @@
 #include <CGAL/Triangle_3.h>
 #include <CGAL/Bbox_3.h>
 
+#include <CGAL/disable_warnings.h>
+
 // Fast Triangle-Cuboid intersection test, following Tomas Akenine-Moeller description.
 // The code looks slightly different from his code because we avoid the translation at
 // a minimal cost (and we use C++ ;).
@@ -96,6 +98,9 @@ namespace internal {
     typename K::Point_3& p_min,
     typename K::Point_3& p_max)
   {
+    CGAL_USE(px);
+    CGAL_USE(py);
+    CGAL_USE(pz);
     if(AXE == 0 || px > 0) {
       if(AXE == 1 || py > 0) {
         if(AXE == 2 || pz > 0) {
@@ -399,4 +404,6 @@ bool do_intersect(const Triangle_3<K>& a,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif  // CGAL_INTERNAL_INTERSECTIONS_3_BBOX_3_TRIANGLE_3_DO_INTERSECT_H