diff --git a/Makefile b/Makefile
index ed0bbc2..1575f3a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,16 +2,17 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+CFLAGS += -Wall -Werror
 OUT = $(CURDIR)
 $(shell mkdir -p $(OUT))
 
 all: $(OUT)/rootdev $(OUT)/librootdev.so.1.0
 
 $(OUT)/rootdev: main.c $(OUT)/librootdev.so.1.0
-	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -O2 -Wall
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o $@
 
 $(OUT)/librootdev.so.1.0: rootdev.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -shared -fPIC \
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC \
 		-Wl,-soname,librootdev.so.1 $< -o $@
 	ln -s $(@F) $(OUT)/librootdev.so.1
 	ln -s $(@F) $(OUT)/librootdev.so