Removes all unnecessary WINE_DEFAULT_DEBUG_CHANNEL and respective wine/debug.h includes.

dlls/cabinet/fci.c

@@ -64,8 +64,6 @@ There is still some work to be done:
     if (B) SetLastError(B); } while(0)
 
 
-WINE_DEFAULT_DEBUG_CHANNEL(cabinet);
-
 typedef struct {
   cab_UBYTE signature[4]; /* !CAB for unfinished cabinets else MSCF */
   cab_ULONG reserved1;

dlls/gdi/bidi.c

@@ -55,11 +55,11 @@ BOOL BIDI_Reorder(
                 UINT *lpOrder /* [out] Logical -> Visual order map */
     )
 {
-#ifdef HAVE_ICU
     TRACE("%s, %d, 0x%08lx lpOutString=%p, lpOrder=%p\n",
           debugstr_wn(lpString, uCount), uCount, dwFlags,
           lpOutString, lpOrder);
 
+#ifdef HAVE_ICU
     if ((dwFlags & GCP_REORDER) != 0) {
         UBiDi *bidi;
         UErrorCode err=0;

dlls/gdi/enhmfdrv/bitblt.c

@@ -28,8 +28,6 @@
 #include "enhmetafiledrv.h"
 #include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(enhmetafile);
-
 BOOL EMFDRV_PatBlt( PHYSDEV dev, INT left, INT top,
                     INT width, INT height, DWORD rop )
 {

dlls/gphoto2.ds/ui.c

@@ -38,8 +38,6 @@
 #include "wine/debug.h"
 #include "resource.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(twain);
-
 static HBITMAP static_bitmap;
 
 static INT_PTR CALLBACK ConnectingProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

dlls/imagehlp/imagehlp_main.c

@@ -26,8 +26,6 @@
 #include "winerror.h"
 #include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(imagehlp);
-
 /**********************************************************************/
 HANDLE IMAGEHLP_hHeap = NULL;
 

dlls/kernel/atom.c

@@ -38,10 +38,6 @@
 #include "wine/unicode.h"
 #include "kernel_private.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(atom);
-
 #define MAX_ATOM_LEN 255
 
 /******************************************************************

dlls/kernel/kernel16.c

@@ -28,9 +28,6 @@
 #include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(kernel);
 
 /**************************************************************************
  *		DllEntryPoint   (KERNEL.669)

dlls/mscms/icc.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "wine/debug.h"
 
 #include <stdarg.h>
 
@@ -34,8 +33,6 @@
 
 #include "mscms_priv.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mscms);
-
 #ifdef HAVE_LCMS
 
 static inline void MSCMS_adjust_endianess32( ULONG *ptr )

dlls/msi/tokenize.c

@@ -22,13 +22,10 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "wine/debug.h"
 #include "wine/unicode.h"
 #include "query.h"
 #include "sql.tab.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msi);
-
 /*
 ** All the keywords of the SQL language are stored as in a hash
 ** table composed of instances of the following structure.

dlls/msvcrt/ctype.c

@@ -20,9 +20,6 @@
 
 #include "msvcrt.h"
 #include "winnls.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
 /* Some abbreviations to make the following table readable */
 #define _C_ MSVCRT__CONTROL

dlls/netapi32/browsr.c

@@ -26,9 +26,6 @@
 #include "lmcons.h"
 #include "lmbrowsr.h"
 #include "lmshare.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(netapi32);
 
 /************************************************************
  *                I_BrowserSetNetlogonState  (NETAPI32.@)

dlls/netapi32/nbnamecache.c

@@ -21,12 +21,9 @@
 
 #include "config.h"
 #include "wine/port.h"
-#include "wine/debug.h"
 
 #include "nbnamecache.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(netbios);
-
 typedef struct _NBNameCacheNode
 {
     DWORD expireTime;

dlls/ntdll/wcstring.c

@@ -32,10 +32,6 @@
 #include "windef.h"
 #include "winternl.h"
 #include "wine/unicode.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(ntdll);
-
 
 /*********************************************************************
  *           _wcsicmp    (NTDLL.@)

dlls/rsaenh/implglue.c

@@ -24,7 +24,6 @@
 
 #include "wine/port.h"
 #include "wine/library.h"
-#include "wine/debug.h"
 
 #include "windef.h"
 #include "wincrypt.h"
@@ -33,8 +32,6 @@
 
 #include <stdio.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(crypt);
-
 /* Function prototypes copied from dlls/advapi32/crypt_md4.c */
 VOID WINAPI MD4Init( MD4_CTX *ctx );
 VOID WINAPI MD4Update( MD4_CTX *ctx, const unsigned char *buf, unsigned int len );

dlls/user/driver.c

@@ -23,11 +23,9 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-
-#include "user_private.h"
 #include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(user);
+#include "user_private.h"
 
 static const USER_DRIVER null_driver, lazy_load_driver;
 

dlls/user/lstr.c

@@ -38,10 +38,6 @@
 #include "wine/unicode.h"
 #include "excpt.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(resource);
-
 
 /***********************************************************************
  *           CharNextA   (USER32.@)

dlls/uxtheme/stylemap.c

@@ -29,10 +29,6 @@
 
 #define TMT_ENUM 200
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
-
 typedef struct _MSSTYLES_PROPERTY_MAP {
     WORD dwPrimitiveType;
     WORD dwPropertyID;

dlls/wineps.drv/encode.c

@@ -22,9 +22,6 @@
 #include <string.h>
 
 #include "psdrv.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(psdrv);
 
 DWORD RLE_encode(BYTE *in_buf, DWORD len, BYTE *out_buf)
 {

dlls/winex11.drv/clipping.c

@@ -23,9 +23,6 @@
 #include <stdio.h>
 
 #include "x11drv.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
 
 /***********************************************************************
  *           X11DRV_GetRegionData

dlls/winex11.drv/codepage.c

@@ -27,9 +27,6 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "x11font.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(text);
 
 /***********************************************************************
  *           IsLegalDBCSChar for cp932/936/949/950/euc

dlls/winspool.drv/wspool.c

@@ -28,9 +28,7 @@
 #include "wingdi.h"
 #include "winspool.h"
 #include "wspool.h"
-#include "wine/debug.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winspool);
 HINSTANCE WINSPOOL_hInstance = NULL;
 
 /******************************************************************************

dlls/wsock32/protocol.c

@@ -38,9 +38,6 @@
 #include "winsock2.h"
 
 #include "wine/unicode.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
 /*****************************************************************************
  *          inet_network       [WSOCK32.1100]