diff --git a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
index 838aa6783f9..aaafa079d50 100644
--- a/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
+++ b/Alpha_shapes_2/include/CGAL/Weighted_alpha_shape_euclidean_traits_2.h
@@ -24,17 +24,17 @@
 
 #include <CGAL/license/Alpha_shapes_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Weighted_alpha_shape_euclidean_traits_2.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Regular_triangulation_euclidean_traits_2.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The class Weighted_alpha_shape_euclidean_traits_2<K> is deprecated in favor of "\
+  "Regular_triangulation_euclidean_traits_2<K>."
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Regular_triangulation_euclidean_traits_2.h>
 
 namespace CGAL {
 
-//------------------ Traits class -------------------------------------
-
-#ifdef CGAL_NO_DEPRECATED_CODE
-#error The class Weighted_alpha_shape_euclidean_traits_2<K> is deprecated in favor of Regular_triangulation_euclidean_traits_2<K>.
-#endif
-
 template< class R >
 class Weighted_alpha_shape_euclidean_traits_2 : public
   Regular_triangulation_euclidean_traits_2<R, typename R::FT>
diff --git a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
index 2fa671657d2..f22d34931a4 100644
--- a/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
+++ b/Alpha_shapes_3/include/CGAL/Weighted_alpha_shape_euclidean_traits_3.h
@@ -23,19 +23,17 @@
 
 #include <CGAL/license/Alpha_shapes_3.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Weighted_alpha_shape_euclidean_traits_3.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Regular_triangulation_euclidean_traits_3.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The class Weighted_alpha_shape_euclidean_traits_3<K> is deprecated in favor of "\
+  "Regular_triangulation_euclidean_traits_3<K>."
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Regular_triangulation_euclidean_traits_3.h>
 
 namespace CGAL {
 
-
-   
-//------------------ Traits class -------------------------------------
-
-#ifdef CGAL_NO_DEPRECATED_CODE
-#error The class Weighted_alpha_shape_euclidean_traits_3<K> is deprecated in favor of Regular_triangulation_euclidean_traits_3<K>.
-#endif
-
 template <class K>
 class Weighted_alpha_shape_euclidean_traits_3 : public 
 Regular_triangulation_euclidean_traits_3<K>
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h
index 4fba1dbbb0c..812d9918dc2 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_face_map.h
@@ -23,17 +23,15 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
-
-/*! \file
- * Definition of the Arr_face_index_map<Arrangement> class.
- */
-
-#if (defined __GNUC__)
-  #warning Arr_face_map.h is DEPRECATED, please include Arr_face_index_map.h instead
-#elif (defined _MSC_VER)
-  #pragma message("Arr_face_map.h is DEPRECATED, please include Arr_face_index_map.h instead")
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Arr_face_map.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Arr_face_index_map.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Arr_face_index_map.h>
 
+/*! \file
+ * Definition of the Arr_face_index_map<Arrangement> class.
+
+ */
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h
index 5945932d9dd..02209c5573f 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Polyline_2.h
@@ -19,6 +19,11 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Arr_geometry_traits/Polyline_2.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Arr_geometry_traits/Polycurve_2.h>"
+#include <CGAL/internal/deprecation_warning.h>
+
+#include <CGAL/Arr_geometry_traits/Polycurve_2.h>
 
 /*! \file
  * Header file for the polyline classes used by the
@@ -26,12 +31,6 @@
  * Arr_polyline_traits_2 classes.
  */
 
-#if (defined __GNUC__)
-  #warning Polyline_2.h is DEPRECATED, please include Polycurve_2.h instead
-#elif (defined _MSC_VER)
-  #pragma message("Polyline_2.h is DEPRECATED, please include Polycurve_2.h instead")
-#endif
-
 #include <CGAL/Arr_geometry_traits/Polycurve_2.h>
 
 namespace CGAL {
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_overlay.h b/Arrangement_on_surface_2/include/CGAL/Arr_overlay.h
index b9a873282b1..7310226f176 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_overlay.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_overlay.h
@@ -23,17 +23,16 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Arr_overlay.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Arr_overlay_2.h>"
+#include <CGAL/internal/deprecation_warning.h>
+
+#include <CGAL/Arr_overlay_2.h>
 
 /*! \file
  * Helping file to include Arr_overlay_2 for backward compatibility.
  */
 
-#if (defined __GNUC__)
-  #warning Arr_overlay.h is DEPRECATED, please include Arr_overlay_2.h instead
-#elif (defined _MSC_VER)
-  #pragma message("Arr_overlay.h is DEPRECATED, please include Arr_overlay_2.h instead")
-#endif
-
 #include <CGAL/Arr_overlay_2.h>
 
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h
index b5adcfae344..1f568aa10b5 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_vertex_map.h
@@ -24,17 +24,16 @@
 
 #include <CGAL/license/Arrangement_on_surface_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Arr_vertex_map.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Arr_vertex_index_map.h>"
+#include <CGAL/internal/deprecation_warning.h>
+
+#include <CGAL/Arr_vertex_index_map.h>
 
 /*! \file
  * Definition of the Arr_vertex_index_map<Arrangement> class.
  */
 
-#if (defined __GNUC__)
-  #warning Arr_vertex_map.h is DEPRECATED, please include Arr_vertex_index_map.h instead
-#elif (defined _MSC_VER)
-  #pragma message("Arr_vertex_map.h is DEPRECATED, please include Arr_vertex_index_map.h instead")
-#endif
-
 #include <CGAL/Arr_vertex_index_map.h>
 
 #endif
diff --git a/Bounding_volumes/include/CGAL/Minimum_enclosing_quadrilateral_traits_2.h b/Bounding_volumes/include/CGAL/Minimum_enclosing_quadrilateral_traits_2.h
index f26292044b7..191e57083d4 100644
--- a/Bounding_volumes/include/CGAL/Minimum_enclosing_quadrilateral_traits_2.h
+++ b/Bounding_volumes/include/CGAL/Minimum_enclosing_quadrilateral_traits_2.h
@@ -24,10 +24,11 @@
 
 #include <CGAL/license/Bounding_volumes.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Minimum_enclosing_quadrilateral_traits_2.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Min_quadrilateral_traits_2.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
-#ifndef CGAL_NO_DEPRECATED_CODE
 #include <CGAL/Min_quadrilateral_traits_2.h>
-#endif // CGAL_NO_DEPRECATED_CODE
 
 #endif // ! (CGAL_MINIMUM_ENCLOSING_QUADRILATERAL_TRAITS_2_H)
 
diff --git a/Bounding_volumes/include/CGAL/minimum_enclosing_quadrilateral_2.h b/Bounding_volumes/include/CGAL/minimum_enclosing_quadrilateral_2.h
index 136e614241f..e7d1082c1d7 100644
--- a/Bounding_volumes/include/CGAL/minimum_enclosing_quadrilateral_2.h
+++ b/Bounding_volumes/include/CGAL/minimum_enclosing_quadrilateral_2.h
@@ -24,10 +24,11 @@
 
 #include <CGAL/license/Bounding_volumes.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/minimum_enclosing_quadrilateral_2.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/min_quadrilateral_2.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
-#ifndef CGAL_NO_DEPRECATED_CODE
 #include <CGAL/min_quadrilateral_2.h>
-#endif // CGAL_NO_DEPRECATED_CODE
 
 #endif // ! (CGAL_MINIMUM_ENCLOSING_QUADRILATERAL_2_H)
 
diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d.h b/Convex_hull_d/include/CGAL/Convex_hull_d.h
index 026cbed7af4..0e720128a2e 100644
--- a/Convex_hull_d/include/CGAL/Convex_hull_d.h
+++ b/Convex_hull_d/include/CGAL/Convex_hull_d.h
@@ -32,7 +32,8 @@
 #include <CGAL/license/Convex_hull_d.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Convex_hull_d.h>"
-#define CGAL_REPLACEMENT_HEADER "the Triangulation package (see http://doc.cgal.org/latest/Triangulation)"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The Triangulation package (see http://doc.cgal.org/latest/Triangulation) should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 /*{\Manpage {Convex_hull_d}{R}{Convex Hulls}{C}}*/
diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h b/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h
index c3839607505..8a59aa0fd10 100644
--- a/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h
+++ b/Convex_hull_d/include/CGAL/Convex_hull_d_to_polyhedron_3.h
@@ -24,7 +24,8 @@
 #include <CGAL/license/Convex_hull_d.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Convex_hull_d_to_polyhedron_3.h>"
-#define CGAL_REPLACEMENT_HEADER "the Triangulation package (see http://doc.cgal.org/latest/Triangulation)"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The Triangulation package (see http://doc.cgal.org/latest/Triangulation) should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Convex_hull_d.h>
diff --git a/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h b/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h
index 00ef6daaee6..0094716bf32 100644
--- a/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h
+++ b/Convex_hull_d/include/CGAL/Convex_hull_d_traits_3.h
@@ -24,7 +24,8 @@
 #include <CGAL/license/Convex_hull_d.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Convex_hull_d_traits_3.h>"
-#define CGAL_REPLACEMENT_HEADER "the Triangulation package (see http://doc.cgal.org/latest/Triangulation)"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The Triangulation package (see http://doc.cgal.org/latest/Triangulation) should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Point_3.h>
diff --git a/Convex_hull_d/include/CGAL/Delaunay_d.h b/Convex_hull_d/include/CGAL/Delaunay_d.h
index a68629e343e..a18065b5a66 100644
--- a/Convex_hull_d/include/CGAL/Delaunay_d.h
+++ b/Convex_hull_d/include/CGAL/Delaunay_d.h
@@ -32,7 +32,8 @@
 #include <CGAL/license/Convex_hull_d.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Delaunay_d.h>"
-#define CGAL_REPLACEMENT_HEADER "the Triangulation package (see http://doc.cgal.org/latest/Triangulation)"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The Triangulation package (see http://doc.cgal.org/latest/Triangulation) should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 /*{\Manpage {Delaunay_d}{R,Lifted_R}{Delaunay Triangulations}{DT}}*/
diff --git a/Convex_hull_d/include/CGAL/Regular_complex_d.h b/Convex_hull_d/include/CGAL/Regular_complex_d.h
index 3424894c7a1..a832becf4f7 100644
--- a/Convex_hull_d/include/CGAL/Regular_complex_d.h
+++ b/Convex_hull_d/include/CGAL/Regular_complex_d.h
@@ -32,7 +32,8 @@
 #include <CGAL/license/Convex_hull_d.h>
 
 #define CGAL_DEPRECATED_HEADER "<CGAL/Regular_complex_d.h>"
-#define CGAL_REPLACEMENT_HEADER "the Triangulation package (see http://doc.cgal.org/latest/Triangulation)"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The Triangulation package (see http://doc.cgal.org/latest/Triangulation) should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/basic.h>
diff --git a/Envelope_2/include/CGAL/Env_default_diagram_1.h b/Envelope_2/include/CGAL/Env_default_diagram_1.h
index 6ff3273f7b0..880743b2096 100644
--- a/Envelope_2/include/CGAL/Env_default_diagram_1.h
+++ b/Envelope_2/include/CGAL/Env_default_diagram_1.h
@@ -24,6 +24,9 @@
 
 #include <CGAL/license/Envelope_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Env_default_diagram_1.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Envelope_diagram_1>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #if (defined __GNUC__)
   #if !(defined __STRICT_ANSI__)
diff --git a/Nef_2/include/CGAL/Nef_2/geninfo.h b/Nef_2/include/CGAL/Nef_2/geninfo.h
index 1151520a48c..8cfd7c9d6d3 100644
--- a/Nef_2/include/CGAL/Nef_2/geninfo.h
+++ b/Nef_2/include/CGAL/Nef_2/geninfo.h
@@ -23,10 +23,9 @@
 
 #include <CGAL/license/Nef_2.h>
 
-
-
-//This file is deprecated and something like boost::any or boost::variant should 
-//be used instead
+#define CGAL_DEPRECATED_HEADER "<CGAL/Nef_2/geninfo.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "Something like boost::any or boost::variant should be used instead."
 #include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/config.h>
diff --git a/Number_types/include/CGAL/known_bit_size_integers.h b/Number_types/include/CGAL/known_bit_size_integers.h
index fca64f392c3..333acfdafb7 100644
--- a/Number_types/include/CGAL/known_bit_size_integers.h
+++ b/Number_types/include/CGAL/known_bit_size_integers.h
@@ -31,11 +31,9 @@
 #ifndef CGAL_KNOWN_BIT_SIZE_INTEGERS_H
 #define CGAL_KNOWN_BIT_SIZE_INTEGERS_H
 
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__DMC__)
-#  pragma message ("Warning: This header is deprecated. Please use boost/cstdint.hpp instead")
-#elif defined(__GNUC__) || defined(__HP_aCC) || defined(__SUNPRO_CC) || defined(__IBMCPP__)
-#  warning "This header is deprecated. Please use boost/cstdint.hpp instead"
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/known_bit_size_integers.h>"
+#define CGAL_REPLACEMENT_HEADER "<boost/cstdint.hpp>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/number_type_basic.h>
 #include <boost/cstdint.hpp>
diff --git a/STL_Extension/include/CGAL/Fourtuple.h b/STL_Extension/include/CGAL/Fourtuple.h
index 69ba02b3980..2ec5079154e 100644
--- a/STL_Extension/include/CGAL/Fourtuple.h
+++ b/STL_Extension/include/CGAL/Fourtuple.h
@@ -27,6 +27,10 @@
 
 #include <CGAL/config.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Fourtuple.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS "Please use `CGAL::cpp11::array` instead."
+#include <CGAL/internal/deprecation_warning.h>
+
 #ifndef CGAL_NO_DEPRECATED_CODE
 
 namespace CGAL {
diff --git a/STL_Extension/include/CGAL/Sixtuple.h b/STL_Extension/include/CGAL/Sixtuple.h
index 9c52dc777aa..f54eff28757 100644
--- a/STL_Extension/include/CGAL/Sixtuple.h
+++ b/STL_Extension/include/CGAL/Sixtuple.h
@@ -27,6 +27,10 @@
 
 #include <CGAL/config.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Sixtuple.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS "Please use `CGAL::cpp11::array` instead."
+#include <CGAL/internal/deprecation_warning.h>
+
 #ifndef CGAL_NO_DEPRECATED_CODE
 
 namespace CGAL {
diff --git a/STL_Extension/include/CGAL/Threetuple.h b/STL_Extension/include/CGAL/Threetuple.h
index e68321be3e5..6cf847145df 100644
--- a/STL_Extension/include/CGAL/Threetuple.h
+++ b/STL_Extension/include/CGAL/Threetuple.h
@@ -27,6 +27,10 @@
 
 #include <CGAL/config.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Threetuple.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS "Please use `CGAL::cpp11::array` instead."
+#include <CGAL/internal/deprecation_warning.h>
+
 #ifndef CGAL_NO_DEPRECATED_CODE
 
 namespace CGAL {
diff --git a/STL_Extension/include/CGAL/Twotuple.h b/STL_Extension/include/CGAL/Twotuple.h
index 82b66e852cd..2fb1c99444d 100644
--- a/STL_Extension/include/CGAL/Twotuple.h
+++ b/STL_Extension/include/CGAL/Twotuple.h
@@ -27,6 +27,10 @@
 
 #include <CGAL/config.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Twotuple.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS "Please use `CGAL::cpp11::array` instead."
+#include <CGAL/internal/deprecation_warning.h>
+
 #ifndef CGAL_NO_DEPRECATED_CODE
 
 namespace CGAL {
diff --git a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
index 8e4590e8d89..3b7ac225cae 100644
--- a/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
+++ b/Triangulation_2/include/CGAL/Regular_triangulation_euclidean_traits_2.h
@@ -24,11 +24,11 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
-#ifdef CGAL_NO_DEPRECATED_CODE
-#error The class Regular_triangulation_euclidean_traits_2<K> is deprecated;
-       the kernel K can be used directly as traits since the weighted point and
-       the function objects for weighted points are part of the concept Kernel.
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Regular_triangulation_euclidean_traits_2.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The kernel K can be used directly as traits since weighted points and "\
+  "the associated function objects are now part of the concept Kernel."
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/config.h>
 
diff --git a/Triangulation_2/include/CGAL/Triangulation_2_filtered_projection_traits_3.h b/Triangulation_2/include/CGAL/Triangulation_2_filtered_projection_traits_3.h
index 7ad7703b05f..b9fc59ba547 100644
--- a/Triangulation_2/include/CGAL/Triangulation_2_filtered_projection_traits_3.h
+++ b/Triangulation_2/include/CGAL/Triangulation_2_filtered_projection_traits_3.h
@@ -24,11 +24,10 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
-
 #define CGAL_DEPRECATED_HEADER "<CGAL/Triangulation_2_filtered_projection_traits_3.h>"
 #define CGAL_REPLACEMENT_HEADER "<CGAL/Triangulation_2_projection_traits_3.h>"
 #include <CGAL/internal/deprecation_warning.h>
 
-#include <CGAL/internal/Triangulation_2_filtered_projection_traits_3.h>
+#include <CGAL/Triangulation_2_projection_traits_3.h>
 
 #endif // CGAL_TRIANGULATION_2_FILTERED_PROJECTION_TRAITS_3_H
diff --git a/Triangulation_2/include/CGAL/Weighted_point.h b/Triangulation_2/include/CGAL/Weighted_point.h
index e9958f954d9..73e90c141a0 100644
--- a/Triangulation_2/include/CGAL/Weighted_point.h
+++ b/Triangulation_2/include/CGAL/Weighted_point.h
@@ -24,6 +24,11 @@
 
 #include <CGAL/license/Triangulation_2.h>
 
+#define CGAL_DEPRECATED_HEADER "<CGAL/Weighted_point.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "Weighted points are now part of the concept Kernel. One should therefore "\
+  "use `CGAL::Weighted_point_2<K>` and `CGAL::Weighted_point_3<K>`."
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Kernel_traits.h>
 #include <CGAL/Dimension.h>
diff --git a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
index c9c84b3f52c..5ef7d9b0027 100644
--- a/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
+++ b/Triangulation_3/include/CGAL/Regular_triangulation_euclidean_traits_3.h
@@ -24,16 +24,14 @@
 
 #include <CGAL/license/Triangulation_3.h>
 
-#ifdef CGAL_NO_DEPRECATED_CODE
-#error The class Regular_triangulation_euclidean_traits_3<K> is deprecated;
-       the kernel K can be used directly as traits since the weighted point and
-       the function objects for weighted points are part of the concept Kernel.
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Regular_triangulation_euclidean_traits_3.h>"
+#define CGAL_DEPRECATED_MESSAGE_DETAILS \
+  "The kernel K can be used directly as traits since weighted points and "\
+  "the associated function objects are now part of the concept Kernel."
+#include <CGAL/internal/deprecation_warning.h>
 
 namespace CGAL {
 
-
-
 template < class K_, class Weight = typename K_::RT >
 class Regular_triangulation_euclidean_traits_3
   : public K_
diff --git a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
index 70deb147123..397084dfb80 100644
--- a/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
+++ b/Triangulation_3/include/CGAL/Triangulation_hierarchy_3.h
@@ -23,6 +23,8 @@
 
 #include <CGAL/license/Triangulation_3.h>
 
+// #define CGAL_DEPRECATED_HEADER "<CGAL/Triangulation_hierarchy_3.h>"
+// #include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/basic.h>
 #include <CGAL/triangulation_assertions.h>