diff --git a/src/core/Makefile.am b/src/core/Makefile.am
index 35339a1..17ac252 100644
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libcore.a
 libcore_adir=.
diff --git a/src/core/Makefile.in b/src/core/Makefile.in
index c8b556d..e56f419 100644
--- a/src/core/Makefile.in
+++ b/src/core/Makefile.in
@@ -327,7 +327,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libcore.a
 libcore_adir = .
 libcore_a_SOURCES = \
diff --git a/src/db/Makefile.am b/src/db/Makefile.am
index d2a1d12..242c1ac 100644
--- a/src/db/Makefile.am
+++ b/src/db/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libdb.a
 libdb_adir=.
diff --git a/src/db/Makefile.in b/src/db/Makefile.in
index 505ac59..6034fa3 100644
--- a/src/db/Makefile.in
+++ b/src/db/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libdb.a
 libdb_adir = .
 libdb_a_SOURCES = \
diff --git a/src/fco/Makefile.am b/src/fco/Makefile.am
index c74d21f..10f756d 100644
--- a/src/fco/Makefile.am
+++ b/src/fco/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libfco.a
 libfco_adir=.
diff --git a/src/fco/Makefile.in b/src/fco/Makefile.in
index e02616a..7065828 100644
--- a/src/fco/Makefile.in
+++ b/src/fco/Makefile.in
@@ -321,7 +321,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libfco.a
 libfco_adir = .
 libfco_a_SOURCES = \
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index a2491dc..55fbd36 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libfs.a
 libfs_adir=.
diff --git a/src/fs/Makefile.in b/src/fs/Makefile.in
index 1251892..15eacf0 100644
--- a/src/fs/Makefile.in
+++ b/src/fs/Makefile.in
@@ -316,7 +316,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libfs.a
 libfs_adir = .
 libfs_a_SOURCES = \
diff --git a/src/siggen/Makefile.am b/src/siggen/Makefile.am
index 02b2b7b..b56566e 100644
--- a/src/siggen/Makefile.am
+++ b/src/siggen/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 LIBS = -ltripwire -lcryptlib @LIBS@
 LDFLAGS = @LDFLAGS@ -L../../lib
 LN_S = @LN@
diff --git a/src/siggen/Makefile.in b/src/siggen/Makefile.in
index 3dfd569..dac8497 100644
--- a/src/siggen/Makefile.in
+++ b/src/siggen/Makefile.in
@@ -309,7 +309,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 siggendir = .
 siggen_SOURCES = \
   siggen.cpp siggencmdline.cpp siggenmain.cpp \
diff --git a/src/tripwire/Makefile.am b/src/tripwire/Makefile.am
index 88244c6..4abba88 100644
--- a/src/tripwire/Makefile.am
+++ b/src/tripwire/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 LIBS = -ltripwire -lcryptlib @LIBS@
 LDFLAGS = @LDFLAGS@ -L../../lib
 LN_S = @LN@
diff --git a/src/tripwire/Makefile.in b/src/tripwire/Makefile.in
index 9e13657..8ec0412 100644
--- a/src/tripwire/Makefile.in
+++ b/src/tripwire/Makefile.in
@@ -313,7 +313,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 tripwiredir = .
 tripwire_SOURCES = \
   generatedb.cpp integritycheck.cpp mailmessage.cpp pipedmailmessage.cpp \
diff --git a/src/tw/Makefile.am b/src/tw/Makefile.am
index 275fd6c..de2d025 100644
--- a/src/tw/Makefile.am
+++ b/src/tw/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libtw.a
 libtw_adir=.
diff --git a/src/tw/Makefile.in b/src/tw/Makefile.in
index f810c31..641bad0 100644
--- a/src/tw/Makefile.in
+++ b/src/tw/Makefile.in
@@ -319,7 +319,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libtw.a
 libtw_adir = .
 libtw_a_SOURCES = \
