diff -u3 -H -B -w CVS-latest/lib/config-win32.h lib/config-win32.h
--- CVS-latest/lib/config-win32.h	Tue Oct 14 02:02:24 2003
+++ lib/config-win32.h	Tue Oct 14 01:49:45 2003
@@ -27,7 +27,9 @@
 #define ssize_t int

 /* Define this to 'int' if socklen_t is not an available typedefed type */
+#if !defined(ENABLE_IPV6) && !defined(USE_SSLEAY)
 #define socklen_t int
+#endif

 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
@@ -98,6 +100,9 @@
 /* Define if you have the uname function.  */
 /*#define HAVE_UNAME 1*/

+/* Define if you have utime() */
+#define HAVE_UTIME 1
+
 /* Define if you have the <alloca.h> header file.  */
 /*#define HAVE_ALLOCA_H 1*/

@@ -105,7 +110,7 @@
 #define HAVE_MALLOC_H 1

 /* Define if you have the <arpa/inet.h> header file.  */
-#define HAVE_ARPA_INET_H 1
+/* #define HAVE_ARPA_INET_H 1 */

 /* Define if you have the <crypto.h> header file.  */
 /* #undef HAVE_CRYPTO_H */
@@ -123,7 +128,7 @@
 /* #undef HAVE_GETOPT_H */

 /* Define if you have the <netdb.h> header file.  */
-#define HAVE_NETDB_H 1
+/* #define HAVE_NETDB_H 1 */

 /* Define if you have the <netinet/in.h> header file.  */
 /*#define HAVE_NETINET_IN_H 1*/
@@ -144,19 +149,22 @@
 /*#define HAVE_SYS_SOCKET_H 1*/

 /* Define if you have the <sys/sockio.h> header file.  */
-#define HAVE_SYS_SOCKIO_H 1
+/* #define HAVE_SYS_SOCKIO_H 1 */

 /* Define if you have the <sys/stat.h> header file.  */
 #define HAVE_SYS_STAT_H 1

+/* Define if you have the <sys/utime.h> header file */
+#define HAVE_SYS_UTIME_H 1
+
 /* Define if you have the <sys/types.h> header file.  */
 #define HAVE_SYS_TYPES_H 1

 /* Define if you have the <termio.h> header file.  */
-#define HAVE_TERMIO_H 1
+/* #define HAVE_TERMIO_H 1 */

 /* Define if you have the <termios.h> header file.  */
-#define HAVE_TERMIOS_H 1
+/* #define HAVE_TERMIOS_H 1 */

 /* Name of package */
 #define PACKAGE "curl"
@@ -170,6 +178,12 @@
 /* Define if you have the <winsock.h> header file.  */
 #define HAVE_WINSOCK_H 1

+/* Define if you have the <winsock2.h> header file.  */
+#define HAVE_WINSOCK2_H 1
+
+/* Define if you have the <ws2tcpip.h> header file.  */
+#define HAVE_WS2TCPIP_H 1
+
 /* Define if you have the <stdlib.h> header file.  */
 #define HAVE_STDLIB_H 1

@@ -191,7 +205,7 @@
 /*************************************************
  * This section is for compiler specific defines.*
  *************************************************/
-#ifdef MINGW32 /* Borland and MS don't have this */
+#if defined(MINGW32) || defined(__WATCOMC__) /* Borland and MS don't have this */

 /* Define if you have the <unistd.h> header file.  */
 #define HAVE_UNISTD_H 1

diff -u3 -H -B -w CVS-latest/lib/connect.c lib/connect.c
--- CVS-latest/lib/connect.c	Wed Oct 08 15:32:44 2003
+++ lib/connect.c	Wed Oct 08 20:37:11 2003
@@ -66,11 +66,11 @@
 #ifdef WIN32
 #define HAVE_IOCTLSOCKET
 #include <windows.h>
-#include <winsock.h>
 #define EINPROGRESS WSAEINPROGRESS
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #define EISCONN     WSAEISCONN
 #define ENOTSOCK    WSAENOTSOCK
+#define ECONNREFUSED WSAECONNREFUSED
 #endif

 #include "urldata.h"

