diff --git a/clutter/cally/Makefile.am b/clutter/cally/Makefile.am
index e929a9477..d45a65afa 100644
--- a/clutter/cally/Makefile.am
+++ b/clutter/cally/Makefile.am
@@ -54,7 +54,9 @@ INCLUDES = \
 	-I$(top_srcdir)		 			\
 	-I$(top_srcdir)/clutter	 			\
 	-I$(top_srcdir)/clutter/cally 			\
-	-I$(top_srcdir)/clutter/cogl
+	-I$(top_srcdir)/clutter/cogl			\
+	-I$(top_builddir)/clutter			\
+	-I$(top_builddir)/clutter/cogl
 
 AM_CPPFLAGS = \
 	-DG_LOG_DOMAIN=\"Cally\"			\
diff --git a/doc/reference/cally/Makefile.am b/doc/reference/cally/Makefile.am
index 775c70179..373af4e19 100644
--- a/doc/reference/cally/Makefile.am
+++ b/doc/reference/cally/Makefile.am
@@ -48,8 +48,8 @@ FIXXREF_OPTIONS=\
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h $(top_builddir)/clutter/cally/*.h
-CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c $(top_builddir)/clutter/cally/*.c
+HFILE_GLOB=$(top_srcdir)/clutter/cally/*.h
+CFILE_GLOB=$(top_srcdir)/clutter/cally/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6447d5c2a..7e7728461 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ if BUILD_TESTS
 SUBDIRS += conform
 endif
 
-DIST_SUBDIRS = data conform interactive micro-bench tools
+DIST_SUBDIRS = accessibility data conform interactive micro-bench tools
 
 EXTRA_DIST = README
 
diff --git a/tests/accessibility/Makefile.am b/tests/accessibility/Makefile.am
index 81bc980a2..11fba22e1 100644
--- a/tests/accessibility/Makefile.am
+++ b/tests/accessibility/Makefile.am
@@ -8,7 +8,7 @@ EXAMPLES				= 	cally-atkcomponent-example 	\
 
 common_ldadd			= $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la
 
-CALLY_UTIL_SOURCES			= 	cally-examples-util.c
+common_sources			= cally-examples-util.c cally-examples-util.h
 
 INCLUDES 				= \
 					-I$(top_srcdir)			\
@@ -20,13 +20,15 @@ INCLUDES 				= \
 
 noinst_PROGRAMS				= 	$(EXAMPLES)
 
+EXTRA_DIST				=	$(common_sources)
+
 # atk component example
 cally_atkcomponent_example_LDADD	= 	$(CLUTTER_LIBS) $(common_ldadd)
 cally_atkcomponent_example_CFLAGS	= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)	\
 						-DPREFIXDIR=\"$(libdir)\"	\
 						$(INCLUDES)
 cally_atkcomponent_example_SOURCES	= 	cally-atkcomponent-example.c	\
-						$(CALLY_UTIL_SOURCES)
+						$(common_sources)
 
 # atk text example
 cally_atktext_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
@@ -34,7 +36,7 @@ cally_atktext_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
 						-DPREFIXDIR=\"$(libdir)\"	\
 						$(INCLUDES)
 cally_atktext_example_SOURCES		= 	cally-atktext-example.c	\
-						$(CALLY_UTIL_SOURCES)
+						$(common_sources)
 
 # atk text example2
 cally_atkevents_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
@@ -42,7 +44,7 @@ cally_atkevents_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS)\
 						-DPREFIXDIR=\"$(libdir)\"	\
 						$(INCLUDES)
 cally_atkevents_example_SOURCES		= 	cally-atkevents-example.c	\
-						$(CALLY_UTIL_SOURCES)
+						$(common_sources)
 
 # atk editable text example
 cally_atkeditabletext_example_LDADD	= 	$(CLUTTER_LIBS) $(common_ldadd)
@@ -50,7 +52,7 @@ cally_atkeditabletext_example_CFLAGS	= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
 						-DPREFIXDIR=\"$(libdir)\"	\
 						$(INCLUDES)
 cally_atkeditabletext_example_SOURCES	= 	cally-atkeditabletext-example.c	\
-						$(CALLY_UTIL_SOURCES)
+						$(common_sources)
 
 # cally clone example
 cally_clone_example_LDADD		= 	$(CLUTTER_LIBS) $(common_ldadd)
@@ -58,4 +60,4 @@ cally_clone_example_CFLAGS		= 	$(CLUTTER_CFLAGS) $(MAINTAINER_CFLAGS) \
 						-DPREFIXDIR=\"$(libdir)\"	\
 						$(INCLUDES)
 cally_clone_example_SOURCES		= 	cally-clone-example.c		\
-						$(CALLY_UTIL_SOURCES)
+						$(common_sources)