Don't include windows.h internally.

dlls/ole32/clipboard.c

@@ -51,6 +51,7 @@
 #include "winuser.h"
 #include "winbase.h"
 #include "winerror.h"
+#include "winnls.h"
 #include "ole2.h"
 #include "debugtools.h"
 #include "olestd.h"

dlls/ole32/filemoniker.c

@@ -7,6 +7,7 @@
 #include <assert.h>
 #include "winbase.h"
 #include "winerror.h"
+#include "winnls.h"
 #include "wine/unicode.h"
 #include "debugtools.h"
 #include "objbase.h"

dlls/oleaut32/connpt.c

@@ -11,6 +11,8 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
+#include "ole2.h"
 #include "olectl.h"
 #include "wine/obj_base.h"
 #include "wine/obj_connection.h"

dlls/oleaut32/ole2disp.c

@@ -9,6 +9,7 @@
 #include "winuser.h"
 #include "winerror.h"
 #include "wine/windef16.h"
+#include "ole2.h"
 #include "olectl.h"
 #include "oleauto.h"
 #include "heap.h"

dlls/oleaut32/oleaut.c

@@ -14,6 +14,7 @@
 
 #include "initguid.h"
 #include "oleauto.h"
+#include "ole2.h"
 #include "olectl.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);

dlls/oleaut32/olefont.c

@@ -11,10 +11,12 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "wingdi.h"
+#include "winuser.h"
 #include "wine/unicode.h"
 #include "oleauto.h"    /* for SysAllocString(....) */
 #include "wine/obj_olefont.h"
 #include "wine/obj_storage.h"
+#include "ole2.h"
 #include "olectl.h"
 #include "debugtools.h"
 #include "heap.h"

dlls/oleaut32/olepicture.c

@@ -23,6 +23,10 @@
  */
 
 #include "winerror.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "ole2.h"
 #include "olectl.h"
 #include "wine/obj_picture.h"
 #include "debugtools.h"

dlls/oleaut32/stubs.c

@@ -7,7 +7,10 @@
  */
 
 #include "windef.h"
+#include "wingdi.h"
+#include "winuser.h"
 #include "debugtools.h"
+#include "ole2.h"
 #include "olectl.h"
 #include "heap.h"
 

dlls/richedit/charlist.c

@@ -11,8 +11,10 @@
 #include <stddef.h>
 #include <ctype.h>
 #include <stdlib.h>
+
 #include "charlist.h"
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
 
 extern HANDLE RICHED32_hHeap;
 

dlls/richedit/reader.c

@@ -72,8 +72,10 @@
 #include "text_map.h"
 
 #include <stdlib.h>
+
 #include "charlist.h"
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
 #include "debugtools.h"
 
 extern HANDLE RICHED32_hHeap;

dlls/richedit/richedit.c

@@ -9,7 +9,7 @@
  * 
  */
  
-#include "windows.h"
+#include "windef.h"
 #include "winbase.h"
 #include "heap.h"
 #include "debugtools.h"

dlls/richedit/rtf.h

@@ -2,8 +2,12 @@
 #define _RTF
 
 #include <stdio.h>
-#include <windows.h>
-#include <richedit.h>
+
+#include "windef.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "richedit.h"
+
 void RTFSetEditStream(EDITSTREAM *es);
 
 

dlls/urlmon/umon.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "windows.h"
+#include "windef.h"
 #include "objbase.h"
 #include "debugtools.h"
 

dlls/wininet/ftp.c

@@ -10,7 +10,9 @@
 #include "config.h"
 
 #include <errno.h>
-#include <netdb.h>
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -21,7 +23,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <netinet/in_systm.h>
-#include <netinet/in.h>
+#ifdef HAVE_NETINET_IH_H
+# include <netinet/in.h>
+#endif
 #include <netinet/ip.h>
 
 #include "winbase.h"

dlls/wininet/http.c

@@ -9,7 +9,8 @@
 
 #include "config.h"
 
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
 #include "wininet.h"
 #include "debugtools.h"
 #include "winerror.h"
@@ -19,7 +20,9 @@
 #ifdef HAVE_SYS_SOCKET_H
 # include <sys/socket.h>
 #endif
-#include <netdb.h>
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

dlls/wininet/internet.c

@@ -19,7 +19,8 @@
 #include <ctype.h>
 #include <unistd.h>
 
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
 #include "wininet.h"
 #include "debugtools.h"
 #include "winerror.h"

dlls/wininet/utility.c

@@ -7,12 +7,14 @@
  *
  */
 
+#include "config.h"
+
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
-#include "config.h"
-#include "windows.h"
+#include "windef.h"
+#include "winbase.h"
 #include "wininet.h"
 #include "winerror.h"
 #include "winsock.h"

include/ocidl.h

 #ifndef __WINE_OCIDL_H
 #define __WINE_OCIDL_H
 
+#if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
 #include "windows.h"
 #include "ole2.h"
+#endif
 
 #include "wine/obj_base.h"
 

include/rpc.h

@@ -5,6 +5,10 @@
 #ifndef __WINE_RPC_H
 #define __WINE_RPC_H
 
+#if !defined(RPC_NO_WINDOWS_H) && !defined(__WINE__)
+#include "windows.h"
+#endif
+
 #define __RPC_FAR
 #define __RPC_API  WINAPI
 #define __RPC_USER WINAPI

include/unknwn.h

@@ -4,11 +4,11 @@
 #include "rpc.h"
 #include "rpcndr.h"
 
-#include "wine/obj_base.h"
-
-#ifndef COM_NO_WINDOWS_H
+#if !defined(COM_NO_WINDOWS_H) && !defined(__WINE__)
 #include "windows.h"
 #include "ole2.h"
 #endif
 
+#include "wine/obj_base.h"
+
 #endif /* __WINE_UNKNWN_H */

include/windows.h

 #ifndef __WINE_WINDOWS_H
 #define __WINE_WINDOWS_H
 
+#ifdef __WINE__
+#error Wine should not include windows.h internally
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif

msdos/int11.c

@@ -6,7 +6,7 @@
 #include <stdlib.h>
 
 #include "config.h"
-#include "windows.h"
+#include "windef.h"
 #include "miscemu.h"
 #include "msdos.h"
 #include "drive.h"