diff --git a/src/doclets/devhelp/Makefile.am b/src/doclets/devhelp/Makefile.am
index e7c2446..de82ec1 100644
--- a/src/doclets/devhelp/Makefile.am
+++ b/src/doclets/devhelp/Makefile.am
@@ -4,6 +4,7 @@ NULL =
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
+	$(LIBGVC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
diff --git a/src/doclets/gtkdoc/Makefile.am b/src/doclets/gtkdoc/Makefile.am
index 66dcc55..81e3607 100644
--- a/src/doclets/gtkdoc/Makefile.am
+++ b/src/doclets/gtkdoc/Makefile.am
@@ -5,6 +5,7 @@ AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
 	$(GLIB_CFLAGS) \
+	$(LIBGVC_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
 
diff --git a/src/doclets/htm/Makefile.am b/src/doclets/htm/Makefile.am
index 5f3be83..7127e1d 100644
--- a/src/doclets/htm/Makefile.am
+++ b/src/doclets/htm/Makefile.am
@@ -4,10 +4,21 @@ NULL =
 AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
+	$(LIBGVC_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(NULL)
 
+# Without the LIBGVC_CFLAGS, we get 
+# make[5]: Entering directory `/home/richard/.local/src/valadoc/src/doclets/devhelp'
+#  CC       doclet.lo
+# In file included from /usr/include/graphviz/gvc.h:17:0,
+#                  from ../../libvaladoc/valadoc-1.0.h:15,
+#                  from doclet.c:28:
+# /usr/include/graphviz/types.h:49:20: fatal error: cgraph.h: No such file or directory
+#  #include <cgraph.h>
+#                     ^
+# compilation terminated.
 
 
 BUILT_SOURCES = libdoclet.vala.stamp
diff --git a/src/driver/0.20.x/Makefile.am b/src/driver/0.20.x/Makefile.am
index a1e7416..65cb006 100644
--- a/src/driver/0.20.x/Makefile.am
+++ b/src/driver/0.20.x/Makefile.am
@@ -8,6 +8,7 @@ AM_CFLAGS =  -g \
 	-DPACKAGE_ICONDIR=\"$(datadir)/valadoc/icons/\" \
 	-I ../../libvaladoc/ \
 	$(GLIB_CFLAGS) \
+	$(LIBGVC_CFLAGS) \
 	$(LIBGEE_CFLAGS) \
 	$(LIBVALA_0_20_X_CFLAGS) \
 	$(NULL)
diff --git a/src/libvaladoc/charts/chart.vala b/src/libvaladoc/charts/chart.vala
index f4b9908..87f5cbc 100644
--- a/src/libvaladoc/charts/chart.vala
+++ b/src/libvaladoc/charts/chart.vala
@@ -27,7 +27,7 @@ public class Valadoc.Charts.Chart : Api.Visitor {
 	protected Factory factory;
 
 	static construct {
-		Gvc.init ();
+		/* Gvc.init ();  RHS: wants:   extern void aginit(Agraph_t * g, int kind, char *rec_name, int rec_size, int move_to_front); */
 	}
 
 	public Chart (Factory factory, Api.Node node) {
diff --git a/src/libvaladoc/charts/chartfactory.vala b/src/libvaladoc/charts/chartfactory.vala
index 6a3351a..9d239db 100644
--- a/src/libvaladoc/charts/chartfactory.vala
+++ b/src/libvaladoc/charts/chartfactory.vala
@@ -23,7 +23,8 @@
 
 public abstract class Valadoc.Charts.Factory : Object {
 	protected Gvc.Node create_type (Gvc.Graph graph, Api.Node item) {
-		return graph.create_node (item.get_full_name ());
+		/* RHS: now wants extern Agnode_t *agnode(Agraph_t * g, char *name, int createflag); */
+		return graph.create_node (item.get_full_name (), 0);
 	}
 
 	public abstract Gvc.Graph create_graph (Api.Node item);
diff --git a/src/libvaladoc/charts/simplechartfactory.vala b/src/libvaladoc/charts/simplechartfactory.vala
index a1f09fb..fb3d067 100644
--- a/src/libvaladoc/charts/simplechartfactory.vala
+++ b/src/libvaladoc/charts/simplechartfactory.vala
@@ -31,7 +31,7 @@ public class Valadoc.Charts.SimpleFactory : Charts.Factory {
 	}
 
 	public override Gvc.Graph create_graph (Api.Node item) {
-		var graph = new Gvc.Graph (item.get_full_name (), Gvc.GraphKind.AGDIGRAPH);
+		var graph = new Gvc.Graph (item.get_full_name (), Gvc.Agdirected);
 		return graph;
 	}
 
