diff --git a/src/modules/spider/configure.in b/src/modules/spider/configure.in
index aea4975c77bc410981d08c8d8f518e764b1ab169..3d32656977e924b7c194b05307afa85ed976d314 100644
--- a/src/modules/spider/configure.in
+++ b/src/modules/spider/configure.in
@@ -12,7 +12,7 @@ AC_CHECK_LIB(nsl, gethostbyname)
 AC_HAVE_HEADERS(arpa/inet.h sys/socketvar.h sys/protosw.h \
 	netinet/in.h sys/mman.h sys/utsname.h netdb.h sys/socket.h \
         sync.h sys/sockio.h sys/conf.h stropts.h sys/param.h\
-	sys/uio.h linux/mman.h sys/stream.h unistd.h winsock2.h)
+	sys/uio.h linux/mman.h sys/stream.h unistd.h winsock.h)
 
 AC_FUNC_MMAP
 
diff --git a/src/modules/spider/dumudp.c b/src/modules/spider/dumudp.c
index 2beb5172677b1f04cc2d46160cbd91a0385ed977..2cea665ab0c784cf269e8e49cba0bd4df1ef9272 100644
--- a/src/modules/spider/dumudp.c
+++ b/src/modules/spider/dumudp.c
@@ -1,7 +1,7 @@
 #include "config.h"
 
 #include "global.h"
-RCSID("$Id: dumudp.c,v 1.32 1998/01/25 08:28:24 hubbe Exp $");
+RCSID("$Id: dumudp.c,v 1.33 1998/02/11 01:10:57 hubbe Exp $");
 #include "fdlib.h"
 #include "interpret.h"
 #include "svalue.h"
@@ -32,8 +32,8 @@ RCSID("$Id: dumudp.c,v 1.32 1998/01/25 08:28:24 hubbe Exp $");
 #include <sys/socket.h>
 #endif
 
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 
 #if ! defined(EWOULDBLOCK) && defined(WSAEWOULDBLOCK)
diff --git a/src/modules/system/configure.in b/src/modules/system/configure.in
index b7a1479d442f7ef1703ca3c594411703e017fd94..75ab3b9b5e6eadd506a0c67373e4841e8021050a 100644
--- a/src/modules/system/configure.in
+++ b/src/modules/system/configure.in
@@ -9,7 +9,7 @@ AC_CHECK_LIB(nsl, gethostbyname)
 
 AC_HAVE_HEADERS(syslog.h sys/syslog.h sys/types.h errno.h unistd.h pwd.h \
 	sys/conf.h sys/socket.h netinet/in.h arpa/inet.h netdb.h stdarg.h \
-	sys/utsname.h pwd.h passwd.h shadow.h grp.h sys/stat.h winsock2.h \
+	sys/utsname.h pwd.h passwd.h shadow.h grp.h sys/stat.h winsock.h \
         windows.h )
 
 AC_HAVE_FUNCS(syslog link symlink readlink chown \
diff --git a/src/modules/system/system.c b/src/modules/system/system.c
index 6081b3f5d1d19c59d12529e11a268dc4b9a2963d..e783b8b84fa36c6a5b523fb99e6d32fafa70c1cb 100644
--- a/src/modules/system/system.c
+++ b/src/modules/system/system.c
@@ -1,5 +1,5 @@
 /*
- * $Id: system.c,v 1.40 1998/01/30 06:21:37 hubbe Exp $
+ * $Id: system.c,v 1.41 1998/02/11 01:12:54 hubbe Exp $
  *
  * System-call module for Pike
  *
@@ -14,9 +14,9 @@
 #include "system.h"
 
 #include "global.h"
-RCSID("$Id: system.c,v 1.40 1998/01/30 06:21:37 hubbe Exp $");
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
+RCSID("$Id: system.c,v 1.41 1998/02/11 01:12:54 hubbe Exp $");
+#ifdef HAVE_WINSOCK_H
+#include <winsock.h>
 #endif
 
 #ifdef HAVE_WINDOWS_H