diff --git a/src/Makefile.am b/src/Makefile.am
index 3228f1d4..4fa72bb8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,10 +1,11 @@
 SUBDIRS = sparkey
 
-CFLAGS_BASE = -I.. -I/usr/local/include -Wfloat-equal -Wpointer-arith
+CFLAGS_BASE = -Wfloat-equal -Wpointer-arith
 CFLAGS_O0 = $(CFLAGS_BASE) -O0
 CFLAGS_O1 = $(CFLAGS_BASE) -O1
 CFLAGS_O2 = $(CFLAGS_BASE) -O2
 CFLAGS_O3 = $(CFLAGS_BASE) -O3
+DEFAULT_INCLUDES = -I.. -I/usr/local/include
 
 CFLAGS = $(CFLAGS_BASE)
 
diff --git a/src/sparkey/Makefile.am b/src/sparkey/Makefile.am
index 6e5012cd..2fee3a2b 100644
--- a/src/sparkey/Makefile.am
+++ b/src/sparkey/Makefile.am
@@ -1,3 +1,4 @@
+CFLAGS = -I/usr/local/include -O2 -Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Werror -pedantic
 
 noinst_LTLIBRARIES = libsparkey.la
 libsparkey_la_SOURCES = endiantools.h hashheader.h logheader.h \
@@ -6,5 +7,4 @@ logreader.c returncodes.c util.c buf.h hashalgorithms.h hashiter.h \
 sparkey.h util.h endiantools.c \
 hashheader.c hashreader.c logheader.c logwriter.c MurmurHash3.c \
 sparkey-internal.h
-libsparkey_la_CFLAGS = -I/usr/local/include -O2 -Wall -Wextra -Wfloat-equal -Wshadow -Wpointer-arith -Werror -pedantic
 libsparkey_la_LDFLAGS = -L/usr/local/lib
\ No newline at end of file