6 files changed, 21 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d4d17b2a9b..24a95eed84 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,7 @@
 include Makefile.include
-AM_CPPFLAGS =  $(INCLUDES) -I$(top_builddir)/src/obj \
-  -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
-  -I$(builddir) $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
-AM_LDFLAGS = $(PTHREAD_CFLAGS)
+
+AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
+  -I$(builddir)
 
 noinst_LIBRARIES = libbitcoin.a
 
diff --git a/src/Makefile.include b/src/Makefile.include
index 352471061d..8c2274a287 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -1,5 +1,9 @@
-# Helper for rules and subdir Makefiles to find parent targets.
-# Flags and other non-target variables should not be set here.
+AM_CPPFLAGS =  $(INCLUDES) \
+  -I$(top_builddir)/src/obj \
+  -I$(top_srcdir)/src/leveldb/include \
+  $(BDB_CPPFLAGS) \
+  $(BOOST_INCLUDES)
+AM_LDFLAGS = $(PTHREAD_CFLAGS)
 
 LIBBITCOIN=$(top_builddir)/src/libbitcoin.a
 LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a
diff --git a/src/leveldbwrapper.cpp b/src/leveldbwrapper.cpp
index 39ed63b463..aff1ec0283 100644
--- a/src/leveldbwrapper.cpp
+++ b/src/leveldbwrapper.cpp
@@ -10,7 +10,7 @@
 #include <leveldb/cache.h>
 #include <leveldb/env.h>
 #include <leveldb/filter_policy.h>
-#include <memenv/memenv.h>
+#include <memenv.h>
 
 void HandleError(const leveldb::Status &status) throw(leveldb_error) {
     if (status.ok())
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 4ecd5629ea..3ede99dfa3 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -1,11 +1,10 @@
 include $(top_srcdir)/src/Makefile.include
 
-AM_CPPFLAGS =  $(INCLUDES) -I$(top_builddir)/src/obj \
-  -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
-  -I$(top_srcdir)/src/leveldb/helpers -I$(top_builddir)/src/qt \
-  -I$(top_builddir)/src/qt/forms $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
-  $(QR_CFLAGS) $(BDB_CPPFLAGS)
-AM_LDFLAGS = $(PTHREAD_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src \
+  -I$(top_builddir)/src/qt \
+  -I$(top_builddir)/src/qt/forms \
+  $(PROTOBUF_CFLAGS) \
+  $(QR_CFLAGS)
 bin_PROGRAMS = bitcoin-qt
 noinst_LIBRARIES = libbitcoinqt.a
 SUBDIRS = $(BUILD_TEST_QT)
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index f8fe97462b..7891c3e975 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -1,11 +1,10 @@
 include $(top_srcdir)/src/Makefile.include
 
-AM_CPPFLAGS =  $(INCLUDES) -I$(top_builddir)/src/obj \
-  -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
-  -I$(top_srcdir)/src/leveldb/helpers -I$(top_srcdir)/src/qt \
-  -I$(top_builddir)/src/qt $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
-    $(QR_CFLAGS) $(BDB_CPPFLAGS)
-AM_LDFLAGS = $(PTHREAD_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src \
+  -I$(top_srcdir)/src/qt \
+  -I$(top_builddir)/src/qt \
+  $(PROTOBUF_CFLAGS) \
+    $(QR_CFLAGS)
 bin_PROGRAMS = test_bitcoin-qt
 TESTS = test_bitcoin-qt
 
diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index c3495095d9..180fd7effa 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -1,10 +1,6 @@
 include $(top_srcdir)/src/Makefile.include
 
-AM_CPPFLAGS =  $(INCLUDES) -I$(top_builddir)/src/obj \
-  -I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
-  -I$(top_srcdir)/src $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
-
-AM_LDFLAGS = $(PTHREAD_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src
 
 bin_PROGRAMS = test_bitcoin