diff --git a/graf2d/gviz/Module.mk b/graf2d/gviz/Module.mk
index b36eaa1ed01b524c6fc0be9192cc4d65a35bf5fc..c1fbae6f5afe10ec41c4d01064ec29717f5f9997 100644
--- a/graf2d/gviz/Module.mk
+++ b/graf2d/gviz/Module.mk
@@ -49,7 +49,7 @@ $(GVIZLIB):     $(GVIZO) $(GVIZDO) $(ORDER_) $(MAINLIBS) $(GVIZLIBDEP)
 $(GVIZDS):      $(GVIZH) $(GVIZL) $(ROOTCINTTMPDEP)
 		$(MAKEDIR)
 		@echo "Generating dictionary $@..."
-		$(ROOTCINTTMP) -f $@ -c $(GVIZH) $(GVIZL)
+		$(ROOTCINTTMP) -f $@ -c $(GRAPHVIZINCDIR:%=-I%) $(GVIZH) $(GVIZL)
 
 $(GVIZMAP):     $(RLIBMAP) $(MAKEFILEDEP) $(GVIZL)
 		$(RLIBMAP) -o $@ -l $(GVIZLIB) \
diff --git a/graf2d/gviz/inc/TGraphEdge.h b/graf2d/gviz/inc/TGraphEdge.h
index 0253ebdc9d77545223aa78d41dd1e8ffe6fb6ace..00b8126788e30d8b401c7afe5e4a7d3aa2d98c89 100644
--- a/graf2d/gviz/inc/TGraphEdge.h
+++ b/graf2d/gviz/inc/TGraphEdge.h
@@ -20,9 +20,8 @@
 #include "TAttLine.h"
 #endif
 
-struct Agraph_t;
-struct Agedge_t;
-class  TGraphNode;
+#include <gvc.h>
+class TGraphNode;
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/inc/TGraphNode.h b/graf2d/gviz/inc/TGraphNode.h
index 1d9691e46ddc4e4348f42efb8876fcba398b485f..50714db1d320af20fd156a2bd891e9e41cfcbfeb 100644
--- a/graf2d/gviz/inc/TGraphNode.h
+++ b/graf2d/gviz/inc/TGraphNode.h
@@ -28,9 +28,7 @@
 #include "TAttLine.h"
 #endif
 
-struct Agraph_t;
-struct Agnode_t;
-
+#include <gvc.h>
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/inc/TGraphStruct.h b/graf2d/gviz/inc/TGraphStruct.h
index bddc09939e94583270e44a178b3eb103942bc073..af1dce7be94518263f55fc1265dacc52ff0a1e91 100644
--- a/graf2d/gviz/inc/TGraphStruct.h
+++ b/graf2d/gviz/inc/TGraphStruct.h
@@ -25,8 +25,7 @@
 #include "TList.h"
 #endif
 
-struct Agraph_t;
-struct GVC_s;
+#include <gvc.h>
 
 //////////////////////////////////////////////////////////////////////////
 //                                                                      //
diff --git a/graf2d/gviz/src/TGraphEdge.cxx b/graf2d/gviz/src/TGraphEdge.cxx
index 2a2961ca6c2e626c6d18fe30fcf9298dff69e68d..27c667161a127d0d32de0933ac608a200e591c9f 100644
--- a/graf2d/gviz/src/TGraphEdge.cxx
+++ b/graf2d/gviz/src/TGraphEdge.cxx
@@ -15,8 +15,6 @@
 #include "TGraphEdge.h"
 #include "TGraphNode.h"  
 
-#include <gvc.h>
-
 ClassImp(TGraphEdge)
 
 //______________________________________________________________________________
diff --git a/graf2d/gviz/src/TGraphNode.cxx b/graf2d/gviz/src/TGraphNode.cxx
index 9396169470cd88b3d90471d9c5c0f8ed6db57519..e0aa7206ac49adea1d8d0e34850777ee3c172b8a 100644
--- a/graf2d/gviz/src/TGraphNode.cxx
+++ b/graf2d/gviz/src/TGraphNode.cxx
@@ -13,8 +13,6 @@
 #include "TEllipse.h"
 #include "TGraphNode.h"
 
-#include <gvc.h>
-
 ClassImp(TGraphNode)
 
 //______________________________________________________________________________
diff --git a/graf2d/gviz/src/TGraphStruct.cxx b/graf2d/gviz/src/TGraphStruct.cxx
index b421a9bb2c83133d68c59622de480396ba6cf953..cdf9aa29cb7e15c1bf1d72aeaf77b0a445e3fc0e 100644
--- a/graf2d/gviz/src/TGraphStruct.cxx
+++ b/graf2d/gviz/src/TGraphStruct.cxx
@@ -15,7 +15,6 @@
 
 #include <stdio.h>
 
-#include <gvc.h>
 #include <gvplugin.h>
 
 #ifdef GVIZ_STATIC