Removed debugstr.h.
diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c
index 89c634a..2dc2547 100644
--- a/dlls/avifil32/avifile.c
+++ b/dlls/avifil32/avifile.c
@@ -11,7 +11,6 @@
#include "driver.h"
#include "mmsystem.h"
#include "winerror.h"
-#include "debugstr.h"
#include "debugtools.h"
DEFAULT_DEBUG_CHANNEL(avifile)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 6890c06..80403fe 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -5,11 +5,10 @@
#include "config.h"
-#include "debugstr.h"
#include "debugtools.h"
#include "ntdll_misc.h"
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
void dump_ObjectAttributes (POBJECT_ATTRIBUTES oa)
{
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 63fc4ec..3b47c67 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -11,13 +11,12 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "debugstr.h"
#include "debugtools.h"
#include "ntddk.h"
#include "ntdll_misc.h"
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
/*
* Timer object
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index cabe235..fa8fc6a 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -16,7 +16,6 @@
#include "file.h"
#include "heap.h"
#include "winnls.h"
-#include "debugstr.h"
#include "debugtools.h"
#include "winerror.h"
#include "stackframe.h"
@@ -24,7 +23,7 @@
#include "ntddk.h"
#include "winreg.h"
-DEFAULT_DEBUG_CHANNEL(ntdll)
+DEFAULT_DEBUG_CHANNEL(ntdll);
#define NT_SUCCESS(status) (status == STATUS_SUCCESS)
diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 4bd6eed..ddd3067 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -6,7 +6,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
-#include "debugstr.h"
#include "debugtools.h"
#include "winerror.h"
diff --git a/if1632/snoop.c b/if1632/snoop.c
index 699999c..780e792 100644
--- a/if1632/snoop.c
+++ b/if1632/snoop.c
@@ -14,10 +14,9 @@
#include "stackframe.h"
#include "builtin16.h"
#include "snoop.h"
-#include "debugstr.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(snoop)
+DEFAULT_DEBUG_CHANNEL(snoop);
#ifdef __i386__
diff --git a/include/debugstr.h b/include/debugstr.h
deleted file mode 100644
index e170f1a..0000000
--- a/include/debugstr.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef __WINE_DEBUGSTR_H
-#define __WINE_DEBUGSTR_H
-
-#include "windef.h"
-
-/* These function return a printable version of a string, including
- quotes. The string will be valid for some time, but not indefinitely
- as strings are re-used. */
-struct _GUID;
-
-extern LPSTR debugstr_an (LPCSTR s, int n);
-extern LPSTR debugstr_a (LPCSTR s);
-extern LPSTR debugstr_wn (LPCWSTR s, int n);
-extern LPSTR debugstr_w (LPCWSTR s);
-extern LPSTR debugres_a (LPCSTR res);
-extern LPSTR debugres_w (LPCWSTR res);
-extern LPSTR debugstr_guid( const struct _GUID *id );
-extern void debug_dumpstr (LPCSTR s);
-extern LPSTR debugstr_hex_dump (const void *ptr, int len);
-
-#ifdef __GNUC__
-extern int dbg_printf(const char *format, ...) __attribute__((format (printf,1,2)));
-#else
-extern int dbg_printf(const char *format, ...);
-#endif
-
-
-#endif /* __WINE_DEBUGSTR_H */
diff --git a/libtest/vartest.c b/libtest/vartest.c
index 5926dad..e6a8f5b 100644
--- a/libtest/vartest.c
+++ b/libtest/vartest.c
@@ -57,7 +57,7 @@
#include <windef.h>
#ifdef __unix__
-#include <debugstr.h>
+#include <debugtools.h>
extern LPWSTR HEAP_strdupAtoW( HANDLE heap, DWORD flags, LPCSTR str );
#endif
diff --git a/loader/resource.c b/loader/resource.c
index 4967f29..c0e4c74 100644
--- a/loader/resource.c
+++ b/loader/resource.c
@@ -30,11 +30,10 @@
#include "debugtools.h"
#include "libres.h"
#include "winerror.h"
-#include "debugstr.h"
#include "winnls.h"
-DEFAULT_DEBUG_CHANNEL(resource)
-DECLARE_DEBUG_CHANNEL(accel)
+DEFAULT_DEBUG_CHANNEL(resource);
+DECLARE_DEBUG_CHANNEL(accel);
extern WORD WINE_LanguageId;
diff --git a/objects/text.c b/objects/text.c
index 36b0624..76c82d6 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -16,9 +16,8 @@
#include "heap.h"
#include "debugtools.h"
#include "cache.h"
-#include "debugstr.h"
-DEFAULT_DEBUG_CHANNEL(text)
+DEFAULT_DEBUG_CHANNEL(text);
#define TAB 9
#define LF 10
diff --git a/relay32/relay386.c b/relay32/relay386.c
index 362613b..8248699 100644
--- a/relay32/relay386.c
+++ b/relay32/relay386.c
@@ -12,11 +12,10 @@
#include "selectors.h"
#include "stackframe.h"
#include "syslevel.h"
-#include "debugstr.h"
#include "main.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(relay)
+DEFAULT_DEBUG_CHANNEL(relay);
char **debug_relay_excludelist = NULL, **debug_relay_includelist = NULL;
diff --git a/relay32/snoop.c b/relay32/snoop.c
index 8dde26e..ade7ae3 100644
--- a/relay32/snoop.c
+++ b/relay32/snoop.c
@@ -17,10 +17,9 @@
#include "peexe.h"
#include "selectors.h"
#include "stackframe.h"
-#include "debugstr.h"
#include "debugtools.h"
-DEFAULT_DEBUG_CHANNEL(snoop)
+DEFAULT_DEBUG_CHANNEL(snoop);
char **debug_snoop_excludelist = NULL, **debug_snoop_includelist = NULL;
diff --git a/relay32/utthunk.c b/relay32/utthunk.c
index 0ed56e8..e8b6c7d 100644
--- a/relay32/utthunk.c
+++ b/relay32/utthunk.c
@@ -12,9 +12,8 @@
#include "callback.h"
#include "process.h"
#include "debugtools.h"
-#include "debugstr.h"
-DEFAULT_DEBUG_CHANNEL(thunk)
+DEFAULT_DEBUG_CHANNEL(thunk);
#include "pshpack1.h"
diff --git a/win32/newfns.c b/win32/newfns.c
index f5fb0a0..86bc23a 100644
--- a/win32/newfns.c
+++ b/win32/newfns.c
@@ -14,10 +14,9 @@
#include "winerror.h"
#include "heap.h"
#include "debugtools.h"
-#include "debugstr.h"
-DEFAULT_DEBUG_CHANNEL(win32)
-DECLARE_DEBUG_CHANNEL(debug)
+DEFAULT_DEBUG_CHANNEL(win32);
+DECLARE_DEBUG_CHANNEL(debug);
/****************************************************************************
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 029f943..4750b20 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -12,7 +12,6 @@
#include "heap.h"
#include "ldt.h"
#include "debugtools.h"
-#include "debugstr.h"
#include "tweak.h"
DEFAULT_DEBUG_CHANNEL(dialog)
