diff --git a/Operations_on_polyhedra/include/CGAL/internal/corefinement/Combinatorial_map_for_corefinement.h b/Operations_on_polyhedra/include/CGAL/internal/corefinement/Combinatorial_map_for_corefinement.h
index 9c92f297c62..5b15c6c2cb3 100644
--- a/Operations_on_polyhedra/include/CGAL/internal/corefinement/Combinatorial_map_for_corefinement.h
+++ b/Operations_on_polyhedra/include/CGAL/internal/corefinement/Combinatorial_map_for_corefinement.h
@@ -21,9 +21,6 @@
 #ifndef CGAL_INTERNAL_COMBINATORIAL_MAP_FOR_COREFINEMENT_H
 #define CGAL_INTERNAL_COMBINATORIAL_MAP_FOR_COREFINEMENT_H
 
-#define CGAL_CMAP_DART_DEPRECATED 1
-#define CGAL_NO_DEPRECATION_WARNINGS 1
-
 #include <CGAL/Combinatorial_map.h>
 #include <CGAL/Combinatorial_map_constructors.h>
 #include <CGAL/Cell_attribute.h>
@@ -113,5 +110,4 @@ public:
 
 } } //namespace CGAL::internal_IOP
 
-#undef CGAL_NO_DEPRECATION_WARNINGS
 #endif //CGAL_INTERNAL_COMBINATORIAL_MAP_FOR_COREFINEMENT_H
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
index 060bf93b19c..590252949a8 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp
@@ -1,3 +1,6 @@
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+#define CGAL_CMAP_DART_DEPRECATED 1
+
 #include "Messages_interface.h"
 #include <QApplication>
 #include <QMainWindow>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp
index 085d5f630d3..1761dcadaca 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp
@@ -1,3 +1,6 @@
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+#define CGAL_CMAP_DART_DEPRECATED 1
+
 #define CGAL_COREFINEMENT_DO_REPORT_SELF_INTERSECTIONS
 #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/corefinement_operations.h>
diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp
index 284e7334854..f6b5bb7d3c4 100644
--- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Scene_combinatorial_map_item.cpp
@@ -1,3 +1,6 @@
+#define CGAL_NO_DEPRECATION_WARNINGS 1
+#define CGAL_CMAP_DART_DEPRECATED 1
+
 #include "Scene_combinatorial_map_item.h"
 #include "Scene_polyhedron_item.h"
 #include <CGAL/Three/Scene_interface.h>