diff --git a/Makefile b/Makefile
index d08bc6a..49a48ba 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,15 @@ CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CSTANDARD) $(CEXTRA)
 
 ifeq ($(BUILD),debug)
 	CFLAGS += -DDEBUG
-	CFLAGS += -Wall -Wextra -Wstrict-prototypes
+	CFLAGS += -Wall -Wextra -Wformat=2 -Wswitch-default \
+			  -Wcast-align -Wpointer-arith -Wbad-function-cast \
+			  -Wstrict-prototypes -Winline -Wundef -Wnested-externs \
+			  -Wcast-qual -Wshadow -Wwrite-strings -Wconversion \
+			  -Winit-self -Wstrict-aliasing -Wmissing-declarations \
+			  -Wmissing-include-dirs -Wno-unused-parameter -Wuninitialized \
+			  -Wold-style-definition -Wmissing-prototypes -Wunreachable-code \
+			  -Wno-unused-but-set-variable -Wmaybe-uninitialized
+	#
 endif
 
 #Additional libraries.