diff --git a/ocat b/ocat
index 0f61f8f2..bbffc6ba 100755
Binary files a/ocat and b/ocat differ
diff --git a/showdef b/showdef
index 001ab016..0f11ebfc 100755
Binary files a/showdef and b/showdef differ
diff --git a/src/voc/darwin/clang/extTools.Mod b/src/voc/darwin/clang/extTools.Mod
index d8d03c6d..466af114 100644
--- a/src/voc/darwin/clang/extTools.Mod
+++ b/src/voc/darwin/clang/extTools.Mod
@@ -82,8 +82,10 @@ BEGIN
 
 incPath0 := "src/lib/system/darwin/clang";
 incPath1 := "lib/voc/obj ";
-ccOpt := " -fPIC -g -I ";
-COPY (version.prefix, tmp1);
+ccOpt := " -fPIC -g ";
+
+COPY ("-I ", tmp1);
+Strings.Append (version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath0, tmp1);
 Strings.Append("/", tmp1);
diff --git a/src/voc/linux/clang/extTools.Mod b/src/voc/linux/clang/extTools.Mod
index ea182754..58c28991 100644
--- a/src/voc/linux/clang/extTools.Mod
+++ b/src/voc/linux/clang/extTools.Mod
@@ -50,6 +50,11 @@ IF statically THEN Strings.Append(" -static ", cmd) END;
 Strings.Append(" -o ", cmd);
 Strings.Append(m, cmd);
 Strings.Append(" ", cmd);
+
+Strings.Append (" -lVishapOberon -L. -L", ccOpt);
+Strings.Append (version.prefix, ccOpt);
+Strings.Append ("/lib ", ccOpt);
+
 Strings.Append(ccOpt, cmd);
 Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *)
 Unix.system(cmd);
@@ -59,8 +64,10 @@ BEGIN
 
 incPath0 := "src/lib/system/linux/clang";
 incPath1 := "lib/voc/obj ";
-ccOpt := " -fPIC -g -I ";
-COPY (version.prefix, tmp1);
+ccOpt := " -fPIC -g ";
+
+COPY ("-I ", tmp1);
+Strings.Append (version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath0, tmp1);
 Strings.Append("/", tmp1);
@@ -70,9 +77,6 @@ Strings.Append(version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath1, tmp1);
 Strings.Append(tmp1, ccOpt);
-Strings.Append ("-lVishapOberon -L. -L", ccOpt);
-Strings.Append (version.prefix, ccOpt);
-Strings.Append ("/lib ", ccOpt);
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
diff --git a/src/voc/linux/gnuc/extTools.Mod b/src/voc/linux/gnuc/extTools.Mod
index 92b08077..49cd393f 100644
--- a/src/voc/linux/gnuc/extTools.Mod
+++ b/src/voc/linux/gnuc/extTools.Mod
@@ -50,6 +50,11 @@ IF statically THEN Strings.Append(" -static ", cmd) END;
 Strings.Append(" -o ", cmd);
 Strings.Append(m, cmd);
 Strings.Append(" ", cmd);
+
+Strings.Append (" -lVishapOberon -L. -L", ccOpt);
+Strings.Append (version.prefix, ccOpt);
+Strings.Append ("/lib ", ccOpt);
+
 Strings.Append(ccOpt, cmd);
 Console.Ln; Console.String(cmd); Console.Ln; (* may be it's feasible to add debug mode later *)
 Unix.system(cmd);
@@ -59,8 +64,10 @@ BEGIN
 
 incPath0 := "src/lib/system/linux/gnuc";
 incPath1 := "lib/voc/obj ";
-ccOpt := " -fPIC -g -I ";
-COPY (version.prefix, tmp1);
+ccOpt := " -fPIC -g ";
+
+COPY ("-I ", tmp1);
+Strings.Append (version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath0, tmp1);
 Strings.Append("/", tmp1);
@@ -70,9 +77,11 @@ Strings.Append(version.prefix, tmp1);
 Strings.Append("/", tmp1);
 Strings.Append(incPath1, tmp1);
 Strings.Append(tmp1, ccOpt);
+(*
 Strings.Append ("-lVishapOberon -L. -L", ccOpt);
 Strings.Append (version.prefix, ccOpt);
 Strings.Append ("/lib ", ccOpt);
+*)
 Args.GetEnv("CFLAGS", CFLAGS);
 Strings.Append (CFLAGS, ccOpt);
 Strings.Append (" ", ccOpt);
diff --git a/voc b/voc
index bf2f9505..09450eb3 100755
Binary files a/voc and b/voc differ
diff --git a/vocstatic.linux.clang.x86_64 b/vocstatic.linux.clang.x86_64
index e333e296..09450eb3 100755
Binary files a/vocstatic.linux.clang.x86_64 and b/vocstatic.linux.clang.x86_64 differ