diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index abcc85f32..86913f316 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2015-05-27  Takashi Yano  <takashi.yano@nifty.ne.jp>
+
+	* net.cc: Define _NETIOAPI_H_ to accomodate newer w32api.
+
 2015-05-03  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/version.h (CYGWIN_VERSION_DLL_MINOR): Bump to 2.
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index eaf6eb870..e94eb5004 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -18,7 +18,8 @@ details. */
 	  if_indextoname functions in iphlpapi.h since Vista.
    TODO:  Convert if_nametoindex to cygwin_if_nametoindex and call
 	  system functions on Vista and later. */
-#define _INC_NETIOAPI
+#define _INC_NETIOAPI	/* w32api < 4.0 */
+#define _NETIOAPI_H_
 #include "winsup.h"
 #ifdef __x86_64__
 /* 2014-04-24: Current Mingw headers define sockaddr_in6 using u_long (8 byte)