5 files changed, 16 insertions, 14 deletions
diff --git a/winsup/cygwin/libc/inet_addr.c b/winsup/cygwin/libc/inet_addr.c
index 465e86ed3..24028ad95 100644
--- a/winsup/cygwin/libc/inet_addr.c
+++ b/winsup/cygwin/libc/inet_addr.c
@@ -72,7 +72,8 @@ static const char rcsid[] = "$Id$";
 #ifndef __CYGWIN__
 __FBSDID("$FreeBSD$");
 #else
-#include "winsup.h"
+#define __INSIDE_CYGWIN__
+#define  __INSIDE_CYGWIN_NET__
 #endif
 
 #ifndef __CYGWIN__
diff --git a/winsup/cygwin/libc/inet_network.c b/winsup/cygwin/libc/inet_network.c
index 01e1a7682..52286f453 100644
--- a/winsup/cygwin/libc/inet_network.c
+++ b/winsup/cygwin/libc/inet_network.c
@@ -34,7 +34,8 @@ static const char sccsid[] = "@(#)inet_network.c	8.1 (Berkeley) 6/4/93";
 #ifndef __CYGWIN__
 __FBSDID("$FreeBSD$");
 #else
-#include "winsup.h"
+#define __INSIDE_CYGWIN__
+#define  __INSIDE_CYGWIN_NET__
 #endif
 
 #ifndef __CYGWIN__
diff --git a/winsup/cygwin/libc/minires-os-if.c b/winsup/cygwin/libc/minires-os-if.c
index 46e8297fd..f59369827 100644
--- a/winsup/cygwin/libc/minires-os-if.c
+++ b/winsup/cygwin/libc/minires-os-if.c
@@ -1,6 +1,6 @@
 /* minires-os-if.c.  Stub synchronous resolver for Cygwin.
 
-   Copyright 2006, 2007, 2008, 2009, 2011, 2012 Red Hat, Inc.
+   Copyright 2006, 2007, 2008, 2009, 2011 Red Hat, Inc.
 
    Written by Pierre A. Humblet <Pierre.Humblet@ieee.org>
 
@@ -10,14 +10,6 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
-#define  __INSIDE_CYGWIN_NET__
-#define USE_SYS_TYPES_FD_SET
-#include <winsup.h>
-#include <ws2tcpip.h>
-#include <iphlpapi.h>
-#include <windns.h>
-#include "ntdll.h"
-#undef h_errno
 #include "minires.h"
 
 #ifdef __CYGWIN__
@@ -32,6 +24,13 @@ details. */
 #undef NOERROR
 #undef DELETE
 
+#include <windows.h>
+#include <iphlpapi.h>
+#include <windns.h>
+#include <ntdef.h>
+#include "ntdll.h"
+#include <wchar.h>
+
 /***********************************************************************
  * write_record: Translates a Windows DNS record into a compressed record
  ***********************************************************************/
diff --git a/winsup/cygwin/libc/minires.h b/winsup/cygwin/libc/minires.h
index 028b1e084..cda0b4c51 100644
--- a/winsup/cygwin/libc/minires.h
+++ b/winsup/cygwin/libc/minires.h
@@ -1,6 +1,6 @@
 /* minires.h.  Stub synchronous resolver for Cygwin.
 
-   Copyright 2006, 2012 Red Hat, Inc.
+   Copyright 2006 Red Hat, Inc.
 
    Written by Pierre A. Humblet <Pierre.Humblet@ieee.org>
 
@@ -10,10 +10,13 @@ This software is a copyrighted work licensed under the terms of the
 Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
+#define  __INSIDE_CYGWIN_NET__
+
 #include "winsup.h"
 #include <string.h>
 #include <malloc.h>
 #include <stdlib.h>
+#include <netdb.h>
 #include <ctype.h>
 #include <sys/time.h>
 #include <sys/socket.h>
@@ -24,7 +27,6 @@ details. */
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/unistd.h>
-#define  __INSIDE_CYGWIN_NET__
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <resolv.h>
diff --git a/winsup/cygwin/libc/rcmd.cc b/winsup/cygwin/libc/rcmd.cc
index 16c05b01b..8012790ec 100644
--- a/winsup/cygwin/libc/rcmd.cc
+++ b/winsup/cygwin/libc/rcmd.cc
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #else
 #define  __INSIDE_CYGWIN_NET__
 #include "winsup.h"
-#undef  __INSIDE_CYGWIN_NET__
 #endif
 
 #ifndef __CYGWIN__