diff --git a/Makefile.am b/Makefile.am
index 668a529..fe71472 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,9 +9,12 @@
 AM_LIBS = $(CODE_COVERAGE_LIBS)
 AM_CPPFLAGS = $(CODE_COVERAGE_CPPFLAGS) -UNDEBUG $(GTEST_CPPFLAGS)
 AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
-AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS)
+AM_CXXFLAGS = $(CODE_COVERAGE_CXXFLAGS) \
+	-DBOOST_SYSTEM_NO_DEPRECATED -DBOOST_ERROR_CODE_HEADER_ONLY \
+	-DBOOST_ALL_NO_LIB
 AM_LDFLAGS = $(GMOCK_LIBS) -lgmock_main \
-	$(GTEST_LIBS) $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS)
+	$(GTEST_LIBS) $(OESDK_TESTCASE_FLAGS) $(PTHREAD_LIBS) \
+	$(SDBUSPLUS_LIBS) -lboost_system
 
 sbin_PROGRAMS = mapper mapperx