Throughout, drop unnecessary explicit includes of windows header files

	included by default.
	* winlean.h: Add long comment to explain why we have to define certain
	symbols.
	(_NORMALIZE_): Define.
	(_WINNLS_): Drop definition and subsequent undef.
	(_WINNETWK_): Ditto.
	(_WINSVC_): Ditto.

2013-11-23  Eric Blake  <eblake@redhat.com>

21 files changed, 23 insertions, 49 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 8293a0f35..1533ce793 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,14 @@
+2013-11-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	Throughout, drop unnecessary explicit includes of windows header files
+	included by default.
+	* winlean.h: Add long comment to explain why we have to define certain
+	symbols.
+	(_NORMALIZE_): Define.
+	(_WINNLS_): Drop definition and subsequent undef.
+	(_WINNETWK_): Ditto.
+	(_WINSVC_): Ditto.
+	
 2013-11-23  Eric Blake  <eblake@redhat.com>
 
 	dup2: fix off-by-one crash
diff --git a/winsup/cygwin/assert.cc b/winsup/cygwin/assert.cc
index ef54d32ba..934d9c58a 100644
--- a/winsup/cygwin/assert.cc
+++ b/winsup/cygwin/assert.cc
@@ -1,6 +1,7 @@
 /* assert.cc: Handle the assert macro for WIN32.
 
-   Copyright 1997, 1998, 2000, 2001, 2002, 2007, 2008, 2009, 2011 Red Hat, Inc.
+   Copyright 1997, 1998, 2000, 2001, 2002, 2007, 2008, 2009, 2011, 2013
+   Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -9,8 +10,6 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <wingdi.h>
-#include <winuser.h>
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 54b724286..295f4248a 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -16,7 +16,6 @@ details. */
 #include <locale.h>
 #include <assert.h>
 #include <cygwin/version.h>
-#include <winnls.h>
 #include "pinfo.h"
 #include "perprocess.h"
 #include "path.h"
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 40ff8f0ce..c0fb0c877 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -12,8 +12,6 @@ details. */
 #define CYGTLS_HANDLE
 #include "winsup.h"
 #include "miscfuncs.h"
-#include <wingdi.h>
-#include <winuser.h>
 #include <imagehlp.h>
 #include <stdlib.h>
 #include <syslog.h>
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc
index f360dc0ba..fd39f570e 100644
--- a/winsup/cygwin/fhandler_clipboard.cc
+++ b/winsup/cygwin/fhandler_clipboard.cc
@@ -13,8 +13,6 @@ details. */
 
 #include "winsup.h"
 #include <wchar.h>
-#include <wingdi.h>
-#include <winuser.h>
 #include "cygerrno.h"
 #include "path.h"
 #include "fhandler.h"
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index ca84fed9c..87330f0ad 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -14,9 +14,6 @@ details. */
 #include <stdio.h>
 #include <stdlib.h>
 #include <wchar.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
 #include <ctype.h>
 #include <sys/param.h>
 #include <sys/cygwin.h>
diff --git a/winsup/cygwin/fhandler_netdrive.cc b/winsup/cygwin/fhandler_netdrive.cc
index 909e02354..b4189fa8a 100644
--- a/winsup/cygwin/fhandler_netdrive.cc
+++ b/winsup/cygwin/fhandler_netdrive.cc
@@ -17,7 +17,6 @@ details. */
 #include "dtable.h"
 #include "cygheap.h"
 #include "cygthread.h"
-#include <winnetwk.h>
 
 #include <dirent.h>
 
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler_windows.cc
index 34388f76f..5cafe13d9 100644
--- a/winsup/cygwin/fhandler_windows.cc
+++ b/winsup/cygwin/fhandler_windows.cc
@@ -13,8 +13,6 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <wingdi.h>
-#include <winuser.h>
 #include "cygerrno.h"
 #include "path.h"
 #include "fhandler.h"
diff --git a/winsup/cygwin/miscfuncs.cc b/winsup/cygwin/miscfuncs.cc
index 819eaa54e..f6308b634 100644
--- a/winsup/cygwin/miscfuncs.cc
+++ b/winsup/cygwin/miscfuncs.cc
@@ -17,9 +17,6 @@ details. */
 #include <limits.h>
 #include <sys/param.h>
 #include <wchar.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnls.h>
 #include "cygtls.h"
 #include "ntdll.h"
 #include "path.h"
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 0d943f727..677282560 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -1,7 +1,7 @@
 /* mount.cc: mount handling.
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -14,10 +14,6 @@ details. */
 #include <mntent.h>
 #include <ctype.h>
 #include <winioctl.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnetwk.h>
-#include <shlobj.h>
 #include <cygwin/version.h>
 #include "cygerrno.h"
 #include "security.h"
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc
index bde6695cd..54b556a47 100644
--- a/winsup/cygwin/net.cc
+++ b/winsup/cygwin/net.cc
@@ -20,7 +20,6 @@ details. */
 	  system functions on Vista and later. */
 #define _INC_NETIOAPI
 #include "winsup.h"
-#include <winnls.h>
 #include <ws2tcpip.h>
 #include <mswsock.h>
 #include <iphlpapi.h>
