ccode/Makefile.am              | 1 +
 codegen/Makefile.am            | 3 +++
 compiler/Makefile.am           | 4 ++++
 vala/Makefile.am               | 1 +
 vapi/libgdata.deps             | 1 -
 vapigen/Makefile.am            | 4 ++++
 7 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ccode/Makefile.am b/ccode/Makefile.am
index fd3186a..2cdaa07 100644
--- a/ccode/Makefile.am
+++ b/ccode/Makefile.am
@@ -4,6 +4,7 @@ NULL =
 
 AM_CPPFLAGS = \
 	$(COVERAGE_CFLAGS) \
+	-I$(top_builddir)/gee \
 	-I$(top_srcdir)/gee \
 	$(GLIB_CFLAGS) \
 	$(NULL)
diff --git a/codegen/Makefile.am b/codegen/Makefile.am
index a20e24f..915af17 100644
--- a/codegen/Makefile.am
+++ b/codegen/Makefile.am
@@ -4,8 +4,11 @@ NULL =
 
 AM_CPPFLAGS = \
 	$(COVERAGE_CFLAGS) \
+	-I$(top_builddir)/gee \
 	-I$(top_srcdir)/gee \
+	-I$(top_builddir)/ccode \
 	-I$(top_srcdir)/ccode \
+	-I$(top_builddir)/vala \
 	-I$(top_srcdir)/vala \
 	$(GLIB_CFLAGS) \
 	$(NULL)
diff --git a/compiler/Makefile.am b/compiler/Makefile.am
index 1a513fa..c2681bf 100644
--- a/compiler/Makefile.am
+++ b/compiler/Makefile.am
@@ -4,9 +4,13 @@ NULL =
 
 AM_CPPFLAGS = \
 	$(COVERAGE_CFLAGS) \
+	-I$(top_builddir)/gee \
 	-I$(top_srcdir)/gee \
+	-I$(top_builddir)/ccode \
 	-I$(top_srcdir)/ccode \
+	-I$(top_builddir)/vala \
 	-I$(top_srcdir)/vala \
+	-I$(top_builddir)/codegen \
 	-I$(top_srcdir)/codegen \
 	$(GLIB_CFLAGS) \
 	-DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
diff --git a/vala/Makefile.am b/vala/Makefile.am
index bd16142..0fc3ec7 100644
--- a/vala/Makefile.am
+++ b/vala/Makefile.am
@@ -4,6 +4,7 @@ NULL =
 
 AM_CPPFLAGS = \
 	$(COVERAGE_CFLAGS) \
+	-I$(top_builddir)/gee \
 	-I$(top_srcdir)/gee \
 	$(GLIB_CFLAGS) \
 	$(GMODULE_CFLAGS) \
diff --git a/vapi/libgdata.deps b/vapi/libgdata.deps
index c94f069..741b594 100644
--- a/vapi/libgdata.deps
+++ b/vapi/libgdata.deps
@@ -1,5 +1,4 @@
 libsoup-2.4
 gio-2.0
 libxml-2.0
-Goa-1.0
 json-glib-1.0
diff --git a/vapigen/Makefile.am b/vapigen/Makefile.am
index 5de67c6..f514687 100644
--- a/vapigen/Makefile.am
+++ b/vapigen/Makefile.am
@@ -8,9 +8,13 @@ SUBDIRS = \
 
 AM_CPPFLAGS = \
 	$(GLIB_CFLAGS) \
+	-I$(top_builddir)/gee \
 	-I$(top_srcdir)/gee \
+	-I$(top_builddir)/ccode \
 	-I$(top_srcdir)/ccode \
+	-I$(top_builddir)/vala \
 	-I$(top_srcdir)/vala \
+	-I$(top_builddir)/gobject-introspection \
 	-I$(top_srcdir)/gobject-introspection \
 	$(NULL)