diff --git a/Makefile.am b/Makefile.am
index 17be50566e4..02132362e85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,6 +105,7 @@ EXTRA_DIST = config/config.rpath
 # latest graph-includes.pl can be found currently at http://ydirson.free.fr/soft/wesnoth/graphs/
 wesnoth-deps.dot:
 	(cd $(top_srcdir) && graph-includes -v --class wesnoth --group 1-1 \
+	  -sysI /usr/include/c++/3.3 -sysI /usr/include -sysI /usr/include/SDL \
 	  --prefixstrip src/ -I src `find src -name '*.[ch]pp'`) > $@
 %.ps: %.dot
 	dot -Tps $< > $@
diff --git a/graphincludes/project/wesnoth.pm b/graphincludes/project/wesnoth.pm
index 9fd4d18f00a..66ca3c04770 100644
--- a/graphincludes/project/wesnoth.pm
+++ b/graphincludes/project/wesnoth.pm
@@ -9,10 +9,12 @@ use warnings;
 
 use base qw(graphincludes::project::default);
 
+use graphincludes::params;
+
 sub filelabel {
   my $self = shift;
   my ($file,$level) = @_;
-  $level = $main::minshow unless defined $level;
+  $level = $graphincludes::params::minshow unless defined $level;
 
   # 0: file