Signed-off-by: Zebediah Figura z.figura12@gmail.com --- 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