diff --git a/Makefile b/Makefile
index f26050d..9b83593 100644
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,10 @@ SYSTEMD_INSTALL = $(HOME)/.config/systemd/user
 # Compiler and flags
 CC = gcc
 CFLAGS = -std=c11 -Wall -Wextra -Werror -pedantic -O2 -g
-CFLAGS += -D_GNU_SOURCE -DCHROMA_VERSION=\"$(VERSION)\"
-CPPFLAGS = -I$(INCDIR)
+CFLAGS += -fstack-protector-strong -fstack-clash-protection
+CFLAGS += -fno-common -Wshadow -Wstrict-prototypes
+CFLAGS += -Wformat=2 -Wnormalized=nfc
+CFLAGS += -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -DCHROMA_VERSION=\"$(VERSION)\"
 
 # Debug build flags
 DEBUG_CFLAGS = -std=c11 -Wall -Wextra -Werror -pedantic -Og -g3 -DDEBUG