diff --git a/Makefile.am b/Makefile.am
index 3cf851c55..747a33b93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,8 @@ BUILT_SOURCES =
 EXTRA_DIST =
 SUBDIRS =
 
+AM_CPPFLAGS = -I$(top_srcdir)/src/
+
 # Only use subdirs if really needed, prefer the include scheme below
 #SUBDIRS +=
 
diff --git a/admin/Makefile.am b/admin/Makefile.am
index 643ef3ac0..cf9083504 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -19,7 +19,7 @@ admin_srcdir = $(top_srcdir)/admin
 
 noinst_PROGRAMS += vgsuppression
 vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
-vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 vgsuppression_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 
 noinst_PROGRAMS += rsvg-convert
diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am
index 8b33df06a..8ad4cce2b 100644
--- a/src/backend/Makefile.am
+++ b/src/backend/Makefile.am
@@ -19,7 +19,6 @@ liblumibackend_a_srcdir = $(top_srcdir)/src/backend
 noinst_LIBRARIES += liblumibackend.a
 
 liblumibackend_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-liblumibackend_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumibackend_a_SOURCES =					\
 	$(liblumibackend_a_srcdir)/mediaaccessfacade.cpp	\
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 29d794f7a..d7c95467c 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -22,7 +22,6 @@ liblumicommon_a_srcdir = $(top_srcdir)/src/common
 noinst_LIBRARIES += liblumicommon.a
 
 liblumicommon_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumicommon_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumicommon_a_SOURCES =					\
 	$(liblumicommon_a_srcdir)/lumitime.cpp		\
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 0e1726956..9fb72b7ff 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -19,7 +19,6 @@ lumigui_srcdir = $(top_srcdir)/src/gui
 #noinst_LIBRARIES += liblumigui.a
 
 #lumigui_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-#lumigui_CPPFLAGS = -I$(top_srcdir)/src/
 
 lumigui_CPPFLAGS = $(AM_CPPFLAGS) \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 85b32ba80..f7d9058ae 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -19,7 +19,6 @@ liblumi_a_srcdir = $(top_srcdir)/src/lib
 noinst_LIBRARIES += liblumi.a
 
 liblumi_a_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-liblumi_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumi_a_SOURCES =				\
 	$(liblumi_a_srcdir)/plugin.c		\
diff --git a/src/proc/Makefile.am b/src/proc/Makefile.am
index 10de0d119..2338420bb 100644
--- a/src/proc/Makefile.am
+++ b/src/proc/Makefile.am
@@ -22,7 +22,6 @@ liblumiproc_a_srcdir = $(top_srcdir)/src/proc
 noinst_LIBRARIES += liblumiproc.a
 
 liblumiproc_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiproc_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiproc_a_SOURCES =							\
 	$(liblumiproc_a_srcdir)/controllerfacade.cpp		\
@@ -37,7 +36,6 @@ liblumiprocasset_a_srcdir = $(top_srcdir)/src/proc/asset
 noinst_LIBRARIES += liblumiprocasset.a
 
 liblumiprocasset_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocasset_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocasset_a_SOURCES =				\
 	$(liblumiprocasset_a_srcdir)/codec.cpp		\
@@ -62,7 +60,6 @@ liblumiprocengine_a_srcdir = $(top_srcdir)/src/proc/engine
 noinst_LIBRARIES += liblumiprocengine.a
 
 liblumiprocengine_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocengine_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocengine_a_SOURCES =				\
 	$(liblumiprocengine_a_srcdir)/buffhandle.cpp	\
@@ -85,7 +82,6 @@ liblumiprocmobject_a_srcdir = $(top_srcdir)/src/proc/mobject
 noinst_LIBRARIES += liblumiprocmobject.a
 
 liblumiprocmobject_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocmobject_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocmobject_a_SOURCES =					\
 	$(liblumiprocmobject_a_srcdir)/builderfacade.cpp	\
@@ -101,7 +97,6 @@ liblumiprocmobjectbuilder_a_srcdir = $(top_srcdir)/src/proc/mobject/builder
 noinst_LIBRARIES += liblumiprocmobjectbuilder.a
 
 liblumiprocmobjectbuilder_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocmobjectbuilder_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocmobjectbuilder_a_SOURCES =					\
 	$(liblumiprocmobjectbuilder_a_srcdir)/assembler.cpp		\
@@ -115,7 +110,6 @@ liblumiprocmobjectcontroller_a_srcdir = $(top_srcdir)/src/proc/mobject/controlle
 noinst_LIBRARIES += liblumiprocmobjectcontroller.a
 
 liblumiprocmobjectcontroller_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocmobjectcontroller_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocmobjectcontroller_a_SOURCES =				\
 	$(liblumiprocmobjectcontroller_a_srcdir)/pathmanager.cpp	
