diff --git a/src/tools/mkvisitor/main.cpp b/src/tools/mkvisitor/main.cpp
index eee0a18e49f45d18996f755aae07fbc7672de396..eca51df6f251f031a0fb2d72af632f73eb5480a7 100644
--- a/src/tools/mkvisitor/main.cpp
+++ b/src/tools/mkvisitor/main.cpp
@@ -442,7 +442,7 @@ int main(int argc, char *argv[])
 
         Document::Ptr doc = Document::create(fileName);
         //doc->control()->setDiagnosticClient(0);
-        doc->setSource(source);
+        doc->setUtf8Source(source);
         doc->parse();
 
         doc->translationUnit()->blockErrors(true);
diff --git a/src/tools/mkvisitor/mkvisitor b/src/tools/mkvisitor/mkvisitor
index 0a6f67da532df6e985166de4a89683276985f579..1c6444ba6e03c8900ed2482a71e454cac8aba4d9 100755
--- a/src/tools/mkvisitor/mkvisitor
+++ b/src/tools/mkvisitor/mkvisitor
@@ -1,5 +1,5 @@
 #!/bin/sh
 me=$(dirname $0)
-${CPP-gcc} -DCPLUSPLUS_WITHOUT_QT -U__BLOCKS__ -xc++ -E -include $me/conf.c++ ../../shared/cplusplus/AST.h > $me/file.i
+${CPP-gcc} -DCPLUSPLUS_WITHOUT_QT -U__BLOCKS__ -xc++ -E -include $me/conf.c++ ../../libs/3rdparty/cplusplus/AST.h > $me/file.i
 $me/cplusplus0 $me/file.i
 rm -f $me/file.i