diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index b2e9d80e0..060899464 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -88,26 +88,34 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	for option in \
 		      $_CFLAGS_MORE_WARNINGS_DISABLE_LTO \
+		      -Wall \
 		      -Wextra \
 		      -Wdeclaration-after-statement \
 		      -Wfloat-equal \
 		      -Wformat-nonliteral \
 		      -Wformat-security \
 		      -Wimplicit-function-declaration \
+		      -Wimplicit-int \
 		      -Winit-self \
+		      -Wint-conversion \
 		      -Wlogical-op \
 		      -Wmissing-declarations \
 		      -Wmissing-include-dirs \
 		      -Wmissing-prototypes \
+		      -Wold-style-definition \
+		      -Wparentheses-equality \
 		      -Wpointer-arith \
 		      -Wshadow \
 		      -Wshift-negative-value \
 		      -Wstrict-prototypes \
+		      -Wtypedef-redefinition \
 		      -Wundef \
+		      -Wunknown-attributes \
 		      -Wvla \
 		      -Wno-duplicate-decl-specifier \
 		      -Wno-format-truncation \
 		      -Wno-format-y2k \
+		      -Wno-gnu-variable-sized-type-not-at-end \
 		      -Wno-missing-field-initializers \
 		      -Wno-pragmas \
 		      -Wno-sign-compare \
diff --git a/meson.build b/meson.build
index ece045e5c..480e6497d 100644
--- a/meson.build
+++ b/meson.build
@@ -179,16 +179,22 @@ common_flags += cc.get_supported_arguments([
   '-Wformat-nonliteral',
   '-Wformat-security',
   '-Wimplicit-function-declaration',
+  '-Wimplicit-int',
   '-Winit-self',
+  '-Wint-conversion',
   '-Wlogical-op',
   '-Wmissing-declarations',
   '-Wmissing-include-dirs',
   '-Wmissing-prototypes',
+  '-Wold-style-definition',
+  '-Wparentheses-equality',
   '-Wpointer-arith',
   '-Wshadow',
   '-Wshift-negative-value',
   '-Wstrict-prototypes',
+  '-Wtypedef-redefinition',
   '-Wundef',
+  '-Wunknown-attributes',
   '-Wvla',
   '-Wno-duplicate-decl-specifier',
   '-Wno-format-truncation',
@@ -200,13 +206,6 @@ common_flags += cc.get_supported_arguments([
   '-Wno-tautological-constant-out-of-range-compare',
   '-Wno-unknown-pragmas',
   '-Wno-unused-parameter',
-  '-Wparentheses-equality',
-  '-Wpointer-arith',
-  '-Wshadow',
-  '-Wstrict-prototypes',
-  '-Wtypedef-redefinition',
-  '-Wundef',
-  '-Wunknown-attributes',
   '-fno-strict-aliasing',
 ])