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 8686132cc41..23caa591c00 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
@@ -90,10 +90,10 @@ public:
   typedef typename Gt_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Gt_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value);
-  static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value);
-  static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value);
-  static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value);
   //@}
 
   /*! \struct
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 b20d647d7db..b55a01b016c 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
@@ -91,14 +91,14 @@ public:
   typedef typename Gt_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Gt_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Left_side_category, Arr_identified_side_tag >::value);
-  static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Bottom_side_category, Arr_contracted_side_tag >::value);
-  static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Top_side_category, Arr_contracted_side_tag >::value);
-  static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Right_side_category, Arr_identified_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Left_side_category, Arr_identified_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Bottom_side_category, Arr_contracted_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Top_side_category, Arr_contracted_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Right_side_category, Arr_identified_side_tag >::value);
   //@}
 
   /*! \struct
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 1d511b9fab3..8d4ac032993 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
@@ -87,14 +87,14 @@ public:
   typedef typename Gt_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Gt_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Left_side_category, Arr_open_side_tag >::value);
-  static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
-  static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag>::value ||
-                std::is_same< Top_side_category, Arr_open_side_tag >::value);
-  static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Right_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Left_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag>::value ||
+                        std::is_same< Top_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Right_side_category, Arr_open_side_tag >::value);
   //@}
 
   /*! \struct
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 8d6cd8cffff..88a47dd3a17 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
@@ -79,10 +79,10 @@ public:
   typedef typename Traits_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Traits_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(Arr_sane_identified_tagging<Left_side_category,
-                Bottom_side_category,
-                Top_side_category,
-                Right_side_category>::value);
+  CGAL_static_assertion(Arr_sane_identified_tagging<Left_side_category,
+                        Bottom_side_category,
+                        Top_side_category,
+                        Right_side_category>::value);
 
 public:
   typedef Arrangement_on_surface_2<Geometry_traits_2, Topology_traits>
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 3a0f499de77..7f99e1d822c 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arrangement_zone_2.h
@@ -67,10 +67,10 @@ protected:
   typedef typename Traits_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Traits_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(Arr_sane_identified_tagging<Left_side_category,
-                                            Bottom_side_category,
-                                            Top_side_category,
-                                            Right_side_category>::value);
+  CGAL_static_assertion(Arr_sane_identified_tagging<Left_side_category,
+                                                    Bottom_side_category,
+                                                    Top_side_category,
+                                                    Right_side_category>::value);
 
 public:
   typedef ZoneVisitor_                                   Visitor;
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
index 3baa124ab17..f6071e12ed9 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_agg_meta_traits.h
@@ -123,14 +123,14 @@ public:
   typedef typename Arr::Right_side_category     Right_side_category;
 
   // a side is either oblivious or open (unbounded)
-  static_assert(std::is_same<Left_side_category, Arr_oblivious_side_tag>::value ||
-                std::is_same<Left_side_category, Arr_open_side_tag>::value);
-  static_assert(std::is_same<Bottom_side_category, Arr_oblivious_side_tag>::value ||
-                std::is_same<Bottom_side_category, Arr_open_side_tag>::value);
-  static_assert(std::is_same<Top_side_category, Arr_oblivious_side_tag>::value ||
-                std::is_same<Top_side_category, Arr_open_side_tag> >::value);
-  static_assert(std::is_same<Right_side_category, Arr_oblivious_side_tag>::value ||
-                std::is_same<Right_side_category, Arr_open_side_tag>::value);
+  CGAL_static_assertion(std::is_same<Left_side_category, Arr_oblivious_side_tag>::value ||
+                        std::is_same<Left_side_category, Arr_open_side_tag>::value);
+  CGAL_static_assertion(std::is_same<Bottom_side_category, Arr_oblivious_side_tag>::value ||
+                        std::is_same<Bottom_side_category, Arr_open_side_tag>::value);
+  CGAL_static_assertion(std::is_same<Top_side_category, Arr_oblivious_side_tag>::value ||
+                        std::is_same<Top_side_category, Arr_open_side_tag> >::value);
+  CGAL_static_assertion(std::is_same<Right_side_category, Arr_oblivious_side_tag>::value ||
+                        std::is_same<Right_side_category, Arr_open_side_tag>::value);
 
   typedef typename Arr::Halfedge_handle         Halfedge_handle;
   typedef typename Arr::Vertex_handle           Vertex_handle;
diff --git a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
index 1868fb93e41..3a1f3c552e8 100644
--- a/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
+++ b/Boolean_set_operations_2/include/CGAL/Boolean_set_operations_2/Gps_traits_decorator.h
@@ -53,14 +53,14 @@ public:
   typedef typename Base::Right_side_category       Right_side_category;
 
   // a side is either oblivious or open (unbounded)
-  static_assert(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Left_side_category, Arr_open_side_tag >::value);
-  static_assert(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
-  static_assert(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Top_side_category, Arr_open_side_tag > >::value);
-  static_assert(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
-                std::is_same< Right_side_category, Arr_open_side_tag > >::value);
+  CGAL_static_assertion(std::is_same< Left_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Left_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Bottom_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Bottom_side_category, Arr_open_side_tag >::value);
+  CGAL_static_assertion(std::is_same< Top_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Top_side_category, Arr_open_side_tag > >::value);
+  CGAL_static_assertion(std::is_same< Right_side_category, Arr_oblivious_side_tag >::value ||
+                        std::is_same< Right_side_category, Arr_open_side_tag > >::value);
 
   class Ex_point_2
   {
diff --git a/STL_Extension/test/STL_Extension/test_Boolean_tag.cpp b/STL_Extension/test/STL_Extension/test_Boolean_tag.cpp
index f23d6244ba3..55784a0995c 100644
--- a/STL_Extension/test/STL_Extension/test_Boolean_tag.cpp
+++ b/STL_Extension/test/STL_Extension/test_Boolean_tag.cpp
@@ -10,14 +10,14 @@ using CGAL::Tag_true;
 using CGAL::Tag_false;
 
 int main() {
-  static_assert(is_same< Tag_true::value_type, bool >::value);
-  static_assert(is_same< Tag_true::type, Tag_true >::value);
-  static_assert(Tag_true::value== true);
+  CGAL_static_assertion(is_same< Tag_true::value_type, bool >::value);
+  CGAL_static_assertion(is_same< Tag_true::type, Tag_true >::value);
+  CGAL_static_assertion(Tag_true::value== true);
   assert( Tag_true() == true );
 
-  static_assert(is_same< Tag_false::value_type, bool >::value);
-  static_assert(is_same< Tag_false::type, Tag_false >::value);
-  static_assert(Tag_false::value == false);
+  CGAL_static_assertion(is_same< Tag_false::value_type, bool >::value);
+  CGAL_static_assertion(is_same< Tag_false::type, Tag_false >::value);
+  CGAL_static_assertion(Tag_false::value == false);
   assert( Tag_false() == false );
 
   return 0;
diff --git a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h
index 7ba7d621262..729bc1d98ba 100644
--- a/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h
+++ b/Surface_sweep_2/include/CGAL/No_intersection_surface_sweep_2.h
@@ -129,8 +129,8 @@ public:
   typedef typename Traits_adaptor_2::Top_side_category    Top_side_category;
   typedef typename Traits_adaptor_2::Right_side_category  Right_side_category;
 
-  static_assert(Arr_sane_identified_tagging< Left_side_category, Bottom_side_category,
-                  Top_side_category, Right_side_category >::value);
+  CGAL_static_assertion(Arr_sane_identified_tagging< Left_side_category, Bottom_side_category,
+                          Top_side_category, Right_side_category >::value);
 
 protected:
   /*!