diff --git a/Makefile.diag.inc b/Makefile.diag.inc
index b46ed0a9ff83be7bf90df6d4cb58eb4431826d40..7729cbb57a7b5c234dd42bd183b4298dcd8ab409 100644
--- a/Makefile.diag.inc
+++ b/Makefile.diag.inc
@@ -1,3 +1 @@
-DIAG_WALL_CFLAGS = -Waddress -Warray-bounds=1 -Warray-compare -Warray-parameter=2 -Wbool-compare -Wbool-operation -Wchar-subscripts -Wcomment -Wdangling-pointer=2 -Wduplicate-decl-specifier -Wenum-compare -Wenum-int-mismatch -Wformat -Wformat-overflow -Wformat-truncation -Wint-in-bool-context -Wimplicit -Wimplicit-int -Wimplicit-function-declaration -Winit-self -Wlogical-not-parentheses -Wmain -Wmaybe-uninitialized -Wmemset-elt-size -Wmemset-transposed-args -Wmisleading-indentation -Wmismatched-dealloc -Wmismatched-new-delete -Wmissing-attributes -Wmissing-braces -Wmultistatement-macros -Wnarrowing -Wnonnull -Wnonnull-compare -Wopenmp-simd -Wparentheses -Wpessimizing-move -Wpointer-sign -Wrange-loop-construct -Wreorder -Wrestrict -Wreturn-type -Wsequence-point -Wsign-compare -Wsizeof-array-div -Wsizeof-pointer-div -Wsizeof-pointer-memaccess -Wstrict-aliasing -Wstrict-overflow=1 -Wswitch -Wtautological-compare -Wtrigraphs -Wuninitialized -Wunknown-pragmas -Wunused-function -Wunused-label -Wunused-value -Wunused-variable -Wuse-after-free=3 -Wvla-parameter -Wvolatile-register-var -Wzero-length-bounds
-
-DIAG_CFLAGS = $(DIAG_WALL_CFLAGS) -Wshadow -Wdouble-promotion -Wformat=2 -Wundef -fno-common -Wconversion -Wstrict-prototypes -Wno-declaration-after-statement
+DIAG_CFLAGS = -Wall -Wshadow -Wdouble-promotion -Wformat=2 -Wundef -fno-common -Wconversion -Wstrict-prototypes -Wno-declaration-after-statement