diff --git a/Makefile.include b/Makefile.include
index 39a5086b71..4d7da693b5 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -129,13 +129,13 @@ endif
 WERROR ?= 1
 export WERROR
 ifeq ($(WERROR),1)
-  CFLAGS += -Wall -Werror -Wextra
+  CFLAGS += -Werror
 endif
 
 WPEDANTIC ?= 0
 export WPEDANTIC
 ifeq ($(WPEDANTIC),1)
-    CFLAGS += -Wpedantic -pedantic-errors
+  CFLAGS += -Wpedantic
 endif
 
 # remove this once codebase is adapted
diff --git a/makefiles/cflags.inc.mk b/makefiles/cflags.inc.mk
index 34f878b79b..bfd486e03f 100644
--- a/makefiles/cflags.inc.mk
+++ b/makefiles/cflags.inc.mk
@@ -57,8 +57,8 @@ endif
 # Forbid common symbols to prevent accidental aliasing.
 CFLAGS += -fno-common
 
-# Enable all default warnings
-CFLAGS += -Wall
+# Enable all default warnings and all extra warnings
+CFLAGS += -Wall -Wextra
 
 # Warn if a user-supplied include directory does not exist.
 CFLAGS += -Wmissing-include-dirs