diff -u3 -H -B -w CVS-latest/lib/dict.c lib/dict.c
--- CVS-latest/lib/dict.c	Fri Jul 25 10:30:58 2003
+++ lib/dict.c	Wed Oct 08 20:36:51 2003
@@ -35,7 +35,6 @@
 #include <errno.h>

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else

diff -u3 -H -B -w CVS-latest/lib/easy.c lib/easy.c
--- CVS-latest/lib/easy.c	Thu Aug 14 17:02:25 2003
+++ lib/easy.c	Wed Oct 08 20:36:48 2003
@@ -37,7 +37,6 @@
 #include "strequal.h"

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else

diff -u3 -H -B -w CVS-latest/lib/file.c lib/file.c
--- CVS-latest/lib/file.c	Fri Aug 08 19:56:47 2003
+++ lib/file.c	Wed Oct 08 20:36:39 2003
@@ -36,7 +36,6 @@
 #include <errno.h>

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #include <fcntl.h>

diff -u3 -H -B -w CVS-latest/lib/ftp.c lib/ftp.c
--- CVS-latest/lib/ftp.c	Sat Oct 04 17:25:02 2003
+++ lib/ftp.c	Wed Oct 08 20:36:27 2003
@@ -39,7 +39,7 @@
 #endif

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
+
 #else /* some kind of unix */
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>

diff -u3 -H -B -w CVS-latest/lib/hostip.c lib/hostip.c
--- CVS-latest/lib/hostip.c	Sun Oct 12 15:57:41 2003
+++ lib/hostip.c	Tue Oct 14 01:52:11 2003
@@ -29,7 +29,7 @@
 #define _REENTRANT

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
+#include <malloc.h>
 #else
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff -u3 -H -B -w CVS-latest/lib/http.c lib/http.c
--- CVS-latest/lib/http.c	Tue Oct 07 16:39:32 2003
+++ lib/http.c	Wed Oct 08 20:35:03 2003
@@ -36,7 +36,6 @@
 #include <errno.h>

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else

diff -u3 -H -B -w CVS-latest/lib/inet_pton.c lib/inet_pton.c
--- CVS-latest/lib/inet_pton.c	Thu Oct 09 10:19:01 2003
+++ lib/inet_pton.c	Tue Oct 14 01:54:04 2003
@@ -20,11 +20,6 @@

 #ifndef HAVE_INET_PTON

-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#include <winsock.h>
-#else
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -40,7 +35,6 @@
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
-#endif
 #include <string.h>
 #include <errno.h>

@@ -50,6 +44,10 @@

 #ifndef	AF_INET6
 #define	AF_INET6	AF_MAX+1	/* just to let this compile */
+#endif
+
+#ifdef WIN32
+#define EAFNOSUPPORT    WSAEAFNOSUPPORT
 #endif

 /*

diff -u3 -H -B -w CVS-latest/lib/memdebug.c lib/memdebug.c
--- CVS-latest/lib/memdebug.c	Thu Aug 14 16:19:36 2003
+++ lib/memdebug.c	Wed Oct 08 20:32:50 2003
@@ -26,13 +26,9 @@

 #include <curl/curl.h>

-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
-#else /* some kind of unix */
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
-#endif

 #define _MPRINTF_REPLACE
 #include <curl/mprintf.h>

diff -u3 -H -B -w CVS-latest/lib/memdebug.h lib/memdebug.h
--- CVS-latest/lib/memdebug.h	Thu Aug 14 16:19:36 2003
+++ lib/memdebug.h	Wed Oct 08 20:30:57 2003
@@ -28,9 +28,6 @@
 #include <sys/types.h>
 #endif

-#ifdef WIN32
-#include <winsock.h>
-#endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif

diff -u3 -H -B -w CVS-latest/lib/progress.c lib/progress.c
--- CVS-latest/lib/progress.c	Wed May 14 08:31:00 2003
+++ lib/progress.c	Wed Oct 08 20:32:22 2003
@@ -24,13 +24,7 @@
 #include "setup.h"

 #include <string.h>
-
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#if defined(__MINGW32__)
-#include <winsock.h>
-#endif
 #include <time.h>
