diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index 19b25e565..44444ac77 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter/clutter-shader-effect.c
@@ -112,6 +112,8 @@
 
 #include "config.h"
 
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include "cogl/cogl.h"
 
 #include "clutter/clutter-shader-effect.h"
diff --git a/clutter/clutter/clutter-stage-view.c b/clutter/clutter/clutter-stage-view.c
index bd803652c..e10906b95 100644
--- a/clutter/clutter/clutter-stage-view.c
+++ b/clutter/clutter/clutter-stage-view.c
@@ -17,6 +17,8 @@
 
 #include "config.h"
 
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include "clutter/clutter-stage-view.h"
 #include "clutter/clutter-stage-view-private.h"
 
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index e98db1100..cdb4debab 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -303,7 +303,6 @@ if have_introspection
   clutter_introspection_args = introspection_args + [
     '-DCLUTTER_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
     '-DCLUTTER_COMPILATION=1',
-    '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
     '-DG_LOG_DOMAIN="Clutter"'
   ]
 
diff --git a/clutter/meson.build b/clutter/meson.build
index 97487eb72..9c365b49e 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -7,7 +7,6 @@ clutter_includes = [clutter_includepath, cogl_includepath]
 clutter_c_args = [
   '-DCLUTTER_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
   '-DCLUTTER_COMPILATION=1',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DCOGL_ENABLE_MUTTER_API',
   '-DG_LOG_DOMAIN="Clutter"',
 ]
diff --git a/mtk/mtk/meson.build b/mtk/mtk/meson.build
index b5cc5fd2e..456cdb992 100644
--- a/mtk/mtk/meson.build
+++ b/mtk/mtk/meson.build
@@ -50,7 +50,6 @@ if have_introspection
   mtk_introspection_args = introspection_args + [
     '-DMTK_SYSCONFDIR="@0@"'.format(prefix / sysconfdir),
     '-DMTK_COMPILATION=1',
-    '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
     '-DG_LOG_DOMAIN="Mtk"'
   ]
 
diff --git a/src/backends/meta-stage-impl.c b/src/backends/meta-stage-impl.c
index c95bcf60d..ef47fee21 100644
--- a/src/backends/meta-stage-impl.c
+++ b/src/backends/meta-stage-impl.c
@@ -25,6 +25,8 @@
  *  Emmanuele Bassi
  */
 
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include "config.h"
 
 #include "backends/meta-stage-impl-private.h"
diff --git a/src/meson.build b/src/meson.build
index 11577785b..139b747e0 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -177,7 +177,6 @@ mutter_deps = [
 
 mutter_c_args = [
   '-DCOGL_ENABLE_MUTTER_API',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DSN_API_NOT_YET_FROZEN=1',
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
diff --git a/src/tests/clutter/conform/meson.build b/src/tests/clutter/conform/meson.build
index 2aec5dba2..6f37c1815 100644
--- a/src/tests/clutter/conform/meson.build
+++ b/src/tests/clutter/conform/meson.build
@@ -1,6 +1,5 @@
 clutter_tests_conform_c_args = [
   '-DG_LOG_DOMAIN="Clutter-Conform"',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
 clutter_tests_conform_c_args += clutter_debug_c_args
diff --git a/src/tests/clutter/interactive/meson.build b/src/tests/clutter/interactive/meson.build
index 9eb5735f2..b8ec1effb 100644
--- a/src/tests/clutter/interactive/meson.build
+++ b/src/tests/clutter/interactive/meson.build
@@ -4,7 +4,6 @@ clutter_tests_interactive_includepath = include_directories('.')
 clutter_tests_interactive_c_args = [
   '-DTESTS_DATADIR="@0@"'.format(clutter_tests_interactive_srcdir),
   '-DG_DISABLE_SINGLE_INCLUDES',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
 clutter_tests_interactive_c_args += clutter_debug_c_args
diff --git a/src/tests/clutter/interactive/test-cogl-shader-glsl.c b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
index 36139d572..a8ff34453 100644
--- a/src/tests/clutter/interactive/test-cogl-shader-glsl.c
+++ b/src/tests/clutter/interactive/test-cogl-shader-glsl.c
@@ -1,3 +1,5 @@
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include <clutter/clutter.h>
 
 #include <errno.h>
diff --git a/src/tests/clutter/micro-bench/meson.build b/src/tests/clutter/micro-bench/meson.build
index 65406a51c..2873d94b8 100644
--- a/src/tests/clutter/micro-bench/meson.build
+++ b/src/tests/clutter/micro-bench/meson.build
@@ -1,6 +1,5 @@
 clutter_tests_micro_bench_c_args = [
   '-DG_DISABLE_SINGLE_INCLUDES',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
 clutter_tests_micro_bench_c_args += clutter_debug_c_args
diff --git a/src/tests/clutter/performance/meson.build b/src/tests/clutter/performance/meson.build
index 02e61ce0d..e4dcbaf47 100644
--- a/src/tests/clutter/performance/meson.build
+++ b/src/tests/clutter/performance/meson.build
@@ -1,7 +1,6 @@
 clutter_tests_performance_c_args = [
   '-DTESTS_DATA_DIR="@0@"'.format(clutter_tests_interactive_srcdir),
   '-DG_DISABLE_SINGLE_INCLUDES',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
 
diff --git a/src/tests/cogl/conform/meson.build b/src/tests/cogl/conform/meson.build
index ab4e5b820..2614be56e 100644
--- a/src/tests/cogl/conform/meson.build
+++ b/src/tests/cogl/conform/meson.build
@@ -58,8 +58,6 @@ cogl_test_conformance_includes = [
 
 cogl_test_c_args = [
   cogl_debug_c_args,
-  '-DCOGL_DISABLE_DEPRECATED',
-  '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
   '-DTESTS_DATADIR="@0@/tests/data"'.format(cogl_srcdir),
   '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()),
 ]
diff --git a/src/tests/cogl/conform/test-just-vertex-shader.c b/src/tests/cogl/conform/test-just-vertex-shader.c
index 5841b728b..4cb95b67b 100644
--- a/src/tests/cogl/conform/test-just-vertex-shader.c
+++ b/src/tests/cogl/conform/test-just-vertex-shader.c
@@ -1,3 +1,5 @@
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include <cogl/cogl.h>
 
 #include <string.h>
diff --git a/src/tests/cogl/conform/test-pipeline-uniforms.c b/src/tests/cogl/conform/test-pipeline-uniforms.c
index 26bbca3f7..9c72c387a 100644
--- a/src/tests/cogl/conform/test-pipeline-uniforms.c
+++ b/src/tests/cogl/conform/test-pipeline-uniforms.c
@@ -1,3 +1,5 @@
+#define COGL_DISABLE_DEPRECATION_WARNINGS
+
 #include <cogl/cogl.h>
 
 #include <string.h>
diff --git a/src/tests/cogl/unit/meson.build b/src/tests/cogl/unit/meson.build
index d2e279456..f46a3df42 100644
--- a/src/tests/cogl/unit/meson.build
+++ b/src/tests/cogl/unit/meson.build
@@ -28,8 +28,6 @@ foreach unit_test: cogl_unit_tests
     c_args: [
       '-D__COGL_H_INSIDE__',
       '-DCOGL_ENABLE_MUTTER_API',
-      '-DCOGL_DISABLE_DEPRECATED',
-      '-DCOGL_DISABLE_DEPRECATION_WARNINGS',
     ],
     include_directories: [
       cogl_includepath,