diff --git a/C/c_interface.c b/C/c_interface.c
index 3341277cf..e9aadcc57 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -544,13 +544,6 @@ X_API int      STD_PROTO(YAP_NewOpaqueType,(void *));
 X_API Term     STD_PROTO(YAP_NewOpaqueObject,(int, size_t));
 X_API void    *STD_PROTO(YAP_OpaqueObjectFromTerm,(Term));
 
-static int (*do_putcf)(wchar_t);
-
-static int do_yap_putc(int streamno,wchar_t ch) {
-  do_putcf(ch);
-  return(ch);
-}
-
 static int
 dogc(void)
 {
@@ -2435,7 +2428,6 @@ YAP_RestartGoal(void)
   BACKUP_MACHINE_REGS();
   if (LOCAL_AllowRestart) {
     P = (yamop *)FAILCODE;
-    do_putcf = myputc;
     LOCAL_PrologMode = UserMode;
     out = Yap_exec_absmi(TRUE);
     LOCAL_PrologMode = UserCCallMode;
@@ -2659,7 +2651,6 @@ YAP_Write(Term t, IOSTREAM *stream, int flags)
 {
   BACKUP_MACHINE_REGS();
 
-  do_putcf = myputc;		/*  */
   Yap_dowrite (t, stream, flags, 1200);
 
   RECOVER_MACHINE_REGS();
diff --git a/configure b/configure
index 2d4144b11..938f743ef 100755
--- a/configure
+++ b/configure
@@ -9927,6 +9927,9 @@ mkdir -p  packages/clib/maildrop
 mkdir -p  packages/clib/maildrop/rfc822
 mkdir -p  packages/clib/maildrop/rfc2045
 mkdir -p  packages/CLPBN
+mkdir -p  packages/CLPBN/clpbn
+mkdir -p  packages/CLPBN/clpbn/bp
+mkdir -p  packages/CLPBN/clpbn/bp/xmlParser
 mkdir -p  packages/clpqr
 mkdir -p  packages/cplint
 mkdir -p  packages/cplint/approx
@@ -10619,8 +10622,8 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="`echo $ac_config_files`"
-config_headers="`echo $ac_config_headers`"
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
 
 _ACEOF
 
diff --git a/configure.in b/configure.in
index d1b9bb18e..473b27b72 100644
--- a/configure.in
+++ b/configure.in
@@ -2103,6 +2103,9 @@ mkdir -p  packages/clib/maildrop
 mkdir -p  packages/clib/maildrop/rfc822
 mkdir -p  packages/clib/maildrop/rfc2045
 mkdir -p  packages/CLPBN
+mkdir -p  packages/CLPBN/clpbn
+mkdir -p  packages/CLPBN/clpbn/bp
+mkdir -p  packages/CLPBN/clpbn/bp/xmlParser
 mkdir -p  packages/clpqr
 mkdir -p  packages/cplint
 mkdir -p  packages/cplint/approx