@@ -125,7 +119,6 @@ liblumiprocmobjectsession_a_srcdir = $(top_srcdir)/src/proc/mobject/session
 noinst_LIBRARIES += liblumiprocmobjectsession.a
 
 liblumiprocmobjectsession_a_CXXFLAGS = $(CXXFLAGS) -Wall
-liblumiprocmobjectsession_a_CPPFLAGS = -I$(top_srcdir)/src/
 
 liblumiprocmobjectsession_a_SOURCES =					\
 	$(liblumiprocmobjectsession_a_srcdir)/abstractmo.cpp		\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c51133995..d9df41271 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@ tests_srcdir = $(top_srcdir)/tests
 
 check_PROGRAMS += test-error
 test_error_SOURCES = $(tests_srcdir)/error/errortest.c
-test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_error_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_error_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 
 check_PROGRAMS += test-locking
@@ -28,37 +28,37 @@ test_locking_SOURCES = \
 	$(tests_srcdir)/locking/test-locking.c \
 	$(tests_srcdir)/locking/mutex.c \
 	$(tests_srcdir)/locking/condition.c
-test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_locking_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_locking_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-llist
 test_llist_SOURCES = $(tests_srcdir)/library/test-llist.c
-test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_llist_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_llist_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-safeclib
 test_safeclib_SOURCES = $(tests_srcdir)/library/test-safeclib.c
-test_safeclib_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_safeclib_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_safeclib_LDADD = $(builddir)/liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-uuid
 test_uuid_SOURCES = $(tests_srcdir)/library/test-uuid.c
-test_uuid_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_uuid_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_uuid_LDADD = $(builddir)/liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-references
 test_references_SOURCES = $(tests_srcdir)/library/test-references.c
-test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_references_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_references_LDADD = liblumi.a -lnobugmt -lpthread -ldl -lm -lrt
 
 check_PROGRAMS += test-filedescriptors
 test_filedescriptors_SOURCES = $(tests_srcdir)/backend/test-filedescriptors.c
-test_filedescriptors_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_filedescriptors_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_filedescriptors_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm
 
 check_PROGRAMS += test-filehandles
 test_filehandles_SOURCES = $(tests_srcdir)/backend/test-filehandles.c
-test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src/
+test_filehandles_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_filehandles_LDADD = liblumibackend.a liblumi.a -lnobugmt -lpthread -ldl -lm
 
 TESTS = $(tests_srcdir)/test.sh
diff --git a/tests/common/Makefile.am b/tests/common/Makefile.am
index 7a985bec9..a8e62a528 100644
--- a/tests/common/Makefile.am
+++ b/tests/common/Makefile.am
@@ -19,7 +19,7 @@
 testcommon_srcdir = $(top_srcdir)/tests/common
 
 check_PROGRAMS += test-common
-test_common_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(top_srcdir)/src -I$(testcommon_srcdir)
+test_common_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcommon_srcdir)
 test_common_LDADD =								\
 	liblumiproc.a								\
 	liblumiprocengine.a							\
diff --git a/tests/components/Makefile.am b/tests/components/Makefile.am
index 3fce30365..771818c9e 100644
--- a/tests/components/Makefile.am
+++ b/tests/components/Makefile.am
@@ -19,7 +19,7 @@
 testcomponents_srcdir = $(top_srcdir)/tests/components
 
 check_PROGRAMS += test-components
-test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(top_srcdir)/src -I$(testcomponents_srcdir)
+test_components_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testcomponents_srcdir)
 test_components_LDADD =								\
 	liblumiproc.a								\
 	liblumiprocengine.a							\
diff --git a/tests/plugin/Makefile.am b/tests/plugin/Makefile.am
index c6afc8e36..f9fc1b5a2 100644
--- a/tests/plugin/Makefile.am
+++ b/tests/plugin/Makefile.am
@@ -19,19 +19,19 @@ examples_srcdir = $(top_srcdir)/tests/plugin
 noinst_PROGRAMS += test-plugin
 
 test_plugin_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Werror
-test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src
+test_plugin_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 test_plugin_LDADD = liblumi.a -lnobugmt -lpthread -ldl
 test_plugin_SOURCES = $(examples_srcdir)/plugin_main.c
 
 noinst_HEADERS += $(examples_srcdir)/hello_interface.h
 
 check_LTLIBRARIES += example_plugin.la example_plugin_cpp.la
-example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror -I$(top_srcdir)/src
+example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
 example_plugin_la_SOURCES = $(examples_srcdir)/example_plugin.c
 # the -rpath option is required, prolly a automake bug?
 example_plugin_la_LDFLAGS = -avoid-version -module -rpath $(shell pwd)
 
-example_plugin_cpp_la_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror -I$(top_srcdir)/src
+example_plugin_cpp_la_CPPFLAGS = $(AM_CPPFLAGS) -Wall -Werror
 example_plugin_cpp_la_SOURCES = $(examples_srcdir)/example_plugin.cpp
 # the -rpath option is required, prolly a automake bug?
 example_plugin_cpp_la_LDFLAGS = -avoid-version -module -rpath $(shell pwd)