diff --git a/packages/clib/Makefile.in b/packages/clib/Makefile.in
old mode 100644
new mode 100755
index 5d75e7f08..329996f16
--- a/packages/clib/Makefile.in
+++ b/packages/clib/Makefile.in
@@ -36,7 +36,7 @@ MKINDEX=true
 NETLIBS=@CLIB_NETLIBS@
 CRYPTLIBS=@CLIB_CRYPTLIBS@
 
-LD=@DO_SECOND_LD@	@SHLIB_CXX_LD@
+LD=@DO_SECOND_LD@	@SHLIB_LD@
 LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
 
 BINTARGET=$(DESTDIR)$(YAPLIBDIR)
@@ -105,7 +105,7 @@ TARGETS=	@CLIB_TARGETS@ readutil.@SO@ streaminfo.@SO@ process.@SO@ \
 UNXOBJ=		error.o unix.o
 SOCKOBJ=	error.o socket.o nonblockio.o
 CGIOBJ=		error.o form.o cgi.o
-CRYPTOBJ=	error.o crypt.o md5.o md5passwd.o
+CRYPTOBJ=	error.o crypt.o md5.o md5passwd.o @ENABLE_WINCONSOLE@ crypt-bsd.o
 MEMOBJ=		error.o memfile.o
 MIMEOBJ=	error.o mime.o
 TIMEOBJ=	error.o time.o
diff --git a/packages/clib/bsd-crypt.c b/packages/clib/bsd-crypt.c
old mode 100644
new mode 100755
index 5dbcc69b7..693ff5a80
--- a/packages/clib/bsd-crypt.c
+++ b/packages/clib/bsd-crypt.c
@@ -33,6 +33,8 @@
  */
 
 /* JW: Added to make this file compile as-is for SWI-Prolog */
+#include <SWI-Prolog.h>
+
 #define __RCSID(s) static char sccsid[] = s
 #define DES_ONLY
 #define CRYPT_ONLY
diff --git a/packages/clib/nonblockio.c b/packages/clib/nonblockio.c
old mode 100644
new mode 100755
index 591dbe05d..c6639765f
--- a/packages/clib/nonblockio.c
+++ b/packages/clib/nonblockio.c
@@ -823,13 +823,21 @@ socket_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 
     for(i=0; i<n; i++)
     { if ( s[i] )
-      { __try
+      {
+#if __MINGW32__
+	{ if ( s[i]->magic != PLSOCK_MAGIC )
+	  { goto nosocket;
+	  }
+	} 
+#else
+	__try
 	{ if ( s[i]->magic != PLSOCK_MAGIC )
 	  { goto nosocket;
 	  }
 	} __except(EXCEPTION_EXECUTE_HANDLER)
 	{ goto nosocket;
 	}
+#endif
 
 	doRequest(s[i]);
       }
diff --git a/packages/clib/process.c b/packages/clib/process.c
old mode 100644
new mode 100755
index 70e8e1d8d..c1c3682a3
--- a/packages/clib/process.c
+++ b/packages/clib/process.c
@@ -150,7 +150,9 @@ resource_error(const char *resource)
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
+#ifndef __MINGW32__
 typedef DWORD  pid_t;
+#endif
 typedef wchar_t echar;			/* environment character */
 #else
 typedef char echar;
diff --git a/packages/clib/unix.c b/packages/clib/unix.c
old mode 100644
new mode 100755
index e2d4cfad0..7ae95275e
--- a/packages/clib/unix.c
+++ b/packages/clib/unix.c
@@ -30,7 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <sys/types.h>
+#include <sys/types.h>u
 #include <sys/wait.h>
 #include <fcntl.h>
 #include <assert.h>