diff --git a/C/c_interface.c b/C/c_interface.c
index 36d990d9e..6be273a56 100755
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -338,6 +338,9 @@
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
 #if HAVE_STRING_H
 #include <string.h>
 #endif
diff --git a/config.h.in b/config.h.in
index f741308a0..f8a8b4b85 100755
--- a/config.h.in
+++ b/config.h.in
@@ -89,6 +89,7 @@
 #undef  HAVE_SIGINFO_H
 #undef  HAVE_SIGNAL_H
 #undef  HAVE_STDARG_H
+#undef  HAVE_STDINT_H
 #undef  HAVE_STRING_H
 #undef  HAVE_STROPTS_H
 #undef  HAVE_SYS_CONF_H
diff --git a/configure b/configure
index 36d7454a0..a9ec3863c 100755
--- a/configure
+++ b/configure
@@ -7307,7 +7307,7 @@ fi
 	;;
 esac
 
-EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
+EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS"
 
 
 if test "$dynamic_loading" = "yes"
@@ -7775,7 +7775,7 @@ fi
 
 done
 
-for ac_header in siginfo.h signal.h stdarg.h string.h stropts.h
+for ac_header in siginfo.h signal.h stdarg.h stdint.h string.h stropts.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -9593,7 +9593,6 @@ mkdir -p  packages/jpl/examples/java
 mkdir -p  packages/meld
 mkdir -p  packages/tai
 mkdir -p  packages/tai/libtai
-mkdir -p  packages/PLStream
 mkdir -p  packages/plunit
 mkdir -p  packages/ProbLog
 mkdir -p  packages/ProbLog/simplecudd
diff --git a/configure.in b/configure.in
index 34c856001..de0c57356 100755
--- a/configure.in
+++ b/configure.in
@@ -1180,7 +1180,7 @@ dnl Linux has both elf and a.out, in this case we found elf
 	;;
 esac
 
-EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir)/packages/PLStream -lplstream"
+EXTRA_LIBS_FOR_SWIDLLS="$EXTRA_LIBS_FOR_DLLS"
 
 
 if test "$dynamic_loading" = "yes"
@@ -1354,7 +1354,7 @@ AC_CHECK_HEADERS(errno.h execinfo.h fcntl.h fenv.h)
 AC_CHECK_HEADERS(float.h fpu_control.h ieeefp.h io.h limits.h)
 AC_CHECK_HEADERS(locale.h malloc.h math.h memory.h mpi.h)
 AC_CHECK_HEADERS(netdb.h netinet/in.h netinet/tcp.h pwd.h regex.h)
-AC_CHECK_HEADERS(siginfo.h signal.h stdarg.h string.h stropts.h)
+AC_CHECK_HEADERS(siginfo.h signal.h stdarg.h stdint.h string.h stropts.h)
 AC_CHECK_HEADERS(sys/conf.h sys/dir.h sys/file.h)
 AC_CHECK_HEADERS(sys/mman.h sys/ndir.h sys/param.h)
 AC_CHECK_HEADERS(sys/resource.h sys/select.h)
@@ -1950,7 +1950,6 @@ mkdir -p  packages/jpl/examples/java
 mkdir -p  packages/meld
 mkdir -p  packages/tai
 mkdir -p  packages/tai/libtai
-mkdir -p  packages/PLStream
 mkdir -p  packages/plunit
 mkdir -p  packages/ProbLog
 mkdir -p  packages/ProbLog/simplecudd
diff --git a/library/dialect/swi.yap b/library/dialect/swi.yap
index 5dac76471..5218b4986 100755
--- a/library/dialect/swi.yap
+++ b/library/dialect/swi.yap
@@ -99,8 +99,6 @@
 
 :- set_prolog_flag(user_flags,silent).
 
-:- load_foreign_files([libplstream], [], initIO).
-
 :- load_foreign_files(['pl-tai'], [], install).
 
 % Time is given as a float in SWI-Prolog.
diff --git a/packages/PLStream/pl-error.c b/packages/PLStream/pl-error.c
index ee49f9b41..dadc5c3ff 100644
--- a/packages/PLStream/pl-error.c
+++ b/packages/PLStream/pl-error.c
@@ -1,5 +1,6 @@
 
 #include	<stdlib.h>
+#include	<stdio.h>
 #include "pl-incl.h"
 #if HAVE_ERRNO_H
 #include	<errno.h>