diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd3c7356..6ad5fd2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -73,7 +73,7 @@ jobs:
           set -x
 
           export CC="${{ matrix.cc }}"
-          export CFLAGS="-DNL_MORE_ASSERTS=1000 -O2 -Werror -Wall -Wdeclaration-after-statement -Wvla -std=gnu11 -fexceptions"
+          export CFLAGS="-DNL_MORE_ASSERTS=1000 -O2 -Werror -std=gnu11 -fexceptions"
           CONFIGURE_ARGS=
           if [ "$CC" = "clang" ]; then
                   CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument -Wno-error=unused-function"
@@ -134,7 +134,7 @@ jobs:
           set -x
           git clean -fdx
           export CC="${{ matrix.cc }}"
-          export CFLAGS="-Werror -Wall -Wdeclaration-after-statement -Wvla -std=gnu11 -fexceptions"
+          export CFLAGS="-Werror -std=gnu11 -fexceptions"
           if [ "$CC" = "clang" ]; then
                   CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument -Wno-error=unused-function"
           fi
@@ -194,7 +194,7 @@ jobs:
           set -x
 
           export CC="${{ matrix.cc }}"
-          export CFLAGS="-DNL_MORE_ASSERTS=1000 -O2 -Werror -Wall -Wdeclaration-after-statement -Wvla -std=gnu11 -fexceptions"
+          export CFLAGS="-DNL_MORE_ASSERTS=1000 -O2 -Werror -std=gnu11 -fexceptions"
           if [ "$CC" = "clang" ]; then
                   CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument -Wno-error=unused-function"
                   export LDFLAGS="-Wl,--no-undefined-version,--fatal-warnings"
diff --git a/Makefile.am b/Makefile.am
index a04f078f..403539f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,11 +35,15 @@ pkgconfig_DATA = \
 warn_cppflags = \
 	-Wall \
 	-Wextra \
+	\
+	-Wdeclaration-after-statement \
 	-Wmissing-prototypes \
-	-Wno-unused-parameter \
-	-Wno-sign-compare \
-	-Wno-missing-field-initializers \
 	-Wpointer-arith \
+	-Wvla \
+	\
+	-Wno-missing-field-initializers \
+	-Wno-sign-compare \
+	-Wno-unused-parameter \
 	$(NULL)
 
 ###############################################################################