diff --git a/introspection/Makefile.am b/introspection/Makefile.am
index c41e81af26429a0005d98a70647f54b9d1812f77..e457d5319ec807b6b7f876d580ba6538a6ff1e7f 100644
--- a/introspection/Makefile.am
+++ b/introspection/Makefile.am
@@ -1,6 +1,9 @@
 
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_srcdir)/src --warn-all
+INTROSPECTION_SCANNER_ARGS = \
+			     --c-include=gtknode.h \
+			     --add-include-path=$(top_srcdir)/src \
+			     --warn-all
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir)/src
 
 if HAVE_INTROSPECTION
diff --git a/src/gtknode.h b/src/gtknode.h
index 1ac93a8a069b3e081e5bb513dde00e274a3666ad..e21f2eb7ee7e82052a8c57f6970a3c583bc5ea56 100644
--- a/src/gtknode.h
+++ b/src/gtknode.h
@@ -29,6 +29,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
+#include <gtknodeview.h>
 #include <gtknodesocket.h>
 #include <gtk/gtkbox.h>
 
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 8f9abfa155a92c7df942fc33af7a44d75cf38bb0..3f1f110f12299b72342abd75fd1bf06bf7130327 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,15 +1,15 @@
-VAPIGEN_VAPIS = libgtknodes.vapi
+VAPIGEN_VAPIS = gtknodes.vapi
 
 if ENABLE_VAPIGEN
 
 include $(VAPIGEN_MAKEFILE)
 
-libgtknodes.vapi: $(top_builddir)/introspection/GtkNodes-0.1.gir libgtknodes.deps
+gtknodes.vapi: $(top_builddir)/introspection/GtkNodes-0.1.gir gtknodes.deps
 
-libgtknodes_vapi_METADATADIRS = $(srcdir)
-libgtknodes_vapi_FILES = $(top_builddir)/introspection/GtkNodes-0.1.gir
-libgtknodes_vapi_VAPIDIRS = $(builddir)
-libgtknodes_vapi_DEPS = glib-2.0 gio-2.0 gtk+-3.0
+gtknodes_vapi_METADATADIRS = $(srcdir)
+gtknodes_vapi_FILES = $(top_builddir)/introspection/GtkNodes-0.1.gir
+gtknodes_vapi_VAPIDIRS = $(builddir)
+gtknodes_vapi_DEPS = glib-2.0 gio-2.0 gtk+-3.0
 
 vapidir = $(datadir)/vala/vapi
 vapi_DATA = $(VAPIGEN_VAPIS) $(VAPIGEN_VAPIS:.vapi=.deps)
@@ -18,4 +18,4 @@ endif
 
 CLEANFILES = $(VAPIGEN_VAPIS)
 EXTRA_DIST = \
-	libgtknodes.deps
+	gtknodes.deps
diff --git a/vapi/libgtknodes.deps b/vapi/gtknodes.deps
similarity index 100%
rename from vapi/libgtknodes.deps
rename to vapi/gtknodes.deps