diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 94f2f45415..3576399f04 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -228,7 +228,9 @@ endif
 # Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     demo_cflags += flag
   endif
 endforeach
diff --git a/meson.build b/meson.build
index 66c398f7fe..c388521a0c 100644
--- a/meson.build
+++ b/meson.build
@@ -294,25 +294,25 @@ elif cc.get_id() == 'gcc' or cc.get_id() == 'clang'
   ]
   
   extra_warnings = [
-    '-Werror=address',
-    '-Werror=array-bounds',
-    '-Werror=empty-body',
-    '-Werror=implicit',
-    '-Werror=implicit-fallthrough',
-    '-Werror=init-self',
-    '-Werror=int-to-pointer-cast',
-    '-Werror=main',
-    '-Werror=missing-braces',
-    '-Werror=missing-declarations',
-    '-Werror=missing-prototypes',
-    '-Werror=nonnull',
-    '-Werror=pointer-to-int-cast',
-    '-Werror=redundant-decls',
-    '-Werror=return-type',
-    '-Werror=sequence-point',
-    '-Werror=trigraphs',
-    '-Werror=vla',
-    '-Werror=write-strings',
+    'address',
+    'array-bounds',
+    'empty-body',
+    'implicit',
+    'implicit-fallthrough',
+    'init-self',
+    'int-to-pointer-cast',
+    'main',
+    'missing-braces',
+    'missing-declarations',
+    'missing-prototypes',
+    'nonnull',
+    'pointer-to-int-cast',
+    'redundant-decls',
+    'return-type',
+    'sequence-point',
+    'trigraphs',
+    'vla',
+    'write-strings',
   ]
 
   if get_option('buildtype').startswith('debug')
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 54c27fe2e5..4f50d3a606 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -44,7 +44,9 @@ is_debug = get_option('buildtype').startswith('debug')
 test_cargs = []
 
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index b628b07dc2..3324664cac 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -152,7 +152,9 @@ if os_unix
 endif
 
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index f66ace543c..eb277d8bf7 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -2,7 +2,9 @@
 
 reftest_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     reftest_cflags += flag
   endif
 endforeach