diff --git a/clutter/meson.build b/clutter/meson.build
index 2529a61d4..828c998d4 100644
--- a/clutter/meson.build
+++ b/clutter/meson.build
@@ -16,7 +16,6 @@ if buildtype != 'plain'
   if get_option('debug')
     clutter_debug_c_args += [
       '-DCLUTTER_ENABLE_DEBUG',
-      '-fno-omit-frame-pointer',
     ]
   else
     clutter_debug_c_args += [
diff --git a/cogl/meson.build b/cogl/meson.build
index 51f4b1550..4d98408ac 100644
--- a/cogl/meson.build
+++ b/cogl/meson.build
@@ -90,7 +90,6 @@ if buildtype != 'plain'
       '-DCOGL_GL_DEBUG',
       '-DCOGL_OBJECT_DEBUG',
       '-DCOGL_ENABLE_DEBUG',
-      '-fno-omit-frame-pointer',
     ]
   else
     cogl_debug_c_args += [
diff --git a/meson.build b/meson.build
index 1c4bfe15e..abef74c6a 100644
--- a/meson.build
+++ b/meson.build
@@ -467,6 +467,8 @@ add_project_arguments('-D_GNU_SOURCE', language: 'c')
 buildtype = get_option('buildtype')
 if buildtype != 'plain'
   mutter_c_args = [
+    '-fno-omit-frame-pointer',
+    '-mno-omit-leaf-frame-pointer',
     '-fno-strict-aliasing',
     '-Wpointer-arith',
     '-Wmissing-declarations',
@@ -510,7 +512,6 @@ if buildtype != 'plain'
   if get_option('debug')
     mutter_c_args += [
       '-DG_ENABLE_DEBUG',
-      '-fno-omit-frame-pointer',
     ]
   endif
 
diff --git a/mtk/meson.build b/mtk/meson.build
index 76724fee8..894ae51c4 100644
--- a/mtk/meson.build
+++ b/mtk/meson.build
@@ -15,11 +15,7 @@ mtk_c_args = [
 
 mtk_debug_c_args = []
 if buildtype != 'plain'
-  if get_option('debug')
-    mtk_debug_c_args += [
-      '-fno-omit-frame-pointer'
-    ]
-  else
+  if not get_option('debug')
     mtk_debug_c_args += [
       '-DG_DISABLE_ASSERT',
       '-DG_DISABLE_CAST_CHECKS',