Index: gui/simple-greeter/Makefile.am
===================================================================
--- gui/simple-greeter/Makefile.am	(revision 6679)
+++ gui/simple-greeter/Makefile.am	(working copy)
@@ -6,6 +6,7 @@
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/common				\
+	-I$(top_builddir)/common			\
 	-I$(top_srcdir)/gui/simple-greeter/libnotificationarea	\
 	-DDMCONFDIR=\""$(dmconfdir)"\"			\
 	-DGDMCONFDIR=\"$(gdmconfdir)\"                  \
Index: common/Makefile.am
===================================================================
--- common/Makefile.am	(revision 6679)
+++ common/Makefile.am	(working copy)
@@ -70,8 +70,6 @@
 libgdmcommon_la_SOURCES =	\
 	gdm-address.h		\
 	gdm-address.c		\
-	gdm-marshal.c		\
-	gdm-marshal.h		\
 	gdm-common.h		\
 	gdm-common.c		\
 	gdm-common-unknown-origin.h	\
@@ -100,6 +98,10 @@
 	$(MKDTEMP_FILES) 	\
 	$(NULL)
 
+nodist_libgdmcommon_la_SOURCES =	\
+	gdm-marshal.c		\
+	gdm-marshal.h
+
 libgdmcommon_la_CPPFLAGS = 		\
 	$(AM_CPPFLAGS)			\
 	$(DISABLE_DEPRECATED_CFLAGS)	\
Index: daemon/Makefile.am
===================================================================
--- daemon/Makefile.am	(revision 6679)
+++ daemon/Makefile.am	(working copy)
@@ -4,6 +4,7 @@
 	-I.						\
 	-I..						\
 	-I$(top_srcdir)/common				\
+	-I$(top_builddir)/common			\
 	-DAUTHDIR=\"$(authdir)\"			\
 	-DBINDIR=\"$(bindir)\"				\
 	-DDATADIR=\"$(datadir)\"			\
