diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index df64353..5ba3f64 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -16,8 +16,8 @@
 pkgconfig_DATA += thrift-z.pc
 endif
 
-common_cxxflags = -Wall -Isrc $(BOOST_CPPFLAGS)
-common_ldflags = -Wall $(BOOST_LDFLAGS)
+AM_CXXFLAGS = -Wall
+AM_CPPFLAGS = $(BOOST_CPPFLAGS) -I$(srcdir)/src
 
 # Define the source files for the module
 
@@ -54,19 +54,13 @@
 
 
 # Flags for the various libraries
-
-libthrift_la_CXXFLAGS =  $(common_cxxflags)
-
-libthriftnb_la_CXXFLAGS =  $(common_cxxflags)
-libthriftnb_la_CPPFLAGS =  $(LIBEVENT_CPPFLAGS)
-
-libthriftz_la_CXXFLAGS =  $(common_cxxflags)
-libthriftz_la_CPPFLAGS =  $(ZLIB_CPPFLAGS)
+libthriftnb_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBEVENT_CPPFLAGS)
+libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 
 
 include_thriftdir = $(includedir)/thrift
 include_thrift_HEADERS = \
-                         $(top_srcdir)/config.h \
+                         $(top_builddir)/config.h \
                          src/Thrift.h \
                          src/TReflectionLocal.h \
                          src/reflection_limited_types.h \
@@ -133,9 +127,6 @@
 
 concurrency_test_LDADD = libthrift.la
 
-concurrency_test_CXXFLAGS =  $(common_cxxflags)
-concurrency_test_LDFLAGS =  $(common_ldflags)
-
 EXTRA_DIST = \
              README \
              thrift-nb.pc.in \