diff --git a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
index e6e75beaaff..67c3a2444f7 100644
--- a/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
+++ b/Mesh_3/include/CGAL/Compact_mesh_cell_base_3.h
@@ -28,8 +28,9 @@
 
 #include <CGAL/Mesh_3/config.h>
 
-#include <CGAL/basic.h>
 #include <CGAL/array.h>
+#include <CGAL/assertions.h>
+#include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/internal/Dummy_tds_3.h>
 #include <CGAL/tags.h>
@@ -38,7 +39,6 @@
 #include <CGAL/Regular_triangulation_cell_base_3.h>
 #include <CGAL/Mesh_3/io_signature.h>
 
-#include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 #ifdef CGAL_LINKED_WITH_TBB
@@ -480,8 +480,8 @@ public:
   template<typename GT_>
   const Point_3& weighted_circumcenter(const GT_& gt) const
   {
-    BOOST_STATIC_ASSERT(boost::is_same<Point_3,
-      typename GT_::Construct_weighted_circumcenter_3::result_type>::value);
+    CGAL_static_assertion((boost::is_same<Point_3,
+      typename GT_::Construct_weighted_circumcenter_3::result_type>::value));
     if (weighted_circumcenter_ == NULL) {
       this->try_to_set_circumcenter(
         new Point_3(gt.construct_weighted_circumcenter_3_object()
diff --git a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h
index 5e100ccdf78..018aa4d2f6f 100644
--- a/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h
+++ b/Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h
@@ -26,13 +26,12 @@
 
 #include <CGAL/license/Triangulation_3.h>
 
-
+#include <CGAL/assertions.h>
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>
 #include <CGAL/Triangulation_ds_cell_base_3.h>
 #include <CGAL/Triangulation_cell_base_3.h>
 
-#include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace CGAL {
@@ -48,8 +47,8 @@ public:
   template <typename GT_>
   Point circumcenter(const GT_& gt) const
   {
-      BOOST_STATIC_ASSERT(boost::is_same<Point,
-        typename GT_::Construct_circumcenter_3::result_type>::value);
+      CGAL_static_assertion((boost::is_same<Point,
+        typename GT_::Construct_circumcenter_3::result_type>::value));
       return gt.construct_circumcenter_3_object()(this->vertex(0)->point(),
                                                   this->vertex(1)->point(),
                                                   this->vertex(2)->point(),
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
index 4d8add9c4ec..0fd8ca7799c 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_cell_base_3.h
@@ -25,15 +25,14 @@
 
 #include <CGAL/license/Triangulation_3.h>
 
+#include <CGAL/assertions.h>
 #include <CGAL/Hidden_point_memory_policy.h>
 #include <CGAL/Triangulation_cell_base_3.h>
 
-#include <boost/utility/enable_if.hpp>
-
 #include <list>
 
-#include <boost/static_assert.hpp>
 #include <boost/type_traits/is_same.hpp>
+#include <boost/utility/enable_if.hpp>
 
 namespace CGAL {
 
@@ -141,8 +140,8 @@ public:
   template<typename GT_>
   Point_3 circumcenter(const GT_& gt) const
   {
-    BOOST_STATIC_ASSERT(boost::is_same<Point_3,
-      typename GT_::Construct_weighted_circumcenter_3::result_type>::value);
+    CGAL_static_assertion((boost::is_same<Point_3,
+      typename GT_::Construct_weighted_circumcenter_3::result_type>::value));
       return gt.construct_weighted_circumcenter_3_object()
         (this->vertex(0)->point(),
          this->vertex(1)->point(),
@@ -158,8 +157,8 @@ public:
   template<typename GT_>
   Point_3 weighted_circumcenter(const GT_& gt) const
   {
-    BOOST_STATIC_ASSERT(boost::is_same<Point_3,
-      typename GT_::Construct_weighted_circumcenter_3::result_type>::value);
+    CGAL_static_assertion((boost::is_same<Point_3,
+      typename GT_::Construct_weighted_circumcenter_3::result_type>::value));
       return gt.construct_weighted_circumcenter_3_object()
         (this->vertex(0)->point(),
          this->vertex(1)->point(),