diff --git a/dcapi/Makefile.am b/dcapi/Makefile.am
index 4e78633481..ef19eed68c 100644
--- a/dcapi/Makefile.am
+++ b/dcapi/Makefile.am
@@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS = foreign 1.7
 
 SUBDIRS = include common doc
 
+EXTRA_DIST = _autosetup.sh
+
 if WITH_BOINC
 SUBDIRS += boinc
 endif
diff --git a/dcapi/boinc/Makefile.am b/dcapi/boinc/Makefile.am
index 6aac340f1e..a53afdf574 100644
--- a/dcapi/boinc/Makefile.am
+++ b/dcapi/boinc/Makefile.am
@@ -1,5 +1,6 @@
 lib_LTLIBRARIES =
-AM_CPPFLAGS = -I$(top_srcdir)/common $(GLIB_CFLAGS)
+
+AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
 
 if BUILD_MASTER
 lib_LTLIBRARIES += libdc-boinc.la
diff --git a/dcapi/common/Makefile.am b/dcapi/common/Makefile.am
index a9642e9390..e9aa688385 100644
--- a/dcapi/common/Makefile.am
+++ b/dcapi/common/Makefile.am
@@ -1,13 +1,15 @@
 noinst_LTLIBRARIES = libdc-common-master.la libdc-common-client.la
 
-libdc_common_master_la_CPPFLAGS = $(GLIB_CFLAGS) -DMASTER
+AM_CPPFLAGS = -I$(top_srcdir)/include
+
+libdc_common_master_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) -DMASTER
 libdc_common_master_la_SOURCES = \
 		cfg-master.c \
 		logger.c \
 		util.c
 libdc_common_master_la_LIBADD = $(GLIB_LIBS)
 
-libdc_common_client_la_CPPFLAGS = -DCLIENT
+libdc_common_client_la_CPPFLAGS = $(AM_CPPFLAGS) -DCLIENT
 libdc_common_client_la_SOURCES = \
 		cfg-client.c \
 		logger.c \
diff --git a/dcapi/condor/Makefile.am b/dcapi/condor/Makefile.am
index 2e1bbc6801..c016630e3d 100644
--- a/dcapi/condor/Makefile.am
+++ b/dcapi/condor/Makefile.am
@@ -11,7 +11,7 @@ endif
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = dcapi-condor-client.pc dcapi-condor-master.pc
 
-AM_CPPFLAGS	= -I$(top_srcdir)/common $(GLIB_CFLAGS) $(CONDOR_CPPFLAGS)
+AM_CPPFLAGS	= -I$(top_srcdir)/include $(GLIB_CFLAGS) $(CONDOR_CPPFLAGS)
 AM_LDFLAGS	= $(GLIB_LIBS) $(CONDOR_LDFLAGS)
 
 noinst_HEADERS	= condor_common.h \
diff --git a/dcapi/local/Makefile.am b/dcapi/local/Makefile.am
index 63dcc3b794..a2d5eee43d 100644
--- a/dcapi/local/Makefile.am
+++ b/dcapi/local/Makefile.am
@@ -11,7 +11,9 @@ endif
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = dcapi-local-client.pc dcapi-local-master.pc
 
-AM_CPPFLAGS = -I$(top_srcdir)/common $(GLIB_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
+
+noinst_HEADERS = common_defs.h dc_local.h
 
 libdc_local_la_SOURCES = \
 		dc.c \