diff --git a/src/Makefile.am b/src/Makefile.am
index 521b3227a5bb321c6077583064f534f6a756e7c6..3b06d440c57b8362764d729aa963fb6bb0d5d4a5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,11 @@
 
 includesfidir = $(includedir)/prestwood
-includes= \
-          -I$(top_srcdir)\
-          -I$(top_srcdir)/interface/ \
-          $(NULL)
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/interface \
+	-I$(top_builddir)/interface \
+	$(NULL)
 
 source_c = prestwood-main.c \
 	   prestwood.c
@@ -14,9 +16,6 @@ includesfi_HEADERS = prestwood.h
 
 bin_PROGRAMS = prestwood
 
-prestwood_CPPFLAGS = $(includes) \
-                     $(AM_CPPFLAGS)
-
 prestwood_LDADD = \
                     $(GLIB_LIBS) $(GUPNP_LIBS) $(GSSDP_LIBS)\
 			$(CANTERBURY_LIBS) $(CODE_COVERAGE_LIBS) $(AM_LIBADD) \