Removed some unnecessary includes.
diff --git a/debugger/debugger.h b/debugger/debugger.h
index a10daf5..6a30779 100644
--- a/debugger/debugger.h
+++ b/debugger/debugger.h
@@ -512,11 +512,16 @@
malloc() arena (and other heaps) can be totally wasted and it'll still
work, etc... if someone could make optimized routines so it wouldn't
take so long to load, it could be made default) */
-#include "heap.h"
#define DBG_alloc(x) HeapAlloc(dbg_heap,0,x)
#define DBG_realloc(x,y) HeapRealloc(dbg_heap,0,x,y)
#define DBG_free(x) HeapFree(dbg_heap,0,x)
-#define DBG_strdup(x) HEAP_strdupA(dbg_heap,0,x)
+inline static LPSTR DBG_strdup( LPCSTR str )
+{
+ INT len = strlen(str) + 1;
+ LPSTR p = DBG_alloc( len );
+ if (p) memcpy( p, str, len );
+ return p;
+}
#define DBG_need_heap
extern HANDLE dbg_heap;
#endif
diff --git a/debugger/info.c b/debugger/info.c
index 9da31dd..8d29b4f 100644
--- a/debugger/info.c
+++ b/debugger/info.c
@@ -11,7 +11,6 @@
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
-#include "toolhelp.h"
#include "tlhelp32.h"
#include "debugger.h"
#include "expr.h"
diff --git a/debugger/memory.c b/debugger/memory.c
index 416788d..5971382 100644
--- a/debugger/memory.c
+++ b/debugger/memory.c
@@ -11,7 +11,6 @@
#include <string.h>
#include "debugger.h"
-#include "miscemu.h"
#include "winbase.h"
#ifdef __i386__
diff --git a/debugger/module.c b/debugger/module.c
index 11220f9..cce20da 100644
--- a/debugger/module.c
+++ b/debugger/module.c
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <string.h>
#include "debugger.h"
-#include "toolhelp.h"
#include "wingdi.h"
#include "winuser.h"
diff --git a/debugger/msc.c b/debugger/msc.c
index c661ce0..63ea5f1 100644
--- a/debugger/msc.c
+++ b/debugger/msc.c
@@ -24,7 +24,8 @@
#define PATH_MAX _MAX_PATH
#endif
#include "debugger.h"
-#include "file.h"
+
+#define MAX_PATHNAME_LEN 1024
typedef struct
{
diff --git a/debugger/winedbg.c b/debugger/winedbg.c
index dfc1572..ccd11d4 100644
--- a/debugger/winedbg.c
+++ b/debugger/winedbg.c
@@ -13,7 +13,6 @@
#include "ntddk.h"
#include "thread.h"
-#include "file.h"
#include "wincon.h"
#include "wingdi.h"
#include "winuser.h"
