diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 37e76e743..9ee1e0e49 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,13 @@
+2006-07-19  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	[mingw-Bugs-1525021]
+	* iptypes.h (IP_ADAPTER_ANYCAST_ADDRESS): Fix NONAMELESSUNION warnings.
+	(IP_ADAPTER_MULTICAST_ADDRESS): Likewise.	
+	(IP_ADAPTER_UNICAST_ADDRESS): Likewise.
+	(IP_ADAPTER_DNS_SERVER_ADDRESS): Likewise.
+	(IP_ADAPTER_ADAPTER_PREFIX): Likewise.
+	(IP_ADAPTER_ADDRESSES): Likewise.
+
 2006-06-13  Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
 
 	* lib/uuid.c (CLSID_FileProtocol, CLSID_FtpProtocol, CLSID_GopherProtocol,
diff --git a/winsup/w32api/include/iptypes.h b/winsup/w32api/include/iptypes.h
index 531dfd3bf..df281e6cc 100644
--- a/winsup/w32api/include/iptypes.h
+++ b/winsup/w32api/include/iptypes.h
@@ -1,6 +1,6 @@
 #ifndef _IPTYPES_H
 #define _IPTYPES_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
 #pragma GCC system_header
 #endif
 
@@ -133,34 +133,35 @@ typedef struct {
   GUID InterfaceGuid;
 } IP_INTERFACE_NAME_INFO,*PIP_INTERFACE_NAME_INFO;
 typedef struct _IP_ADAPTER_ANYCAST_ADDRESS {
-  union {
+  _ANONYMOUS_UNION union {
     ULONGLONG Alignment;
-    struct {
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD Flags;
-    };
-  };
+    } DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_ANYCAST_ADDRESS* Next;
   SOCKET_ADDRESS Address;
 } IP_ADAPTER_ANYCAST_ADDRESS,*PIP_ADAPTER_ANYCAST_ADDRESS;
 typedef struct _IP_ADAPTER_MULTICAST_ADDRESS {
-  union {
+  _ANONYMOUS_UNION union {
     ULONGLONG Alignment;
-    struct {
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD Flags;
-    };
-  };
+    } DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_MULTICAST_ADDRESS* Next;
   SOCKET_ADDRESS Address;
 } IP_ADAPTER_MULTICAST_ADDRESS,*PIP_ADAPTER_MULTICAST_ADDRESS;
 typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
-  union {
-    struct {
+  _ANONYMOUS_UNION union {
+    ULONGLONG Alignment;
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD Flags;
-    };
-  };
+    }  DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_UNICAST_ADDRESS* Next;
   SOCKET_ADDRESS Address;
   IP_PREFIX_ORIGIN PrefixOrigin;
@@ -171,36 +172,36 @@ typedef struct _IP_ADAPTER_UNICAST_ADDRESS {
   ULONG LeaseLifetime;
 } IP_ADAPTER_UNICAST_ADDRESS,*PIP_ADAPTER_UNICAST_ADDRESS;
 typedef struct _IP_ADAPTER_DNS_SERVER_ADDRESS {
-  union {
+  _ANONYMOUS_UNION union {
     ULONGLONG Alignment;
-    struct {
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD Reserved;
-    };
-  };
+    } DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_DNS_SERVER_ADDRESS* Next;
   SOCKET_ADDRESS Address;
 } IP_ADAPTER_DNS_SERVER_ADDRESS,*PIP_ADAPTER_DNS_SERVER_ADDRESS;
 typedef struct _IP_ADAPTER_PREFIX {
-  union {
-    ULONGLONG  Alignment;
-    struct {
+  _ANONYMOUS_UNION union {
+    ULONGLONG Alignment;
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD Flags;
-    };
-  };
+    } DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_PREFIX* Next;
   SOCKET_ADDRESS Address;
   ULONG PrefixLength;
 } IP_ADAPTER_PREFIX,*PIP_ADAPTER_PREFIX;
 typedef struct _IP_ADAPTER_ADDRESSES {
-  union {
+  _ANONYMOUS_UNION union {
     ULONGLONG Alignment;
-    struct {
+    _ANONYMOUS_STRUCT struct {
       ULONG Length;
       DWORD IfIndex;
-    };
-  };
+    } DUMMYSTRUCTNAME;
+  } DUMMYUNIONNAME;
   struct _IP_ADAPTER_ADDRESSES* Next;
   PCHAR AdapterName;
   PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress;