diff --git a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h
index 9703b10b272..8a8ea51930d 100644
--- a/Nef_2/include/CGAL/Nef_2/PM_overlayer.h
+++ b/Nef_2/include/CGAL/Nef_2/PM_overlayer.h
@@ -34,6 +34,9 @@
 #define CGAL_NEF_DEBUG 13
 #include <CGAL/Nef_2/debug.h>
 
+#include <boost/static_assert.hpp>
+#include <boost/type_traits/is_same.hpp>
+
 #ifndef CGAL_USE_LEDA
 #define LEDA_MEMORY(t) 
 #endif
@@ -958,7 +961,8 @@ bool is_forward_edge(const Const_decorator& N,
 
 void assert_type_precondition() const
 { typename PM_decorator_::Point p1; Point p2;
-  assert_equal_types(p1,p2); }
+  BOOST_STATIC_ASSERT((boost::is_same<typename PM_decorator_::Point, Point>::value)); }
+
 
 
 
diff --git a/Nef_2/noweb/PM_overlayer.lw b/Nef_2/noweb/PM_overlayer.lw
index 0d72767e6a8..c000417a5bc 100644
--- a/Nef_2/noweb/PM_overlayer.lw
+++ b/Nef_2/noweb/PM_overlayer.lw
@@ -1794,7 +1794,7 @@ the input properties of the overlay calculation operation from Section
 <<helping operations>>=
 void assert_type_precondition() const
 { typename PM_decorator_::Point p1; Point p2;
-  assert_equal_types(p1,p2); }
+  BOOST_STATIC_ASSERT((boost::is_same<typename PM_decorator_::Point, Point>::value)); }
 
 
 <<PM_overlayer.h>>=
diff --git a/STL_Extension/include/CGAL/tags.h b/STL_Extension/include/CGAL/tags.h
index 5e29385a4d1..c343ff411cb 100644
--- a/STL_Extension/include/CGAL/tags.h
+++ b/STL_Extension/include/CGAL/tags.h
@@ -57,10 +57,6 @@ struct Null_functor {
 
 // A function that asserts a specific compile time tag
 // forcing its two arguments to have equal type.
-// It is encapsulated with #ifdef since it will be defined also elsewhere.
-// ======================================================
-#ifndef CGAL_ASSERT_COMPILE_TIME_TAG
-#define CGAL_ASSERT_COMPILE_TIME_TAG 1
 template <class Base>
 struct Assert_tag_class
 {
@@ -75,12 +71,6 @@ Assert_compile_time_tag( const Tag&, const Derived& b)
   Assert_tag_class<Tag> x;
   x.match_compile_time_tag(b);
 }
-#endif // CGAL_ASSERT_COMPILE_TIME_TAG
-
-template < class T>
-inline
-void
-assert_equal_types( const T&, const T&) {}
 
 } //namespace CGAL