diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5ba445c97..5b9a5f85f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar 20 14:48:46 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* dtable.cc: Guard against new winsock.h/winsock2.h warnings when
+	mixing winsock*.h and sys/types.h.
+	* fhandler_socket.cc: Ditto.
+	* net.cc: Ditto.
+	* select.cc: Ditto.
+	* exceptions.cc: Remove unneeded define.
+
 Mon Mar 19 17:43:29 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* exceptions.cc (interruptible): Update debugging output.
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index f20effcc4..31cdf4ab7 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -10,7 +10,6 @@ details. */
 
 #define  __INSIDE_CYGWIN_NET__
 
-#define Win32_Winsock
 #include "winsup.h"
 #include <errno.h>
 #include <sys/socket.h>
@@ -20,6 +19,7 @@ details. */
 #include <fcntl.h>
 #include <sys/cygwin.h>
 
+#define USE_SYS_TYPES_FD_SET
 #include <winsock.h>
 #include "sync.h"
 #include "sigproc.h"
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0c138ef50..8374032b0 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -8,7 +8,6 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#define Win32_Winsock
 #include "winsup.h"
 #include <imagehlp.h>
 #include <errno.h>
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 5e28eb90a..a52d2851a 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -12,13 +12,13 @@
 
 #define  __INSIDE_CYGWIN_NET__
 
-#define Win32_Winsock
 #include "winsup.h"
 #include <errno.h>
 #include <sys/socket.h>
 
 #include <unistd.h>
 #include <fcntl.h>
+#define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
 #include "cygheap.h"
 #include "cygerrno.h"
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index efb3c2cb0..eaeef5e5d 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -12,7 +12,6 @@ details. */
 
 #define  __INSIDE_CYGWIN_NET__
 
-#define Win32_Winsock
 #include "winsup.h"
 #include <errno.h>
 #include <sys/socket.h>
@@ -22,6 +21,7 @@ details. */
 #include <unistd.h>
 #include <netdb.h>
 #include <fcntl.h>
+#define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
 #include "cygheap.h"
 #include "cygerrno.h"
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index c4274060b..683b93a5f 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -18,7 +18,6 @@ details. */
  */
 
 #define  __INSIDE_CYGWIN_NET__
-#define Win32_Winsock
 
 #include "winsup.h"
 #include <errno.h>
@@ -31,6 +30,7 @@ details. */
 #include <netdb.h>
 #include <unistd.h>
 #include <stdio.h>
+#define USE_SYS_TYPES_FD_SET
 #include <winsock.h>
 #include "select.h"
 #include "cygerrno.h"
@@ -66,7 +66,7 @@ typedef long fd_mask;
 
 #define unix_fd_set fd_set
 
-#define NULL_fd_set ((fd_set *)NULL)
+#define NULL_fd_set ((fd_set *) NULL)
 #define sizeof_fd_set(n) \
   ((unsigned) (NULL_fd_set->fds_bits + unix_howmany((n), UNIX_NFDBITS)))
 #define UNIX_FD_SET(n, p) \