-#endif

 /* 20000318 mgs
  * later we use _scrsize to determine the screen width, this emx library

diff -u3 -H -B -w CVS-latest/lib/sendf.c lib/sendf.c
--- CVS-latest/lib/sendf.c	Mon Aug 11 11:56:06 2003
+++ lib/sendf.c	Wed Oct 08 20:32:04 2003
@@ -39,9 +39,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
-#endif

 #include <curl/curl.h>
 #include "urldata.h"

diff -u3 -H -B -w CVS-latest/lib/setup.h lib/setup.h
--- CVS-latest/lib/setup.h	Wed Oct 08 21:56:44 2003
+++ lib/setup.h	Tue Oct 14 01:57:50 2003
@@ -119,6 +119,17 @@
    */

 #ifdef WIN32
+
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN  /* Prevent including <winsock*.h> in <windows.h> */
+#endif
+
+#include <winsock2.h>        /* required by telnet.c */
+
+#if defined(ENABLE_IPV6) || defined(USE_SSLEAY)
+#include <ws2tcpip.h>
+#endif
+
 #if !defined(__GNUC__) || defined(__MINGW32__)
 #define sclose(x) closesocket(x)
 #define sread(x,y,z) recv(x,y,z,0)

diff -u3 -H -B -w CVS-latest/lib/speedcheck.c lib/speedcheck.c
--- CVS-latest/lib/speedcheck.c	Wed Jan 29 12:14:23 2003
+++ lib/speedcheck.c	Wed Oct 08 20:31:50 2003
@@ -25,9 +25,6 @@

 #include <stdio.h>
 #include <string.h>
-#if defined(__MINGW32__)
-#include <winsock.h>
-#endif

 #include <curl/curl.h>
 #include "urldata.h"

diff -u3 -H -B -w CVS-latest/lib/telnet.c lib/telnet.c
--- CVS-latest/lib/telnet.c	Fri Jul 25 10:30:58 2003
+++ lib/telnet.c	Wed Oct 08 20:14:20 2003
@@ -35,8 +35,7 @@

 #include <errno.h>

-#if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock2.h>
+#if defined(WIN32)
 #include <time.h>
 #include <io.h>
 #else

diff -u3 -H -B -w CVS-latest/lib/timeval.c lib/timeval.c
--- CVS-latest/lib/timeval.c	Wed Jan 29 12:14:24 2003
+++ lib/timeval.c	Wed Oct 08 20:43:19 2003
@@ -21,14 +21,13 @@
  * $Id: timeval.c,v 1.17 2003/01/29 10:14:24 bagder Exp $
  ***************************************************************************/

-#ifdef WIN32
-#include <windows.h>
-#endif
 #include "timeval.h"

 #ifndef HAVE_GETTIMEOFDAY

 #ifdef WIN32
+#include <mmsystem.h>
+
 int
 gettimeofday (struct timeval *tp, void *nothing)
 {

diff -u3 -H -B -w CVS-latest/lib/timeval.h lib/timeval.h
--- CVS-latest/lib/timeval.h	Thu Jan 16 23:08:13 2003
+++ lib/timeval.h	Wed Oct 08 20:30:06 2003
@@ -27,7 +27,6 @@

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
 #include <time.h>
-#include <winsock.h>
 #else
 #include <sys/time.h>
 #endif

diff -u3 -H -B -w CVS-latest/lib/transfer.c lib/transfer.c
--- CVS-latest/lib/transfer.c	Wed Sep 03 23:51:28 2003
+++ lib/transfer.c	Wed Oct 08 20:31:32 2003
@@ -37,7 +37,6 @@
 #include "strequal.h"

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else

diff -u3 -H -B -w CVS-latest/lib/url.c lib/url.c
--- CVS-latest/lib/url.c	Thu Oct 09 22:04:47 2003
+++ lib/url.c	Tue Oct 14 01:59:21 2003
@@ -36,7 +36,6 @@
 #include <errno.h>

 #if defined(WIN32) && !defined(__GNUC__) || defined(__MINGW32__)
-#include <winsock.h>
 #include <time.h>
 #include <io.h>
 #else