diff --git a/Makefile.defs b/Makefile.defs
index 2de8f88a3..8d090a0a6 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -47,11 +47,14 @@ endif
 
 DEFCFLAGS = -Wall -Werror -O3
 # Some more warnings we want as errors:
-DEFCFLAGS += -Wcast-align -Wbad-function-cast -Wredundant-decls -Wmissing-prototypes -Wchar-subscripts -Wshadow -Wundef -Wwrite-strings -Wunused -Wuninitialized -Wpointer-arith -Winline -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Wnested-externs -Wmissing-declarations
+DEFCFLAGS += -Wcast-align -Wbad-function-cast -Wredundant-decls -Wmissing-prototypes -Wchar-subscripts -Wshadow -Wundef -Wwrite-strings -Wunused -Wuninitialized -Wpointer-arith -Winline -Wformat -Wformat-security -Winit-self -Wmissing-include-dirs -Wnested-externs -Wmissing-declarations -Wempty-body -Wignored-qualifiers -Woverride-init -Wshift-negative-value
 # Some more warnings we need first to eliminate, so temporarely tolerated:
 DEFCFLAGS += -Wno-error=cast-align
 # TODO?:
-#DEFCFLAGS += -Wextra -Wswitch-enum -Wold-style-definition
+#DEFCFLAGS += -Wunused-parameter -Wold-style-declaration -Wsign-compare -Wimplicit-fallthrough=3 -Wtype-limits -Wmissing-field-initializers -Wunused-but-set-parameter -Wswitch-enum -Wold-style-definition
+#DEFCFLAGS += -Wno-error=unused-parameter -Wno-error=old-style-declaration -Wno-error=sign-compare -Wno-error=implicit-fallthrough -Wno-error=type-limits -Wno-error=missing-field-initializers -Wno-error=unused-but-set-parameter -Wno-error=switch-enum -Wno-error=old-style-definition
+# unknown to clang:
+# -Wclobbered -Wmissing-parameter-type -Wcast-function-type
 
 ifeq ($(platform),Darwin)
 # their readline has strict-prototype issues