[PATCH 03/10] winemac: Move all Windows includes (by Unix files) to macdrv.h.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/winemac.drv/clipboard.c   |  8 --------
 dlls/winemac.drv/display.c     |  7 +------
 dlls/winemac.drv/event.c       |  6 +-----
 dlls/winemac.drv/gdi.c         |  2 --
 dlls/winemac.drv/image.c       |  2 --
 dlls/winemac.drv/keyboard.c    |  3 ---
 dlls/winemac.drv/macdrv.h      | 15 ++++++++++++++-
 dlls/winemac.drv/macdrv_main.c |  7 +------
 dlls/winemac.drv/mouse.c       |  2 --
 dlls/winemac.drv/opengl.c      |  7 -------
 dlls/winemac.drv/surface.c     |  2 --
 dlls/winemac.drv/systray.c     |  8 --------
 dlls/winemac.drv/vulkan.c      |  9 +--------
 dlls/winemac.drv/window.c      |  9 +--------
 14 files changed, 19 insertions(+), 68 deletions(-)

diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c
index c745be73484..2094558bb41 100644
--- a/dlls/winemac.drv/clipboard.c
+++ b/dlls/winemac.drv/clipboard.c
@@ -27,15 +27,7 @@
 #endif

#include "config.h"
-
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
 #include "macdrv.h"
-#include "winuser.h"
-#include "shellapi.h"
-#include "shlobj.h"
-#include "wine/list.h"
-#include "wine/server.h"

WINE_DEFAULT_DEBUG_CHANNEL(clipboard);
diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
index 8b012379b2e..e07b0fac0b5 100644
--- a/dlls/winemac.drv/display.c
+++ b/dlls/winemac.drv/display.c
@@ -24,13 +24,8 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"
-#include "winuser.h"
-#include "winreg.h"
-#include "ddrawi.h"
-#define WIN32_NO_STATUS
-#include "winternl.h"
+

WINE_DEFAULT_DEBUG_CHANNEL(display);

diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c
index 2998e2e364d..f7288b8d1b6 100644
--- a/dlls/winemac.drv/event.c
+++ b/dlls/winemac.drv/event.c
@@ -25,14 +25,10 @@
 #endif

#include "config.h"
+#include "macdrv.h"

#include <poll.h>

-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "macdrv.h"
-#include "oleidl.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(event);
 WINE_DECLARE_DEBUG_CHANNEL(imm);

diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c
index 2ef941aedb4..7c2ec2b2aa4 100644
--- a/dlls/winemac.drv/gdi.c
+++ b/dlls/winemac.drv/gdi.c
@@ -24,9 +24,7 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"
-#include "winreg.h"

WINE_DEFAULT_DEBUG_CHANNEL(macdrv);

diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c
index eb5939ce438..bc30c163488 100644
--- a/dlls/winemac.drv/image.c
+++ b/dlls/winemac.drv/image.c
@@ -23,9 +23,7 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"
-#include "winuser.h"

WINE_DEFAULT_DEBUG_CHANNEL(image);

diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c
index 7c49be7849f..39191d3cdf2 100644
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -29,10 +29,7 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"
-#include "winuser.h"
-#include "wine/server.h"

WINE_DEFAULT_DEBUG_CHANNEL(keyboard);
 WINE_DECLARE_DEBUG_CHANNEL(key);
diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index 54c1278bc2f..570b1eac5c7 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -29,14 +29,27 @@

#include "macdrv_cocoa.h"

+/* All Windows headers needed by Unix C/ObjC files must be included here. */
 #include "ntstatus.h"
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
 #include "ntgdi.h"
+#include "ddrawi.h"
+#include "oleidl.h"
+#include "shellapi.h"
+#include "shlobj.h"
+#include "unixlib.h"
+#include "winnt.h"
+#include "winternl.h"
+#include "winuser.h"
 #include "wine/debug.h"
 #include "wine/gdi_driver.h"
-#include "unixlib.h"
+#include "wine/list.h"
+#include "wine/server.h"
+#include "wine/opengl_driver.h"
+#include "wine/vulkan.h"
+#include "wine/vulkan_driver.h"

extern bool allow_vsync;
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index 9780d350246..9061fb1aae5 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -25,16 +25,11 @@
 #endif

#include "config.h"
+#include "macdrv.h"

#include <Security/AuthSession.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>

-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "macdrv.h"
-#include "shellapi.h"
-#include "wine/server.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(macdrv);

#define IS_OPTION_TRUE(ch) \
diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c
index c655f56bd98..00ec9fcf25a 100644
--- a/dlls/winemac.drv/mouse.c
+++ b/dlls/winemac.drv/mouse.c
@@ -25,10 +25,8 @@
 #endif

#include "config.h"
-
 #define OEMRESOURCE
 #include "macdrv.h"
-#include "wine/server.h"

WINE_DEFAULT_DEBUG_CHANNEL(cursor);

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index e60fc04a82e..c84be256cf1 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -24,15 +24,8 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"

-#include "winuser.h"
-#include "winternl.h"
-#include "winnt.h"
-#include "wine/debug.h"
-#include "wine/opengl_driver.h"
-
 #define GL_SILENCE_DEPRECATION
 #define __gl_h_
 #define __gltypes_h_
diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c
index a849918dfa7..7c49309d234 100644
--- a/dlls/winemac.drv/surface.c
+++ b/dlls/winemac.drv/surface.c
@@ -25,9 +25,7 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"
-#include "winuser.h"

WINE_DEFAULT_DEBUG_CHANNEL(bitblt);

diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c
index 0231e08e82b..d341b2b27d0 100644
--- a/dlls/winemac.drv/systray.c
+++ b/dlls/winemac.drv/systray.c
@@ -26,16 +26,8 @@
 #endif

#include "config.h"
-
 #include "macdrv.h"

-#include "windef.h"
-#include "winuser.h"
-#include "shellapi.h"
-
-#include "wine/list.h"
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(systray);

diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c
index d146a45e351..74f33767cff 100644
--- a/dlls/winemac.drv/vulkan.c
+++ b/dlls/winemac.drv/vulkan.c
@@ -26,19 +26,12 @@
 #endif

#include "config.h"
+#include "macdrv.h"

#include <stdarg.h>
 #include <stdio.h>
 #include <dlfcn.h>

-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "macdrv.h"
-#include "wine/debug.h"
-
-#include "wine/vulkan.h"
-#include "wine/vulkan_driver.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(vulkan);

static const struct vulkan_driver_funcs macdrv_vulkan_driver_funcs;
diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c
index a511641e3c7..77c80d2429b 100644
--- a/dlls/winemac.drv/window.c
+++ b/dlls/winemac.drv/window.c
@@ -26,16 +26,9 @@
 #endif

#include "config.h"
+#include "macdrv.h"

#include <IOKit/pwr_mgt/IOPMLib.h>
-#define GetCurrentThread Mac_GetCurrentThread
-#define LoadResource Mac_LoadResource
-#include <CoreServices/CoreServices.h>
-#undef GetCurrentThread
-#undef LoadResource
-
-#include "macdrv.h"
-#include "wine/server.h"

WINE_DEFAULT_DEBUG_CHANNEL(macdrv);