diff --git a/C/blobs.c b/C/blobs.c
index 54c61e38e..d04b5e083 100644
--- a/C/blobs.c
+++ b/C/blobs.c
@@ -17,7 +17,11 @@
 /* for freeBSD9.1 */
 #define _WITH_DPRINTF
 
-#ifdef __APPLE__
+#ifdef CONDA_BUILD
+#undef HAVE_FMEMOPEN
+#endif
+
+#ifdef __APPLE__ 
 #include "fmemopen.h"
 #endif
 
diff --git a/C/errors.c b/C/errors.c
index eba50848a..a7ad9b6d2 100755
--- a/C/errors.c
+++ b/C/errors.c
@@ -310,7 +310,7 @@ void Yap_pushErrorContext(yap_error_descriptor_t *new_error) {
 }
 
 yap_error_descriptor_t *Yap_popErrorContext(void) {
- struct  yap_error_descriptor_t *new_error = LOCAL_ActiveError;
+ yap_error_descriptor_t *new_error = LOCAL_ActiveError;
   LOCAL_ActiveError = LOCAL_ActiveError->top_error;
   return new_error;
 }
diff --git a/C/stack.c b/C/stack.c
index 2a96f5a20..6f3761b66 100644
--- a/C/stack.c
+++ b/C/stack.c
@@ -1099,7 +1099,7 @@ bool set_clause_info(yamop *codeptr, PredEntry *pp) {
     }
     LOCAL_ActiveError->prologPredModule =
             (pp->ModuleOfPred ? RepAtom(AtomOfTerm(pp->ModuleOfPred))->StrOfAE : "prolog");
