From 1ed5577522229642ea7b536bae365d740bbd88ed Mon Sep 17 00:00:00 2001
From: Patrik Stridvall <ps@leissner.se>
Date: Thu, 30 Nov 2000 01:31:28 +0000
Subject: [PATCH] Don't include windows.h internally.

---
 dlls/ole32/clipboard.c     | 1 +
 dlls/ole32/filemoniker.c   | 1 +
 dlls/oleaut32/connpt.c     | 2 ++
 dlls/oleaut32/ole2disp.c   | 1 +
 dlls/oleaut32/oleaut.c     | 1 +
 dlls/oleaut32/olefont.c    | 2 ++
 dlls/oleaut32/olepicture.c | 4 ++++
 dlls/oleaut32/stubs.c      | 3 +++
 dlls/richedit/charlist.c   | 4 +++-
 dlls/richedit/reader.c     | 4 +++-
 dlls/richedit/richedit.c   | 2 +-
 dlls/richedit/rtf.h        | 8 ++++++--
 dlls/urlmon/umon.c         | 2 +-
 dlls/wininet/ftp.c         | 8 ++++++--
 dlls/wininet/http.c        | 7 +++++--
 dlls/wininet/internet.c    | 3 ++-
 dlls/wininet/utility.c     | 6 ++++--
 include/ocidl.h            | 2 ++
 include/rpc.h              | 4 ++++
 include/unknwn.h           | 6 +++---
 include/windows.h          | 4 ++++
 msdos/int11.c              | 2 +-
 22 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c
index d4dc0dd494b..33c1571b586 100644
--- a/dlls/ole32/clipboard.c
+++ b/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"
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index 283f31b8f9b..fefdcff36de 100644
--- a/dlls/ole32/filemoniker.c
+++ b/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"
diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 46ee3c254a9..d9de4245d48 100644
--- a/dlls/oleaut32/connpt.c
+++ b/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"
diff --git a/dlls/oleaut32/ole2disp.c b/dlls/oleaut32/ole2disp.c
index 50686139cea..78f3d4ebb9b 100644
--- a/dlls/oleaut32/ole2disp.c
+++ b/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"
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index 55ef444653e..e31e2ee7768 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -14,6 +14,7 @@
 
 #include "initguid.h"
 #include "oleauto.h"
+#include "ole2.h"
 #include "olectl.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c
index 28e3ff4c172..bd74c21e56a 100644
--- a/dlls/oleaut32/olefont.c
+++ b/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"
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index c19729e49da..83981f27f7c 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/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"
diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
index af5d1366581..fc682c1bfbb 100644
--- a/dlls/oleaut32/stubs.c
+++ b/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"
 
diff --git a/dlls/richedit/charlist.c b/dlls/richedit/charlist.c
index aab292920ff..c1934be9cc6 100644
--- a/dlls/richedit/charlist.c
+++ b/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;
 
diff --git a/dlls/richedit/reader.c b/dlls/richedit/reader.c
index 826f90cb97d..158d6fb0c84 100644
--- a/dlls/richedit/reader.c
+++ b/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;
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index 4b9847cb6e7..5a6d9f6e4f9 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -9,7 +9,7 @@
  * 
  */
  
-#include "windows.h"
+#include "windef.h"
 #include "winbase.h"
 #include "heap.h"
 #include "debugtools.h"
diff --git a/dlls/richedit/rtf.h b/dlls/richedit/rtf.h
index ea7bcbe14f3..f12475fc6fc 100644
--- a/dlls/richedit/rtf.h
+++ b/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);
 
 
diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c
index 056d2b5e3f9..99a409685cb 100644
--- a/dlls/urlmon/umon.c
+++ b/dlls/urlmon/umon.c
@@ -7,7 +7,7 @@
  *
  */
 
-#include "windows.h"
+#include "windef.h"
 #include "objbase.h"
 #include "debugtools.h"
 
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 9d70c625edf..e136c87157b 100644
--- a/dlls/wininet/ftp.c
+++ b/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"
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 1d87d87e3ed..784912a6233 100644
--- a/dlls/wininet/http.c
+++ b/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>
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 0a0c669cb45..4c3f04a5d9e 100644
--- a/dlls/wininet/internet.c
+++ b/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"
diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c
index 3afefd80410..2c27fb7e24e 100644
--- a/dlls/wininet/utility.c
+++ b/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"
diff --git a/include/ocidl.h b/include/ocidl.h
index a96328c2270..192e65799b6 100644
--- a/include/ocidl.h
+++ b/include/ocidl.h
@@ -1,8 +1,10 @@
 #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"
 
diff --git a/include/rpc.h b/include/rpc.h
index 06e5c0f634b..ea3b0f7dfd3 100644
--- a/include/rpc.h
+++ b/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
diff --git a/include/unknwn.h b/include/unknwn.h
index c9a26aeddc4..1090c0cd528 100644
--- a/include/unknwn.h
+++ b/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 */
diff --git a/include/windows.h b/include/windows.h
index 2cb13c282c0..d4ccfc2e1b6 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -1,6 +1,10 @@
 #ifndef __WINE_WINDOWS_H
 #define __WINE_WINDOWS_H
 
+#ifdef __WINE__
+#error Wine should not include windows.h internally
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/msdos/int11.c b/msdos/int11.c
index ecd158cbf01..58d7b63eaba 100644
--- a/msdos/int11.c
+++ b/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"