diff --git a/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h b/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
index dbe51e8497d..9f16d01426e 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h
@@ -35,11 +35,9 @@
 #  pragma warning(disable:4180) // qualifier applied to function type has no meaning; ignored
 #endif
 
-#ifdef __GNUG__
-#warning deprecated : use <CGAL/Labeled_mesh_domain_3.h> instead.
-#else
-#pragma message("WARNING (deprecated) : use <CGAL/Labeled_mesh_domain_3.h> instead.")
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Implicit_to_labeling_function_wrapper.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <vector>
 
diff --git a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
index 572667ed33b..5279ed3e92b 100644
--- a/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
+++ b/Mesh_3/include/CGAL/Mesh_3/Labeled_mesh_domain_3.h
@@ -26,11 +26,9 @@
 #ifndef CGAL_MESH_3_LABELED_MESH_DOMAIN_3_H
 #define CGAL_MESH_3_LABELED_MESH_DOMAIN_3_H
 
-#ifdef __GNUG__
-#warning deprecated : use <CGAL/Labeled_mesh_domain_3.h> instead.
-#else
-#pragma message("WARNING (deprecated) : use <CGAL/Labeled_mesh_domain_3.h> instead.")
-#endif
+#define CGAL_DEPRECATED_HEADER "<CGAL/Mesh_3/Labeled_mesh_domain_3.h>"
+#define CGAL_REPLACEMENT_HEADER "<CGAL/Labeled_mesh_domain_3.h>"
+#include <CGAL/internal/deprecation_warning.h>
 
 #include <CGAL/Mesh_3/config.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp b/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp
index 353077737e9..3a45601d56c 100644
--- a/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp
+++ b/Mesh_3/test/Mesh_3/test_mesh_3_implicit_vector_to_labeled_function_wrapper.cpp
@@ -1,3 +1,5 @@
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>
 
diff --git a/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp b/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp
index 6be587b5b6c..2a104c037f3 100644
--- a/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp
+++ b/Mesh_3/test/Mesh_3/test_mesh_3_labeled_mesh_domain_3.cpp
@@ -22,11 +22,12 @@
 // File Description : 
 //******************************************************************************
 
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+
 #include "test_meshing_utilities.h"
 #include <CGAL/Mesh_3/Labeled_mesh_domain_3.h>
 #include <CGAL/Mesh_3/Implicit_to_labeled_function_wrapper.h>
 
-
 template <typename K>
 struct LM3_tester
 {
diff --git a/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp b/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp
index 674a33d2b51..ee002ca0c61 100644
--- a/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp
+++ b/Mesh_3/test/Mesh_3/test_mesh_implicit_domains.cpp
@@ -7,6 +7,7 @@
 //******************************************************************************
 
 
+#define CGAL_NO_DEPRECATION_WARNINGS 1
 
 #include "debug.h"
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>