Don't include debugtools.h in the header file, moved it to the C files

that need it (and used the new wine/debug.h while we are at it).

dlls/msvcrt/console.c

@@ -13,7 +13,9 @@
 #include "msvcrt/malloc.h"
 #include "msvcrt/stdio.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 

dlls/msvcrt/cpp.c

@@ -8,7 +8,9 @@
 #include "msvcrt/eh.h"
 #include "msvcrt/malloc.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 typedef void (*v_table_ptr)();

dlls/msvcrt/ctype.c

@@ -7,7 +7,9 @@
 
 #include "msvcrt/ctype.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* Some abbreviations to make the following table readable */
 #define _C_ _CONTROL

dlls/msvcrt/data.c

@@ -10,7 +10,9 @@
 #include "msvcrt/string.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 unsigned int MSVCRT___argc;
 unsigned int MSVCRT_basemajor;/* FIXME: */

dlls/msvcrt/dir.c

@@ -20,7 +20,9 @@
 #include "msvcrt/stdlib.h"
 #include "msvcrt/string.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* INTERNAL: Translate finddata_t to PWIN32_FIND_DATAA */
 static void msvcrt_fttofd(LPWIN32_FIND_DATAA fd, struct _finddata_t* ft)

dlls/msvcrt/environ.c

@@ -12,7 +12,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /*********************************************************************
  *		getenv (MSVCRT.@)

dlls/msvcrt/errno.c

@@ -15,7 +15,9 @@
 #include "msvcrt/string.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /* INTERNAL: Set the crt and dos errno's from the OS error given. */

dlls/msvcrt/except.c

@@ -18,7 +18,9 @@
 #include "msvcrt/setjmp.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 typedef void (*MSVCRT_sig_handler_func)(void);
 

dlls/msvcrt/exit.c

@@ -9,7 +9,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* MT */
 extern CRITICAL_SECTION MSVCRT_exit_cs;

dlls/msvcrt/file.c

@@ -25,7 +25,9 @@
 #include "msvcrt/sys/utime.h"
 #include "msvcrt/time.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* for stat mode, permissions apply to all,owner and group */
 #define MSVCRT_S_IREAD  (_S_IREAD  | (_S_IREAD  >> 3) | (_S_IREAD  >> 6))

dlls/msvcrt/heap.c

@@ -13,7 +13,9 @@
 #include "msvcrt/malloc.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* MT */
 extern CRITICAL_SECTION MSVCRT_heap_cs;

dlls/msvcrt/locale.c

@@ -10,7 +10,9 @@
 #include "msvcrt.h"
 #include "msvcrt/locale.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* FIXME: Need to hold locale for each LC_* type and aggregate
  * string to produce lc_all.

dlls/msvcrt/main.c

@@ -9,7 +9,9 @@
 #include "msvcrt/stdio.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* Index to TLS */
 DWORD MSVCRT_tls_index;

dlls/msvcrt/math.c

@@ -16,7 +16,9 @@
 
 #include "msvcrt/stdlib.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 #ifndef HAVE_FINITE
 #ifndef finite /* Could be a macro */

dlls/msvcrt/mbcs.c

@@ -18,7 +18,9 @@
 #include "msvcrt/wctype.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 unsigned char MSVCRT_mbctype[257];
 int MSVCRT___mb_cur_max = 1;

dlls/msvcrt/misc.c

@@ -10,7 +10,9 @@
 #include "msvcrt/stdlib.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /*********************************************************************

dlls/msvcrt/msvcrt.h

@@ -6,7 +6,6 @@
 #include <string.h>
 
 #include "windef.h"
-#include "debugtools.h"
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"

dlls/msvcrt/process.c

@@ -18,7 +18,9 @@
 #include "msvcrt/stdlib.h"
 #include "msvcrt/string.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* FIXME: Check file extensions for app to run */
 static const unsigned int EXE = 'e' << 16 | 'x' << 8 | 'e';

dlls/msvcrt/string.c

@@ -11,7 +11,9 @@
 #include "msvcrt/stdlib.h"
 #include "msvcrt/string.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* INTERNAL: MSVCRT_malloc() based strndup */
 char* msvcrt_strndup(const char* buf, unsigned int size)

dlls/msvcrt/thread.c

@@ -8,7 +8,9 @@
 #include "msvcrt/malloc.h"
 #include "msvcrt/process.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /********************************************************************/
 

dlls/msvcrt/time.c

@@ -15,7 +15,9 @@
 #include "msvcrt/time.h"
 
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /* INTERNAL: Return formatted current time/date */

dlls/msvcrt/wcs.c

@@ -15,7 +15,9 @@
 #include "msvcrt/string.h"
 #include "msvcrt/wctype.h"
 
-DEFAULT_DEBUG_CHANNEL(msvcrt);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 
 /* INTERNAL: MSVCRT_malloc() based wstrndup */