diff --git a/Generator/include/CGAL/generators.h b/Generator/include/CGAL/generators.h
index 07554b3837c..d38fe2ed1c7 100644
--- a/Generator/include/CGAL/generators.h
+++ b/Generator/include/CGAL/generators.h
@@ -26,6 +26,8 @@
 #ifndef CGAL_GENERATORS_H
 #define CGAL_GENERATORS_H 1
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <cstddef>
 #include <cmath>
@@ -107,5 +109,8 @@ class Random_double_in_interval : public Random_generator_base<double> {
 };
 
 } //namespace CGAL
+
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_GENERATORS_H //
 // EOF //
diff --git a/Generator/include/CGAL/point_generators_2.h b/Generator/include/CGAL/point_generators_2.h
index 0a667e74945..8bd30438268 100644
--- a/Generator/include/CGAL/point_generators_2.h
+++ b/Generator/include/CGAL/point_generators_2.h
@@ -29,6 +29,9 @@
 
 #ifndef CGAL_POINT_GENERATORS_2_H
 #define CGAL_POINT_GENERATORS_2_H 1
+
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/generators.h>
 #include <iterator>
 #include <CGAL/number_type_basic.h>
@@ -664,5 +667,7 @@ struct Random_points_in_triangles_2
 };
 
 } //namespace CGAL
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_POINT_GENERATORS_2_H //
 // EOF //
diff --git a/Installation/include/CGAL/disable_warnings.h b/Installation/include/CGAL/disable_warnings.h
index f089bd56214..ead4cca6320 100644
--- a/Installation/include/CGAL/disable_warnings.h
+++ b/Installation/include/CGAL/disable_warnings.h
@@ -21,7 +21,9 @@
 
 #if defined(BOOST_MSVC)
 #  pragma warning(push)
+#  pragma warning(disable: 4099) // struct class mixed
 #  pragma warning(disable: 4127) // conditional expression is constant
+#  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
 #  pragma warning(disable: 4610) // can never be instantiated - user defined constructor required
diff --git a/Number_types/test/Number_types/Sqrt_extension.h b/Number_types/test/Number_types/Sqrt_extension.h
index d8c3a942e20..9fc07829464 100644
--- a/Number_types/test/Number_types/Sqrt_extension.h
+++ b/Number_types/test/Number_types/Sqrt_extension.h
@@ -747,3 +747,4 @@ void test_nt_converter()
   Source s;
   Target t=converter(s);
 }
+
diff --git a/Profiling_tools/include/CGAL/Profile_timer.h b/Profiling_tools/include/CGAL/Profile_timer.h
index d27296eacc2..37fc062b437 100644
--- a/Profiling_tools/include/CGAL/Profile_timer.h
+++ b/Profiling_tools/include/CGAL/Profile_timer.h
@@ -41,6 +41,8 @@
 #include <string>
 #include <CGAL/Timer.h>
 
+#include <CGAL/disable_warnings.h>
+
 namespace CGAL {
 
 struct Profile_timer
@@ -78,4 +80,6 @@ private:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_PROFILE_TIMER_H
diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h
index 1b6cf7b39fb..a8d2352f737 100644
--- a/STL_Extension/include/CGAL/Compact_container.h
+++ b/STL_Extension/include/CGAL/Compact_container.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_COMPACT_CONTAINER_H
 #define CGAL_COMPACT_CONTAINER_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/config.h>
 #include <CGAL/Default.h>
 
@@ -1282,11 +1284,6 @@ namespace internal {
 
 namespace std {
 
-#if defined(BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning(disable:4099) // For VC10 it is class hash
-#endif
-
 #ifndef CGAL_CFG_NO_STD_HASH
 
   template < class DSC, bool Const >
@@ -1300,10 +1297,9 @@ namespace std {
   };
 #endif // CGAL_CFG_NO_STD_HASH
 
-#if defined(BOOST_MSVC)
-#  pragma warning(pop)
-#endif
 
 } // namespace std
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_COMPACT_CONTAINER_H
diff --git a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h
index 8a1aae9b876..d3c0e476dc8 100644
--- a/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h
+++ b/Spatial_sorting/include/CGAL/Spatial_sort_traits_adapter_2.h
@@ -22,6 +22,8 @@
 #ifndef CGAL_SPATIAL_SORT_TRAITS_ADAPTER_2_H
 #define CGAL_SPATIAL_SORT_TRAITS_ADAPTER_2_H
 
+#include <CGAL/disable_warnings.h>
+
 #include <boost/call_traits.hpp>
 
 #include <CGAL/property_map.h>
@@ -71,4 +73,6 @@ public:
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_SPATIAL_SORT_TRAITS_ADAPTER_2_H
diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
index 1a11c13179b..cc4a6e07556 100644
--- a/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_triangulation_2.h
@@ -25,6 +25,7 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <set>
 
@@ -493,6 +494,9 @@ public:
     std::ptrdiff_t insert(InputIterator first, InputIterator last) 
 #endif
     {
+#if defined(_MSC_VER)
+      CGAL_USE(i);
+#endif      
       size_type n = number_of_vertices(); 
 
       std::vector<Point> points (first, last);
@@ -1503,4 +1507,6 @@ limit_intersection(const Gt& gt,
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_CONSTRAINED_TRIANGULATION_2_H
diff --git a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
index 0f98f9c67d4..d7bf3ef16d1 100644
--- a/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
+++ b/Triangulation_2/include/CGAL/Constrained_triangulation_plus_2.h
@@ -24,6 +24,7 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
+#include <CGAL/disable_warnings.h>
 
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Polygon_2.h>
@@ -41,11 +42,6 @@
 #include <boost/container/flat_set.hpp>
 #endif
 
-#if defined(BOOST_MSVC)
-#  pragma warning(push)
-#  pragma warning(disable:4355)
-//warning C4355: 'this' : used in base member initializer list
-#endif
 
 namespace CGAL {
 
@@ -880,6 +876,9 @@ public:
     std::ptrdiff_t insert(InputIterator first, InputIterator last) 
 #endif
   {
+#if defined(_MSC_VER)
+    CGAL_USE(i);
+#endif
     size_type n = this->number_of_vertices();
 
     std::vector<Point> points (first, last);
@@ -1247,7 +1246,6 @@ points_in_constraint_end(Constraint_id cid) const
 
 } //namespace CGAL
 
-#if defined(BOOST_MSVC)
-#  pragma warning(pop)
-#endif
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_CONSTRAINED_TRIANGULATION_PLUS_2_H
diff --git a/Triangulation_2/include/CGAL/Triangulation_2.h b/Triangulation_2/include/CGAL/Triangulation_2.h
index 36e6e56cf69..d587d8eff5e 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <list>
 #include <vector>
 #include <map>
@@ -3653,4 +3655,6 @@ operator>>(std::istream& is, Triangulation_2<Gt, Tds> &tr)
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif //CGAL_TRIANGULATION_2_H
diff --git a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h
index 12f0d5c2149..fd5521c6593 100644
--- a/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h
+++ b/Triangulation_2/include/CGAL/Triangulation_hierarchy_2.h
@@ -25,6 +25,8 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
+#include <CGAL/disable_warnings.h>
+
 #include <CGAL/basic.h>
 #include <CGAL/internal/Has_nested_type_Bare_point.h>
 #include <CGAL/Triangulation_hierarchy_vertex_base_2.h>
@@ -779,4 +781,6 @@ random_level()
 
 } //namespace CGAL
 
+#include <CGAL/enable_warnings.h>
+
 #endif // CGAL_TRIANGULATION_HIERARCHY_2_H