-    LOCAL_ActiveError->prologPredFile = RepAtom(pp->src.OwnerFile->StrOfAE);
+    LOCAL_ActiveError->prologPredFile = RepAtom(pp->src.OwnerFile)->StrOfAE;
     if (codeptr->opc == UNDEF_OPCODE) {
         LOCAL_ActiveError->prologPredFirstLine = 0;
         LOCAL_ActiveError->prologPredLine = 0;
diff --git a/C/yap-args.c b/C/yap-args.c
index dd894c189..70e4769a6 100755
--- a/C/yap-args.c
+++ b/C/yap-args.c
@@ -9,7 +9,7 @@
  **************************************************************************
  *									 *
  * File:		Yap.C * Last
- *Rev:								 
+ *Rev:
  * Mods:
  ** Comments:	Yap's Main File: parse arguments			 *
  *									 *
@@ -58,7 +58,7 @@
 #include <direct.h>
 #endif
 
-#ifndef YAP_ROOTDIR
+#if HAVE_LIBGEN_H
 #include <libgen.h>
 
 #endif
@@ -67,74 +67,71 @@ const char *Yap_BINDIR, *Yap_ROOTDIR, *Yap_SHAREDIR, *Yap_LIBDIR, *Yap_DLLDIR,
     *Yap_PLDIR, *Yap_BOOTPLDIR, *Yap_BOOTSTRAPPLDIR, *Yap_COMMONSDIR,
     *Yap_STARTUP, *Yap_BOOTFILE;
 
-
 static int yap_lineno = 0;
 
 /* do initial boot by consulting the file boot.yap */
 static void do_bootfile(const char *b_file USES_REGS) {
-    Term t;
-    int boot_stream, osno;
-    Functor functor_query = Yap_MkFunctor(Yap_LookupAtom("?-"), 1);
-    Functor functor_command1 = Yap_MkFunctor(Yap_LookupAtom(":-"), 1);
+  Term t;
+  int boot_stream, osno;
+  Functor functor_query = Yap_MkFunctor(Yap_LookupAtom("?-"), 1);
+  Functor functor_command1 = Yap_MkFunctor(Yap_LookupAtom(":-"), 1);
 
-    /* consult boot.pl */
-    char *full = malloc(YAP_FILENAME_MAX + 1);
-    full[0] = '\0';
-    /* the consult mode does not matter here, really */
-    boot_stream = YAP_InitConsult(YAP_BOOT_MODE, b_file, full, &osno);
-    if (boot_stream < 0) {
-        fprintf(stderr, "[ FATAL ERROR: could not open boot_stream %s ]\n",
-                b_file);
-        exit(1);
+  /* consult boot.pl */
+  char *full = malloc(YAP_FILENAME_MAX + 1);
+  full[0] = '\0';
+  /* the consult mode does not matter here, really */
+  boot_stream = YAP_InitConsult(YAP_BOOT_MODE, b_file, full, &osno);
+  if (boot_stream < 0) {
+    fprintf(stderr, "[ FATAL ERROR: could not open boot_stream %s ]\n", b_file);
+    exit(1);
+  }
+  free(full);
+  setAtomicGlobalPrologFlag(RESOURCE_DATABASE_FLAG,
+                            MkAtomTerm(GLOBAL_Stream[boot_stream].name));
+  do {
+    CACHE_REGS
+    YAP_Reset(YAP_FULL_RESET);
+    Yap_StartSlots();
+    t = YAP_ReadClauseFromStream(boot_stream);
+
+    // Yap_DebugPlWriteln(t);
+    if (t == 0) {
+      fprintf(stderr,
+              "[ SYNTAX ERROR: while parsing boot_stream %s at line %d ]\n",
+              b_file, yap_lineno);
+    } else if (YAP_IsVarTerm(t) || t == TermNil) {
+      fprintf(stderr, "[ line %d: term cannot be compiled ]", yap_lineno);
+    } else if (YAP_IsPairTerm(t)) {
+      fprintf(stderr, "[ SYSTEM ERROR: consult not allowed in boot file ]\n");
+      fprintf(stderr, "error found at line %d and pos %d", yap_lineno,
+              fseek(GLOBAL_Stream[boot_stream].file, 0L, SEEK_CUR));
+    } else if (IsApplTerm(t) && (FunctorOfTerm(t) == functor_query ||
+                                 FunctorOfTerm(t) == functor_command1)) {
+      YAP_RunGoalOnce(ArgOfTerm(1, t));
+    } else {
+      Term ts[2];
+      char *ErrorMessage;
+      Functor fun = Yap_MkFunctor(Yap_LookupAtom("$prepare_clause"), 2);
+      PredEntry *pe = RepPredProp(PredPropByFunc(fun, PROLOG_MODULE));
+
+      if (pe->OpcodeOfPred != UNDEF_OPCODE && pe->OpcodeOfPred != FAIL_OPCODE) {
+        ts[0] = t;
+        RESET_VARIABLE(ts + 1);
+        if (YAP_RunGoal(Yap_MkApplTerm(fun, 2, ts)))
+          t = ts[1];
+      }
+      ErrorMessage = YAP_CompileClause(t);
+      if (ErrorMessage) {
+        fprintf(stderr, "%s", ErrorMessage);
+      }
     }
-    free(full);
-    setAtomicGlobalPrologFlag(
-			      RESOURCE_DATABASE_FLAG,
-			      MkAtomTerm(GLOBAL_Stream[boot_stream].name));
-    do {
-        CACHE_REGS
-        YAP_Reset(YAP_FULL_RESET);
-        Yap_StartSlots();
-        t = YAP_ReadClauseFromStream(boot_stream);
-
-        // Yap_DebugPlWriteln(t);
-        if (t == 0) {
-            fprintf(stderr,
-                    "[ SYNTAX ERROR: while parsing boot_stream %s at line %d ]\n",
-                    b_file, yap_lineno);
-        } else if (YAP_IsVarTerm(t) || t == TermNil) {
-            fprintf(stderr, "[ line %d: term cannot be compiled ]", yap_lineno);
-        } else if (YAP_IsPairTerm(t)) {
-            fprintf(stderr, "[ SYSTEM ERROR: consult not allowed in boot file ]\n");
-            fprintf(stderr, "error found at line %d and pos %d", yap_lineno,
-                    fseek(GLOBAL_Stream[boot_stream].file, 0L, SEEK_CUR));
-        } else if (IsApplTerm(t) && (FunctorOfTerm(t) == functor_query ||
-                                     FunctorOfTerm(t) == functor_command1)) {
-            YAP_RunGoalOnce(ArgOfTerm(1, t));
-        } else {
-            Term ts[2];
-            char *ErrorMessage;
-            Functor fun = Yap_MkFunctor(Yap_LookupAtom("$prepare_clause"), 2);
-            PredEntry *pe = RepPredProp(PredPropByFunc(fun, PROLOG_MODULE));
-
-            if (pe->OpcodeOfPred != UNDEF_OPCODE && pe->OpcodeOfPred != FAIL_OPCODE) {
-                ts[0] = t;
-                RESET_VARIABLE(ts + 1);
-                if (YAP_RunGoal(Yap_MkApplTerm(fun, 2, ts)))
-                    t = ts[1];
-            }
-            ErrorMessage = YAP_CompileClause(t);
-            if (ErrorMessage) {
-                fprintf(stderr, "%s", ErrorMessage);
-            }
-        }
-    } while (t != TermEof);
+  } while (t != TermEof);
   BACKUP_MACHINE_REGS();
- 
-    YAP_EndConsult(boot_stream, &osno);
+
+  YAP_EndConsult(boot_stream, &osno);
 #if DEBUG
-    if (Yap_output_msg)
-        fprintf(stderr, "Boot loaded\n");
+  if (Yap_output_msg)
+    fprintf(stderr, "Boot loaded\n");
 #endif
 }
 
@@ -187,52 +184,44 @@ const char *plnames[] = {"@YapPrologBootFile", YAP_BOOTFILE, "boot.yap", NULL};
 char *location(YAP_init_args *iap, const char *inp, char *out) {
   if (inp == NULL || inp[0] == '\0') {
     return NULL;
-  } else if (inp[0] == '(') {
-    if (strstr(inp + 1, "root") == inp + 1) {
-      if (!Yap_ROOTDIR || Yap_ROOTDIR[0] == '\0') {
-        return NULL;
-      }
+  }
+  out[0] = '\0';
+  if (inp[0] == '(') {
+    if (strstr(inp + 1, "root") == inp + 1 && Yap_ROOTDIR &&
+        Yap_ROOTDIR[0] != '\0') {
       strcpy(out, Yap_ROOTDIR);
       strcat(out, "/");
       strcat(out, inp + strlen("(root)"));
-    } else if (strstr(inp + 1, "bin") == inp + 1) {
-      if (!Yap_BINDIR || Yap_BINDIR[0] == '\0') {
-        return NULL;
-      }
+    } else if (strstr(inp + 1, "bin") == inp + 1 && Yap_BINDIR &&
+               Yap_BINDIR[0] != '\0') {
       strcpy(out, Yap_BINDIR);
       strcat(out, "/");
       strcat(out, inp + strlen("(bin)"));
-    } else if (strstr(inp + 1, "lib") == inp + 1) {
-      if (!Yap_LIBDIR || Yap_LIBDIR[0] == '\0') {
-        return NULL;
-      }
+    } else if (strstr(inp + 1, "lib") == inp + 1 && Yap_LIBDIR &&
+               Yap_LIBDIR[0] != '\0') {
       strcpy(out, Yap_LIBDIR);
       strcat(out, "/");
       strcat(out, inp + strlen("(lib)"));
-    } else if (strstr(inp + 1, "share") == inp + 1) {
-      if (!Yap_SHAREDIR || Yap_SHAREDIR[0] == '\0') {
-        return NULL;
-      }
+    } else if (strstr(inp + 1, "share") == inp + 1 && Yap_SHAREDIR &&
+               Yap_SHAREDIR[0] != '\0') {
       strcpy(out, Yap_SHAREDIR);
       strcat(out, "/");
       strcat(out, inp + strlen("(share)"));
-    } else if (strstr(inp + 1, "pl") == inp + 1) {
-      if (!Yap_PLDIR || Yap_PLDIR[0] == '\0') {
-        return NULL;
-      }
+    } else if (strstr(inp + 1, "pl") == inp + 1 && Yap_PLDIR &&
+               Yap_PLDIR[0] != '\0') {
       strcpy(out, Yap_PLDIR);
       strcat(out, "/");
       strcat(out, inp + strlen("(pl)"));
-    }else if (strstr(inp + 1, "execdir") == inp + 1) {
-	const char *ex = Yap_FindExecutable();
-	if (ex == NULL)
-	  return NULL;
-	strcpy(out, dirname(ex));
-	strcat(out, "/");
-	strcat(out, inp + strlen("(execdir)"));
-      } else
-	return NULL;
-    } else if (inp[0] == '@') {
+    } else if (strstr(inp + 1, "execdir") == inp + 1) {
+      char *buf = Malloc(YAP_FILENAME_MAX+1);
+      const char *ex = Yap_AbsoluteFile(Yap_FindExecutable(), buf, false);
+      if (ex != NULL) {
+        strcpy(out, dirname((char *)ex));
+        strcat(out, "/");
+        strcat(out, inp + strlen("(execdir)"));
+      }
+    }
+  } else if (inp[0] == '@') {
 
     if (strstr(inp + 1, "YapPrologBootFile") == inp + 1) {
       const char *tmp;
@@ -244,84 +233,75 @@ char *location(YAP_init_args *iap, const char *inp, char *out) {
       if (tmp && tmp[0])
         strcpy(out, tmp);
     }
-    return NULL;
   } else if (inp[0] == '$') {
     char *e;
     if ((e = getenv(inp + 1)) != NULL) {
       strcpy(out, e);
     }
-    return NULL;
   } else if (inp[0] == '?') {
 #if _WINDOWS_
     char *e;
     if ((e = Yap_RegistryGetString(inp + 1)) != NULL) {
       strcpy(out, e);
-    } else
+    }
 #endif
-      return NULL;
   } else if (inp[0] == '~') {
     char *e;
     if ((e = getenv("HOME")) != NULL) {
-      strcpy(out, e);
+      if (inp[1] == '\0') {
+        strcpy(out, e);
+      } else if (inp[1] == '/') {
+        strcpy(out, e);
+        strcat(out, inp + 1);
+      }
     }
-    if (inp[1] != '\0')
-      strcat(out, inp + 1);
   } else if (inp[0] == '[') {
-    char *o = out;
-    const char *e;
-    if ((e = getenv("DESTDIR"))) {
-      strcpy(out, e);
-      o += strlen(e);
-    }
-    if (strstr(inp + 1, "root") == inp + 1) {
+      char *o = out;
+      const char *e;
+      if ((e = getenv("DESTDIR"))) {
+        strcpy(out, e);
+        o += strlen(e);
+      }
+      if (strstr(inp + 1, "root") == inp + 1) {
 #ifdef YAP_ROOTDIR
-      strcpy(o, YAP_ROOTDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_ROOTDIR);
 #endif
-    } else if (strstr(inp + 1, "lib") == inp + 1) {
+      } else if (strstr(inp + 1, "lib") == inp + 1) {
 #ifdef YAP_LIBDIR
-      strcpy(o, YAP_LIBDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_LIBDIR);
 #endif
-    } else if (strstr(inp + 1, "share") == inp + 1) {
+      } else if (strstr(inp + 1, "share") == inp + 1) {
 #ifdef YAP_SHAREDIR
-      strcpy(o, YAP_SHAREDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_SHAREDIR);
 #endif
-    } else if (strstr(inp + 1, "dll") == inp + 1) {
+      } else if (strstr(inp + 1, "dll") == inp + 1) {
 #ifdef YAP_DLLDIR
-      strcpy(o, YAP_DLLDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_DLLDIR);
 #endif
-    } else if (strstr(inp + 1, "pl") == inp + 1) {
+      } else if (strstr(inp + 1, "pl") == inp + 1) {
 #ifdef YAP_PLDIR
-      strcpy(o, YAP_PLDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_PLDIR);
 #endif
-    } else if (strstr(inp + 1, "commons") == inp + 1) {
+      } else if (strstr(inp + 1, "commons") == inp + 1) {
 #ifdef YAP_COMMONSDIR
-      strcpy(o, YAP_COMMONSDIR);
-#else
-      return NULL;
+        strcpy(o, YAP_COMMONSDIR);
 #endif
+      }
+    } else {
+      strcpy(out, inp);
     }
-  } else {
-    strcpy(out, inp);
+  if (out[0]) {
+    return out;
   }
-  return out;
+  return NULL;
 }
 
 /**
  * @brief find default paths for main YAP variables
  *
- * This function is called once at boot time to set the main paths; it searches
- * a list of paths to instantiate a number of variables. Paths must be
- * directories.
+ * This function is called once at boot time to set the main paths; it
+ * searches a list of paths to instantiate a number of variables. Paths must
+ * be directories.
  *
  * It treats the following variables as :
  *  ROOTDIR, SHAREDIR, LIBDIR, EXECUTABLE
@@ -363,12 +343,28 @@ static const char *find_directory(YAP_init_args *iap, const char *paths[],
 static void Yap_set_locations(YAP_init_args *iap) {
 #if CONDA_BUILD
   if (!getenv("DESTDIR")) {
-    char buf[YAP_FILENAME_MAX + 1];
+    char *buf = Malloc( YAP_FILENAME_MAX + 1);
     const char *o = Yap_FindExecutable();
     if (!o)
       return;
-    strcpy(buf, dirname(dirname(o)));
-    putenv("DESTDIR", buf)k
+    o = Yap_AbsoluteFile(o, buf, false);
+      Int i = strlen(o);
+      while (--i) {
+	if (Yap_dir_separator((int)o[i]))
+	  break;
+      }
+      if (i == 0) {     setenv("DESTDIR", "/", 1); }
+      else {
+     while (--i) {
+	if (Yap_dir_separator((int)o[i]))
+	  break;
+      }
+           if (i == 0) {     setenv("DESTDIR", "/", 1); }
+	   else  {     setenv("DESTDIR", o, 1); }
+      }
+
+
+    setenv("DESTDIR", buf, 1);
   }
 #endif
   Yap_ROOTDIR = find_directory(iap, rootdirs, NULL);
@@ -383,10 +379,14 @@ static void Yap_set_locations(YAP_init_args *iap) {
     Yap_BOOTFILE = find_directory(iap, bootstrappldirs, plnames);
   else
     Yap_BOOTFILE = find_directory(iap, bootpldirs, plnames);
-  setAtomicGlobalPrologFlag( HOME_FLAG, MkAtomTerm(Yap_LookupAtom(Yap_ROOTDIR)));
-  setAtomicGlobalPrologFlag( PROLOG_LIBRARY_DIRECTORY_FLAG,MkAtomTerm(Yap_LookupAtom(Yap_PLDIR)));
-  setAtomicGlobalPrologFlag( PROLOG_FOREIGN_DIRECTORY_FLAG, MkAtomTerm(Yap_LookupAtom(Yap_DLLDIR)));
-  
+  if (Yap_ROOTDIR)
+    setAtomicGlobalPrologFlag(HOME_FLAG, MkAtomTerm(Yap_LookupAtom(Yap_ROOTDIR)));
+  if (Yap_PLDIR)
+    setAtomicGlobalPrologFlag(PROLOG_LIBRARY_DIRECTORY_FLAG,
+                            MkAtomTerm(Yap_LookupAtom(Yap_PLDIR)));
+  if (Yap_DLLDIR)
+    setAtomicGlobalPrologFlag(PROLOG_FOREIGN_DIRECTORY_FLAG,
+                            MkAtomTerm(Yap_LookupAtom(Yap_DLLDIR)));
 }
 
 static void print_usage(void) {
@@ -792,9 +792,8 @@ X_API YAP_file_type_t YAP_parse_yap_arguments(int argc, char *argv[],
         else {
           argc--;
           if (argc == 0) {
-            fprintf(
-                stderr,
-                " [ YAP unrecoverable error: missing goal for option 'z' ]\n");
+            fprintf(stderr, " [ YAP unrecoverable error: missing goal for "
+                            "option 'z' ]\n");
             exit(EXIT_FAILURE);
           }
           argv++;
@@ -851,9 +850,8 @@ X_API YAP_file_type_t YAP_parse_yap_arguments(int argc, char *argv[],
         else {
           argc--;
           if (argc == 0) {
-            fprintf(
-                stderr,
-                " [ YAP unrecoverable error: missing paths for option 'p' ]\n");
+            fprintf(stderr, " [ YAP unrecoverable error: missing paths for "
+                            "option 'p' ]\n");
             exit(EXIT_FAILURE);
           }
           argv++;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5df095e63..72fbd2158 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -547,7 +547,7 @@ set_property(DIRECTORY PROPERTY CXX_STANDARD 11)
 
 # add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
-# SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 
 # the RPATH to be used when installing, but only if it's not a system directory
diff --git a/H/YapFlags.h b/H/YapFlags.h
index 406d97a77..b9837678a 100644
--- a/H/YapFlags.h
+++ b/H/YapFlags.h
@@ -193,8 +193,8 @@ static inline Term options(Term inp) {
   return Yap_IsGroundTerm(inp) ? inp : TermZERO;
 }
 
-static inline Term rootdir(Term inp) {
-  return MkAtomTerm(Yap_LookupAtom(Yap_ROOTDIR));
+static inline const char *                                                                                    rootdir(Term inp) {
+  return Yap_ROOTDIR;
 }
 
 // INLINE_ONLY inline EXTERN  Term ok( Term inp );
diff --git a/H/YapGFlagInfo.h b/H/YapGFlagInfo.h
index 0bb54e64c..dd2bf501d 100644
--- a/H/YapGFlagInfo.h
+++ b/H/YapGFlagInfo.h
@@ -236,7 +236,7 @@ process, namely, on choice-points.
     YAP_FLAG(GMP_VERSION_FLAG, "gmp_version", false, isatom, "4.8.12", NULL),
     YAP_FLAG(HALT_AFTER_CONSULT_FLAG, "halt_after_consult", false, booleanFlag,
              "false", NULL),
-   YAP_FLAG(HOME_FLAG, "home", false, isatom, rootdir, NULL), /**< home `
+  YAP_FLAG(HOME_FLAG, "home", false, isatom, YAP_ROOTDIR, NULL), /**< home `
 
 the root of the YAP installation, by default `/usr/local` in Unix or
 `c:\Yap` in Windows system. Can only be set at configure time
diff --git a/H/Yapproto.h b/H/Yapproto.h
index e8f8c5791..45a03b0cf 100755
--- a/H/Yapproto.h
+++ b/H/Yapproto.h
@@ -292,6 +292,9 @@ extern void Yap_InitInlines(void);
 extern int Yap_eq(Term, Term);
 
 /* iopreds.c */
+extern bool Yap_IsAbsolutePath(const char *p, bool);
+extern Atom Yap_TemporaryFile(const char *prefix, int *fd);
+extern const char *Yap_AbsoluteFile(const char *spec, char *obuf, bool expand);
 extern void Yap_InitPlIO( struct yap_boot_params *ts );
 extern void Yap_InitBackIO(void);
 extern void Yap_InitIOPreds(void);
diff --git a/include/YapError.h b/include/YapError.h
index 526956b46..d2e907abb 100644
--- a/include/YapError.h
+++ b/include/YapError.h
@@ -178,7 +178,7 @@ INLINE_ONLY extern inline Term Yap_ensure_atom__(const char *fu, const char *fi,
 
   /// a Prolog goal that caused a bug
 
-  typedef struct error_prolog_source {
+  typedef struct yap_error_prolog_source {
     intptr_t prologPredCl;
     uintptr_t prologPredLine;
     uintptr_t prologPredFirstLine;
@@ -189,10 +189,10 @@ INLINE_ONLY extern inline Term Yap_ensure_atom__(const char *fu, const char *fi,
       const char *  prologPredFile;
     void *errorGoal;
     struct error_prolog_source *errorParent;
-  } error_prolog_source_t;
+  } yap_error_prolog_source_t;
 
   /// all we need to know about an error/throw
-  typedef struct error_descriptor {
+  typedef struct s_yap_error_descriptor {
     enum yap_error_status status;
     yap_error_class_number errorClass;
     const char * errorAsText;
@@ -220,7 +220,7 @@ INLINE_ONLY extern inline Term Yap_ensure_atom__(const char *fu, const char *fi,
     uintptr_t rawErrorTerm, rawExtraErrorTerm;
     char *errorMsg;
     size_t errorMsgLen;
-    struct yap_error_descriptor *top_error;
+    struct s_yap_error_descriptor *top_error;
   } yap_error_descriptor_t;
 
 /// compatibility with existing code..
diff --git a/os/sysbits.c b/os/sysbits.c
index 8697ca0cb..45d6732c8 100644
--- a/os/sysbits.c
+++ b/os/sysbits.c
@@ -954,8 +954,6 @@ static Int p_rmdir(USES_REGS1) {
 static bool initSysPath(Term tlib, Term tcommons, bool dir_done,
                         bool commons_done) {
   CACHE_REGS
-  int len;
-  char *dir;
 
   if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(Yap_PLDIR))))
     return false;
diff --git a/os/yapio.h b/os/yapio.h
index 5a0173876..bd4cb1f9e 100644
--- a/os/yapio.h
+++ b/os/yapio.h
@@ -103,10 +103,6 @@ extern int Yap_growheap_in_parser(tr_fr_ptr *, TokEntry **, VarEntry **);
 extern int Yap_growstack_in_parser(tr_fr_ptr *, TokEntry **, VarEntry **);
 extern int Yap_growtrail_in_parser(tr_fr_ptr *, TokEntry **, VarEntry **);
 
-extern bool Yap_IsAbsolutePath(const char *p, bool);
-extern Atom Yap_TemporaryFile(const char *prefix, int *fd);
-extern const char *Yap_AbsoluteFile(const char *spec, char *obuf, bool expand);
-
 typedef enum mem_buf_source {
   MEM_BUF_MALLOC = 1,
   MEM_BUF_USER = 2