diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 4ee98acb3..e92c77347 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-08  Danny Smith  <dannysmith@users.sourceforge.net>
+
+	* include/iphlpapi.h (GetAdaptersAddresses): Check for winsock2
+	here also.
+
 2006-04-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
 
 	* include/wincrypt.h (PROV_MS_EXCHANGE): Define.
diff --git a/winsup/w32api/include/iphlpapi.h b/winsup/w32api/include/iphlpapi.h
index cddf4fd8a..6fd976af4 100644
--- a/winsup/w32api/include/iphlpapi.h
+++ b/winsup/w32api/include/iphlpapi.h
@@ -30,7 +30,7 @@ DWORD WINAPI DeleteIpNetEntry(PMIB_IPNETROW);
 DWORD WINAPI DeleteProxyArpEntry(DWORD,DWORD,DWORD);
 DWORD WINAPI EnableRouter(HANDLE*,OVERLAPPED*);
 DWORD WINAPI FlushIpNetTable(DWORD);
-#if (_WIN32_WINNT >= 0x0501)
+#if (_WIN32_WINNT >= 0x0501 && defined(_WINSOCK2_H))
 ULONG WINAPI GetAdaptersAddresses(ULONG,ULONG,PVOID,PIP_ADAPTER_ADDRESSES,PULONG);
 #endif
 DWORD WINAPI GetAdapterIndex(LPWSTR,PULONG);