diff --git a/Makefile.defs b/Makefile.defs
index 987e9c661..2263d9757 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -51,8 +51,14 @@ DEFCFLAGS += -Wcast-align -Wbad-function-cast -Wredundant-decls -Wmissing-protot
 # Some more warnings we need first to eliminate, so temporarely tolerated:
 DEFCFLAGS += -Wno-error=cast-align
 # TODO?:
-#DEFCFLAGS += -Wunused-parameter -Wold-style-declaration -Wsign-compare -Wimplicit-fallthrough=3 -Wtype-limits -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=unused-but-set-parameter -Wno-error=switch-enum -Wno-error=old-style-definition
+#DEFCFLAGS += -Wunused-parameter -Wno-error=unused-parameter
+#DEFCFLAGS += -Wold-style-declaration -Wno-error=old-style-declaration
+#DEFCFLAGS += -Wsign-compare -Wno-error=sign-compare
+#DEFCFLAGS += -Wimplicit-fallthrough=3 -Wno-error=implicit-fallthrough
+#DEFCFLAGS += -Wtype-limits -Wno-error=type-limits
+#DEFCFLAGS += -Wunused-but-set-parameter -Wno-error=unused-but-set-parameter
+#DEFCFLAGS += -Wswitch-enum -Wno-error=switch-enum
+#DEFCFLAGS += -Wold-style-definition -Wno-error=old-style-definition
 # unknown to clang:     -Wclobbered -Wmissing-parameter-type -Wcast-function-type
 # unknown to clang < 8: -Woverride-init
 # unknown to gcc < 6:   -Wshift-negative-value