From f5cea729a6fb0a334066271c50ce57504aa8b68e Mon Sep 17 00:00:00 2001
From: Francois Gouget <fgouget@codeweavers.com>
Date: Wed, 8 Nov 2000 05:05:15 +0000
Subject: [PATCH] We must include windef.h before wtypes.h (directly or
 indirectly).

---
 dlls/commdlg/filedlgbrowser.c | 3 ++-
 dlls/ddraw/ddraw_private.h    | 2 +-
 dlls/dplayx/dpclassfactory.c  | 1 +
 dlls/ole32/moniker.c          | 3 ++-
 dlls/shell32/folders.c        | 1 +
 dlls/shell32/shlview.c        | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index 11db12c022d..0ccca3f969a 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -5,11 +5,12 @@
  */
 
 #include <stdio.h>
-#include "unknwn.h"
+
 #include "filedlgbrowser.h"
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
+#include "unknwn.h"
 #include "wine/winestring.h"
 #include "heap.h"
 #include "shlguid.h"
diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h
index f200a674489..803a4b5dfcf 100644
--- a/dlls/ddraw/ddraw_private.h
+++ b/dlls/ddraw/ddraw_private.h
@@ -3,8 +3,8 @@
 
 /* MAY NOT CONTAIN X11 or DGA specific includes/defines/structs! */
 
-#include "wtypes.h"
 #include "winbase.h"
+#include "wtypes.h"
 #include "wingdi.h"
 #include "winuser.h"
 #include "ddraw.h"
diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c
index 9a7546a7448..6101e9b76bf 100644
--- a/dlls/dplayx/dpclassfactory.c
+++ b/dlls/dplayx/dpclassfactory.c
@@ -1,4 +1,5 @@
 
+#include "windef.h"
 #include "wine/obj_base.h"
 #include "winerror.h"
 #include "debugtools.h"
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index f75373d17e9..e868c283433 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -6,9 +6,10 @@
  */
 
 #include <assert.h>
+
 #include "winerror.h"
-#include "wtypes.h"
 #include "winbase.h"
+#include "wtypes.h"
 #include "wine/obj_base.h"
 #include "wine/obj_storage.h"
 #include "wine/obj_misc.h"
diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c
index 5bf89ebac96..c0ea2bd378c 100644
--- a/dlls/shell32/folders.c
+++ b/dlls/shell32/folders.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "windef.h"
 #include "wine/obj_base.h"
 #include "wine/obj_extracticon.h"
 #include "wine/undocshell.h"
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index d885f1b9d28..d4bcbf46400 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -25,6 +25,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "windef.h"
 #include "servprov.h"
 #include "shlguid.h"
 #include "shlobj.h"
-- 
GitLab