diff --git a/Makefile b/Makefile
index 90fdcff..1d55a35 100644
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,12 @@ CC := gcc
 
 # -fsanitize={address,undefined}
 CFLAGS.gcc.debug := -Og -ggdb -fanalyzer -DBACKTRACE -rdynamic -fsanitize=address -fno-omit-frame-pointer
-CFLAGS.gcc.release := -O3 -march=native -DNDEBUG
-CFLAGS.gcc := ${CFLAGS.gcc.${BUILD}} -Iinclude -W{all,extra,error} -fstack-protector-all -std=gnu11
+CFLAGS.gcc.release := -O3 -g -march=native -DNDEBUG
+CFLAGS.gcc := ${CFLAGS.gcc.${BUILD}} -Iinclude -Wall -Wextra -Wpedantic -Werror -fstack-protector-all -std=gnu11
 
 CFLAGS.clang.debug=-O0 -g3 -DBACKTRACE -rdynamic
-CFLAGS.clang.release=-O3 -march=native -DNDEBUG
-CFLAGS.clang=-Wextra -Wall -Wpedantic -fstack-protector-all ${CFLAGS.clang.${BUILD}}
+CFLAGS.clang.release=-O3 -g -march=native -DNDEBUG
+CFLAGS.clang=-Wextra -Wall -Wpedantic -Werror -fstack-protector-all ${CFLAGS.clang.${BUILD}}
 
 CFLAGS := ${CFLAGS.${COMPILER}}