[PATCH 1/5] avicap32: Define NONAMELESSUNION where necessary.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/avicap32/avicap32_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/avicap32/avicap32_main.c b/dlls/avicap32/avicap32_main.c
index 9e2a99d4c7c..0178dc87edb 100644
--- a/dlls/avicap32/avicap32_main.c
+++ b/dlls/avicap32/avicap32_main.c
@@ -43,6 +43,7 @@
 # include <unistd.h>
 #endif

+#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"

[PATCH 2/5] adsiid: Define NONAMELESSUNION where necessary.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/adsiid/adsiid.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/adsiid/adsiid.c b/dlls/adsiid/adsiid.c
index fc0b8b1bf4e..69aeb6a9a32 100644
--- a/dlls/adsiid/adsiid.c
+++ b/dlls/adsiid/adsiid.c
@@ -20,6 +20,7 @@

#include <stdarg.h>

+#define NONAMELESSUNION
 #include "windef.h"
 #include "objbase.h"
 #include "initguid.h"

[PATCH 3/5] advapi32: Define NONAMELESSUNION where necessary.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/advapi32/security.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index a7707f15d39..3ed27bfe8fd 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -25,6 +25,7 @@
 #include <string.h>

#include "ntstatus.h"
+#define NONAMELESSUNION
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"

[PATCH 4/5] cabinet: Define NONAMELESSUNION where necessary.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/cabinet/cabinet_main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c
index 8af0fb1e6d2..d32ac1072e1 100644
--- a/dlls/cabinet/cabinet_main.c
+++ b/dlls/cabinet/cabinet_main.c
@@ -24,6 +24,7 @@
 #include <stdarg.h>
 #include <string.h>

+#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

[PATCH 5/5] dbghelp: Define NONAMELESSUNION where necessary.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/dbghelp/coff.c            | 7 +------
 dlls/dbghelp/dbghelp_private.h | 1 +
 dlls/dbghelp/stabs.c           | 5 -----
 dlls/dbghelp/storage.c         | 2 +-
 4 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dlls/dbghelp/coff.c b/dlls/dbghelp/coff.c
index 01c5826c7ff..197434f1f31 100644
--- a/dlls/dbghelp/coff.c
+++ b/dlls/dbghelp/coff.c
@@ -43,14 +43,9 @@
 # include <unistd.h>
 #endif

-#include <stdarg.h>
-#include "windef.h"
-#include "winbase.h"
-#include "winternl.h"
-
+#include "dbghelp_private.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
-#include "dbghelp_private.h"
 #include "wine/mscvpdb.h"

WINE_DEFAULT_DEBUG_CHANNEL(dbghelp_coff);
diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h
index b52392aeced..902bc114bb5 100644
--- a/dlls/dbghelp/dbghelp_private.h
+++ b/dlls/dbghelp/dbghelp_private.h
@@ -22,6 +22,7 @@
  */

#include <stdarg.h>
+#define NONAMELESSUNION
 #include "windef.h"
 #include "winbase.h"
 #include "winver.h"
diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c
index bc5ef356e8c..55116735f5f 100644
--- a/dlls/dbghelp/stabs.c
+++ b/dlls/dbghelp/stabs.c
@@ -49,16 +49,11 @@
 #endif
 #include <stdio.h>
 #include <assert.h>
-#include <stdarg.h>

#ifdef HAVE_MACH_O_NLIST_H
 # include <mach-o/nlist.h>
 #endif

-#include "windef.h"
-#include "winbase.h"
-#include "winnls.h"
-
 #include "dbghelp_private.h"

#include "wine/debug.h"
diff --git a/dlls/dbghelp/storage.c b/dlls/dbghelp/storage.c
index b08639f5518..cd5792ca413 100644
--- a/dlls/dbghelp/storage.c
+++ b/dlls/dbghelp/storage.c
@@ -23,9 +23,9 @@
 #include "config.h"
 #include <assert.h>
 #include <stdlib.h>
-#include "wine/debug.h"

#include "dbghelp_private.h"
+#include "wine/debug.h"
 #ifdef USE_STATS
 #include <math.h>
 #endif