diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 78f0f1611863..c46dec10becf 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-09-14  Adam Megacz <adam@xwt.org>
+	
+	* java/net/natPlainDatagramSocket.cc: removed #include
+	<ws2tcpip.h>; the mingw header is broken (conflicts with itself).
+	* include/win32.h: included definition for IP_TOS to satisfy
+	natPlainDatagramSocket.cc
+	
 2002-09-13  Michael Koch  <konqueror@gmx.de>
 	
 	* java/net/DatagramPacket.java (DatagramPacket):
diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index da71b8be56a0..a035cfc5c139 100644
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -16,6 +16,7 @@ details.  */
 
 #undef __INSIDE_CYGWIN__
 #include <winsock.h>
+#define IP_TOS 3
 #include <gcj/cni.h>
 #include <java/util/Properties.h>
 
diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index 6a29fb372ee3..12eaf3be9d96 100644
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -13,7 +13,6 @@ details.  */
 #ifdef WIN32
 #include <errno.h>
 #include <string.h>
-#include <ws2tcpip.h>
 #ifndef ENOPROTOOPT
 #define ENOPROTOOPT 109
 #endif