diff --git a/ocat b/ocat
index 0f61f8f2..bbffc6ba 100755
Binary files a/ocat and b/ocat differ
diff --git a/showdef.REMOVED.git-id b/showdef.REMOVED.git-id
index 4d8f93d1..a39bc796 100644
--- a/showdef.REMOVED.git-id
+++ b/showdef.REMOVED.git-id
@@ -1 +1 @@
-001ab0162d79fe0a1e444b48e300d4cfdf96658d
\ No newline at end of file
+0f11ebfcfc8347eb44b0170a3d9f9a196600dd98
\ No newline at end of file
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.REMOVED.git-id b/voc.REMOVED.git-id
index 3428c599..cf95ff0c 100644
--- a/voc.REMOVED.git-id
+++ b/voc.REMOVED.git-id
@@ -1 +1 @@
-bf2f9505d7b7ae83b6b2e227becbfd2505d1ae85
\ No newline at end of file
+09450eb346c6cc2c136316f7b2010d955a9b3c5a
\ No newline at end of file
diff --git a/vocstatic.linux.clang.x86_64.REMOVED.git-id b/vocstatic.linux.clang.x86_64.REMOVED.git-id
index 3c1beac3..cf95ff0c 100644
--- a/vocstatic.linux.clang.x86_64.REMOVED.git-id
+++ b/vocstatic.linux.clang.x86_64.REMOVED.git-id
@@ -1 +1 @@
-e333e29633f079351b61c784c08d606afcb68ffd
\ No newline at end of file
+09450eb346c6cc2c136316f7b2010d955a9b3c5a
\ No newline at end of file