diff --git a/src/twadmin/Makefile.am b/src/twadmin/Makefile.am
index c29e460..b59ec1c 100644
--- a/src/twadmin/Makefile.am
+++ b/src/twadmin/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 LIBS = -ltripwire -lcryptlib @LIBS@
 LDFLAGS = @LDFLAGS@ -L../../lib
 LN_S = @LN@
diff --git a/src/twadmin/Makefile.in b/src/twadmin/Makefile.in
index 8124d7e..1e1bbf9 100644
--- a/src/twadmin/Makefile.in
+++ b/src/twadmin/Makefile.in
@@ -309,7 +309,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 twadmindir = .
 twadmin_SOURCES = \
   keygeneration.cpp stdtwadmin.cpp twadmin.cpp twadmincl.cpp \
diff --git a/src/twcrypto/Makefile.am b/src/twcrypto/Makefile.am
index 4a0e0f6..27d1fd3 100644
--- a/src/twcrypto/Makefile.am
+++ b/src/twcrypto/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libtwcrypto.a
 libtwcrypto_adir=.
diff --git a/src/twcrypto/Makefile.in b/src/twcrypto/Makefile.in
index 96591a8..e34e90f 100644
--- a/src/twcrypto/Makefile.in
+++ b/src/twcrypto/Makefile.in
@@ -314,7 +314,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libtwcrypto.a
 libtwcrypto_adir = .
 libtwcrypto_a_SOURCES = \
diff --git a/src/twparser/Makefile.am b/src/twparser/Makefile.am
index 4774f1a..bf75900 100644
--- a/src/twparser/Makefile.am
+++ b/src/twparser/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libtwparser.a
 libtwparser_adir=.
diff --git a/src/twparser/Makefile.in b/src/twparser/Makefile.in
index fad9ac0..d793002 100644
--- a/src/twparser/Makefile.in
+++ b/src/twparser/Makefile.in
@@ -315,7 +315,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libtwparser.a
 libtwparser_adir = .
 libtwparser_a_SOURCES = \
diff --git a/src/twprint/Makefile.am b/src/twprint/Makefile.am
index 621b958..7973565 100644
--- a/src/twprint/Makefile.am
+++ b/src/twprint/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 LIBS = -ltripwire -lcryptlib @LIBS@
 LDFLAGS = @LDFLAGS@ -L../../lib
 LN_S = @LN@
diff --git a/src/twprint/Makefile.in b/src/twprint/Makefile.in
index f565baa..852d5f7 100644
--- a/src/twprint/Makefile.in
+++ b/src/twprint/Makefile.in
@@ -309,7 +309,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 twprintdir = .
 twprint_SOURCES = \
   stdtwprint.cpp twprint.cpp twprintcmdline.cpp twprinterrors.cpp \
diff --git a/src/twtest/Makefile.am b/src/twtest/Makefile.am
index c98f1d7..b0d9824 100644
--- a/src/twtest/Makefile.am
+++ b/src/twtest/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 LIBS = -ltripwire -lcryptlib @LIBS@
 LDFLAGS = @LDFLAGS@ -L../../lib
 LN_S = @LN@
diff --git a/src/twtest/Makefile.in b/src/twtest/Makefile.in
index e32ecb6..ca9c7e7 100644
--- a/src/twtest/Makefile.in
+++ b/src/twtest/Makefile.in
@@ -349,7 +349,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 AM_INSTALL_PROGRAM_FLAGS = -m 755
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 twtestdir = .
 twtest_SOURCES = \
 archive_t.cpp \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 5c3fc2c..a268a3d 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies
 
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 
 noinst_LIBRARIES = libutil.a
 libutil_adir = .
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 3978055..0559ab8 100644
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -313,7 +313,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies
-AM_CPPFLAGS = -I..
+AM_CPPFLAGS = -I$(srcdir)/..
 noinst_LIBRARIES = libutil.a
 libutil_adir = .
 libutil_a_SOURCES = \