diff --git a/H/Yapproto.h b/H/Yapproto.h
index 84fd6ff0f..773d7c78b 100755
--- a/H/Yapproto.h
+++ b/H/Yapproto.h
@@ -295,6 +295,7 @@ extern void Yap_DebugErrorPuts(const char *s);
 extern void Yap_DebugWriteIndicator(struct pred_entry *ap);
 void Yap_PlWriteToStream(Term, int, int);
 /* depth_lim.c */
+bool   Yap_InitReadline(Term t);
 void Yap_InitItDeepenPreds(void);
 struct AliasDescS *Yap_InitStandardAliases(void);
 
@@ -485,7 +486,7 @@ struct AtomEntryStruct *Yap_lookupBlob(void *blob, size_t len, void *type,
 void Yap_init_optyap_preds(void);
 
 /* pl-file.c */
-// struct PL_local_data *Yap_InitThreadIO(int wid);
+//  struct PL_local_data *Yap_InitThreadIO(int wid);
 void Yap_flush(void);
 
 /* pl-yap.c */
@@ -495,3 +496,10 @@ Atom Yap_source_file_name(void);
 void Yap_install_blobs(void);
 
 yamop *Yap_gcP(void);
+
+#if !HAVE_STRNCAT
+#define strncat(X, Y, Z) strcat(X, Y)
+#endif
+#if !HAVE_STRNCPY
+#define strncpy(X, Y, Z) strcpy(X, Y)
+#endif
diff --git a/H/Yatom.h b/H/Yatom.h
index e0b055073..08d1dfb9b 100755
--- a/H/Yatom.h
+++ b/H/Yatom.h
@@ -38,7 +38,21 @@ INLINE_ONLY inline EXTERN AtomEntry *RepAtom(Atom a) {
 
 INLINE_ONLY inline EXTERN Atom AbsAtom(AtomEntry *p);
 
-INLINE_ONLY inline EXTERN Atom AbsAtom(AtomEntry *p) { return (Atom)(p); }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  INLINE_ONLY inline EXTERN Atom AbsAtom(AtomEntry *p) { return (Atom)(p); }
 
 INLINE_ONLY inline EXTERN AtomEntry *RepAtom(Atom a);
 
@@ -1587,7 +1601,7 @@ INLINE_ONLY EXTERN inline void AddPropToAtom(AtomEntry *ae, PropEntry *p) {
 INLINE_ONLY inline EXTERN const char *AtomName(Atom at);
 
 /**
- * AtomName: get a string with the name of an Atom. Assumes 8 bit
+ * AtomName(Atom at): get a string with the name of an Atom. Assumes 8 bit
  *representation.
  *
  * @param at the atom
@@ -1601,7 +1615,7 @@ INLINE_ONLY inline EXTERN const char *AtomName(Atom at) {
 INLINE_ONLY inline EXTERN const char *AtomTermName(Term t);
 
 /**
- * AtomTermName: get a string with the name of a term storing an Atom. Assumes 8
+ * AtomTermName(Term t): get a string with the name of a term storing an Atom. Assumes 8
  *bit representation.
  *
  * @param t the atom term