diff --git a/winsup/cygwin/nlsfuncs.cc b/winsup/cygwin/nlsfuncs.cc
index 91b2439b1..297e798b6 100644
--- a/winsup/cygwin/nlsfuncs.cc
+++ b/winsup/cygwin/nlsfuncs.cc
@@ -9,7 +9,6 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <winnls.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 8acb6ff6b..2b1e61442 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -52,10 +52,6 @@
 #include "miscfuncs.h"
 #include <ctype.h>
 #include <winioctl.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <winnetwk.h>
-#include <winnls.h>
 #include <shlobj.h>
 #include <sys/param.h>
 #include <sys/cygwin.h>
diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc
index 2534c0ee9..7dd17f395 100644
--- a/winsup/cygwin/select.cc
+++ b/winsup/cygwin/select.cc
@@ -19,8 +19,6 @@ details. */
 #include <sys/param.h>
 #include "ntdll.h"
 
-#include <wingdi.h>
-#include <winuser.h>
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
 #include <netdb.h>
diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc
index ef25c592a..b1b9e6a49 100644
--- a/winsup/cygwin/shared.cc
+++ b/winsup/cygwin/shared.cc
@@ -26,8 +26,6 @@ details. */
 #include "spinlock.h"
 #include <alloca.h>
 #include <wchar.h>
-#include <wingdi.h>
-#include <winuser.h>
 
 shared_info NO_COPY *cygwin_shared;
 user_info NO_COPY *user_shared;
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc
index 74c5fa40c..6aef64440 100644
--- a/winsup/cygwin/spawn.cc
+++ b/winsup/cygwin/spawn.cc
@@ -14,8 +14,6 @@ details. */
 #include <unistd.h>
 #include <process.h>
 #include <sys/wait.h>
-#include <wingdi.h>
-#include <winuser.h>
 #include <wchar.h>
 #include <ctype.h>
 #include <sys/cygwin.h>
diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc
index c77882007..3c73a71ce 100644
--- a/winsup/cygwin/strace.cc
+++ b/winsup/cygwin/strace.cc
@@ -10,8 +10,6 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
-#include <wingdi.h>
-#include <winuser.h>
 #include <ctype.h>
 #include "cygerrno.h"
 #include "pinfo.h"
diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc
index d80f2ec6f..07020649c 100644
--- a/winsup/cygwin/strfuncs.cc
+++ b/winsup/cygwin/strfuncs.cc
@@ -1,7 +1,7 @@
 /* strfuncs.cc: string functions
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -13,7 +13,6 @@ details. */
 #include <stdlib.h>
 #include <sys/param.h>
 #include <wchar.h>
-#include <winnls.h>
 #include <ntdll.h>
 #include "path.h"
 #include "fhandler.h"
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index e686e33fc..0ad68cf82 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -24,7 +24,6 @@ details. */
 #define pwrite __FOO_pwrite
 
 #include "winsup.h"
-#include <winnls.h>
 #include "miscfuncs.h"
 #include <sys/stat.h>
 #include <sys/vfs.h> /* needed for statfs */
diff --git a/winsup/cygwin/window.cc b/winsup/cygwin/window.cc
index ce9a7c708..c6a6f9e28 100644
--- a/winsup/cygwin/window.cc
+++ b/winsup/cygwin/window.cc
@@ -13,8 +13,6 @@ details. */
 
 #include "winsup.h"
 #include <sys/time.h>
-#include <wingdi.h>
-#include <winuser.h>
 #define USE_SYS_TYPES_FD_SET
 #include <winsock2.h>
 #include "perprocess.h"
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/winlean.h
index 8a4c2aeb2..c50cf747a 100644
--- a/winsup/cygwin/winlean.h
+++ b/winsup/cygwin/winlean.h
@@ -12,14 +12,18 @@ details. */
 #define _WINLEAN_H 1
 #define WIN32_LEAN_AND_MEAN 1
 
-/* Mingw64 */
-#define _WINNLS_
-#define _WINNETWK_
-#define _WINSVC_
+/* The following macros have to be defined, otherwise the autoload mechanism
+   in autoload.cc leads to "multiple definition" errors.  The macros control
+   the declarations of symbols in the Mingw64 w32api headers.  If they are
+   not defined, a DECLSPEC_IMPORT will be added to the symbol declarations.
+   This leads to a definition of the symbols in the sources using the
+   autoloaded symbols, which in turn clashes with the definition in the
+   w32api library exporting the symbols. */
 #define _ADVAPI32_
 #define _DSGETDCAPI_
 #define _GDI32_
 #define _KERNEL32_
+#define _NORMALIZE_
 #define _OLE32_
 #define _SHELL32_
 #define _SPOOL32_
@@ -75,10 +79,6 @@ details. */
 #undef CRITICAL
 #endif
 
-#undef _WINNLS_
-#undef _WINNETWK_
-#undef _WINSVC_
-
 /* When Terminal Services are installed, the GetWindowsDirectory function
    does not return the system installation dir, but a user specific directory
    instead.  That's not what we have in mind when calling GetWindowsDirectory