diff --git a/windows/caret.c b/windows/caret.c
index b0f04d3..d66a03b 100644
--- a/windows/caret.c
+++ b/windows/caret.c
@@ -10,6 +10,8 @@
 #include "module.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(caret)
+
 typedef struct
 {
     HWND     hwnd;
diff --git a/windows/class.c b/windows/class.c
index 31689e3..6f7f645 100644
--- a/windows/class.c
+++ b/windows/class.c
@@ -26,6 +26,8 @@
 #include "winerror.h"
 #include "wine/winuser16.h"
 
+DEFAULT_DEBUG_CHANNEL(class)
+
 
 static CLASS *firstClass = NULL;
 
diff --git a/windows/clipboard.c b/windows/clipboard.c
index 031fc08..b64e169 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -21,6 +21,8 @@
 #include "xmalloc.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(clipboard)
+
 #define  CF_REGFORMATBASE 	0xC000
 
 /**************************************************************************
diff --git a/windows/dce.c b/windows/dce.c
index da386ea..a136310 100644
--- a/windows/dce.c
+++ b/windows/dce.c
@@ -30,6 +30,8 @@
 #include "debug.h"
 #include "wine/winuser16.h"
 
+DEFAULT_DEBUG_CHANNEL(dc)
+
 #define NB_DCE    5  /* Number of DCEs created at startup */
 
 static DCE *firstDCE = 0;
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 8c641a0..f39a649 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -19,6 +19,8 @@
 #include "tweak.h"
 #include "wine/winuser16.h"
 
+DEFAULT_DEBUG_CHANNEL(win)
+
   /* Last COLOR id */
 #define COLOR_MAX   COLOR_BTNHIGHLIGHT
 
diff --git a/windows/dialog.c b/windows/dialog.c
index 411147f..46b6b06 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -23,6 +23,8 @@
 #include "sysmetrics.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(dialog)
+
 
   /* Dialog control information */
 typedef struct
diff --git a/windows/dinput.c b/windows/dinput.c
index 800e489..09ddadf 100644
--- a/windows/dinput.c
+++ b/windows/dinput.c
@@ -34,6 +34,8 @@
 #include "mouse.h"
 #include "sysmetrics.h"
 
+DEFAULT_DEBUG_CHANNEL(dinput)
+
 extern BYTE InputKeyStateTable[256];
 extern int min_keycode, max_keycode;
 extern WORD keyc2vkey[256];
diff --git a/windows/display.c b/windows/display.c
index 9f1b7cf..16e3735 100644
--- a/windows/display.c
+++ b/windows/display.c
@@ -11,6 +11,8 @@
 #include "windef.h"
 #include "wine/winuser16.h"
 
+DEFAULT_DEBUG_CHANNEL(cursor)
+
 /***********************************************************************
  *           DISPLAY_Inquire			(DISPLAY.101)
  */
diff --git a/windows/driver.c b/windows/driver.c
index f18fe0d..0350270 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -18,6 +18,8 @@
 #include "debug.h"
 #include "mmsystem.h"
 
+DEFAULT_DEBUG_CHANNEL(driver)
+
 static LPWINE_DRIVER	lpDrvItemList = NULL;
 
 /* TODO list :
diff --git a/windows/focus.c b/windows/focus.c
index de081ef..50f792d 100644
--- a/windows/focus.c
+++ b/windows/focus.c
@@ -14,6 +14,8 @@
 #include "task.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(win)
+
 
 /*****************************************************************
  *	         FOCUS_SwitchFocus 
diff --git a/windows/hook.c b/windows/hook.c
index 3fa7db8..e599677 100644
--- a/windows/hook.c
+++ b/windows/hook.c
@@ -26,6 +26,8 @@
 #include "winproc.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(hook)
+
 #pragma pack(1)
 
   /* Hook data (pointed to by a HHOOK) */
diff --git a/windows/input.c b/windows/input.c
index 17233d7..6642c21 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -31,6 +31,12 @@
 #include "winerror.h"
 #include "task.h"
 
+DECLARE_DEBUG_CHANNEL(accel)
+DECLARE_DEBUG_CHANNEL(event)
+DECLARE_DEBUG_CHANNEL(key)
+DECLARE_DEBUG_CHANNEL(keyboard)
+DECLARE_DEBUG_CHANNEL(win)
+
 static BOOL InputEnabled = TRUE;
 static BOOL SwappedButtons = FALSE;
 
diff --git a/windows/keyboard.c b/windows/keyboard.c
index e941485..7080f13 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -24,6 +24,9 @@
 #include "struct32.h"
 #include "winerror.h"
 
+DECLARE_DEBUG_CHANNEL(event)
+DECLARE_DEBUG_CHANNEL(keyboard)
+
 /**********************************************************************/
 
 KEYBOARD_DRIVER *KEYBOARD_Driver = NULL;
diff --git a/windows/mdi.c b/windows/mdi.c
index e057074..17e8e23 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -28,6 +28,8 @@
 #include "tweak.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(mdi)
+
 #define MDIF_NEEDUPDATE		0x0001
 
 static HBITMAP16 hBmpClose   = 0;
diff --git a/windows/message.c b/windows/message.c
index f188849..96072a1 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -30,6 +30,10 @@
 #include "struct32.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(key)
+DECLARE_DEBUG_CHANNEL(msg)
+DECLARE_DEBUG_CHANNEL(sendmsg)
+
 #define WM_NCMOUSEFIRST         WM_NCMOUSEMOVE
 #define WM_NCMOUSELAST          WM_NCMBUTTONDBLCLK
 
diff --git a/windows/mouse.c b/windows/mouse.c
index 115fd0c..04b7d28 100644
--- a/windows/mouse.c
+++ b/windows/mouse.c
@@ -11,6 +11,8 @@
 #include "winuser.h"
 #include "win.h"
 
+DEFAULT_DEBUG_CHANNEL(event)
+
 /**********************************************************************/
 
 MOUSE_DRIVER *MOUSE_Driver = NULL;
diff --git a/windows/msgbox.c b/windows/msgbox.c
index d71a48d..47b2670 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -16,6 +16,8 @@
 #include "debugstr.h"
 #include "tweak.h"
 
+DEFAULT_DEBUG_CHANNEL(dialog)
+
 /**************************************************************************
  *           MSGBOX_DlgProc
  *
diff --git a/windows/nonclient.c b/windows/nonclient.c
index ebc1b2f..fa8a0d7 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -27,6 +27,9 @@
 #include "shellapi.h"
 #include "cache.h"
 
+DECLARE_DEBUG_CHANNEL(nonclient)
+DECLARE_DEBUG_CHANNEL(shell)
+
 static HBITMAP16 hbitmapClose = 0;
 static HBITMAP16 hbitmapCloseD = 0;
 static HBITMAP16 hbitmapMinimize = 0;
diff --git a/windows/painting.c b/windows/painting.c
index 5cc8d3f..e4b389b 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -14,6 +14,9 @@
 #include "debug.h"
 #include "wine/winuser16.h"
 
+DECLARE_DEBUG_CHANNEL(nonclient)
+DECLARE_DEBUG_CHANNEL(win)
+
 /* client rect in window coordinates */
 
 #define GETCLIENTRECTW( wnd, r )	(r).left = (wnd)->rectClient.left - (wnd)->rectWindow.left; \
diff --git a/windows/property.c b/windows/property.c
index b93dd6f..0772b81 100644
--- a/windows/property.c
+++ b/windows/property.c
@@ -9,6 +9,8 @@
 #include "heap.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(prop)
+
 
 typedef struct tagPROPERTY
 {
diff --git a/windows/queue.c b/windows/queue.c
index 4d8a160..8e2bd49 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -21,6 +21,9 @@
 #include "debug.h"
 #include "spy.h"
 
+DECLARE_DEBUG_CHANNEL(msg)
+DECLARE_DEBUG_CHANNEL(sendmsg)
+
 #define MAX_QUEUE_SIZE   120  /* Max. size of a message queue */
 
 static HQUEUE16 hFirstQueue = 0;
diff --git a/windows/scroll.c b/windows/scroll.c
index 97523b0..2418384 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -19,6 +19,8 @@
 #include "sysmetrics.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(scroll)
+
 /*************************************************************************
  *             ScrollWindow16   (USER.61)
  */
diff --git a/windows/syscolor.c b/windows/syscolor.c
index 71254fd..f06db7e 100644
--- a/windows/syscolor.c
+++ b/windows/syscolor.c
@@ -16,6 +16,8 @@
 #include "winreg.h"
 #include "winversion.h"
 
+DEFAULT_DEBUG_CHANNEL(syscolor)
+
 static const char * const DefSysColors[] =
 {
     "Scrollbar", "224 224 224",      /* COLOR_SCROLLBAR           */
diff --git a/windows/timer.c b/windows/timer.c
index 2124c47..88bce99 100644
--- a/windows/timer.c
+++ b/windows/timer.c
@@ -10,6 +10,8 @@
 #include "winproc.h"
 #include "debug.h"
 
+DEFAULT_DEBUG_CHANNEL(timer)
+
 
 typedef struct tagTIMER
 {
diff --git a/windows/user.c b/windows/user.c
index 22dc18f..96781f1 100644
--- a/windows/user.c
+++ b/windows/user.c
@@ -30,6 +30,12 @@
 #include "process.h"
 #include "debug.h"
 
+DECLARE_DEBUG_CHANNEL(hook)
+DECLARE_DEBUG_CHANNEL(local)
+DECLARE_DEBUG_CHANNEL(system)
+DECLARE_DEBUG_CHANNEL(win)
+DECLARE_DEBUG_CHANNEL(win32)
+
 /***********************************************************************
  *           GetFreeSystemResources   (USER.284)
  */
diff --git a/windows/win.c b/windows/win.c
index 5dc7bea..7989457 100644
--- a/windows/win.c
+++ b/windows/win.c
@@ -34,6 +34,9 @@
 #include "local.h"
 #include "desktop.h"
 
+DECLARE_DEBUG_CHANNEL(msg)
+DECLARE_DEBUG_CHANNEL(win)
+
 /**********************************************************************/
 
 WND_DRIVER *WND_Driver = NULL;
diff --git a/windows/winhelp.c b/windows/winhelp.c
index 991ac5f..62d6ea6 100644
--- a/windows/winhelp.c
+++ b/windows/winhelp.c
@@ -12,6 +12,8 @@
 #include "heap.h"
 #include "ldt.h"
 
+DEFAULT_DEBUG_CHANNEL(win)
+
 
 /**********************************************************************
  *             WinHelp16   (USER.171)
diff --git a/windows/winpos.c b/windows/winpos.c
index b64e626..88f8dd4 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -24,6 +24,8 @@
 #include "local.h"
 #include "ldt.h"
 
+DEFAULT_DEBUG_CHANNEL(win)
+
 #define HAS_DLGFRAME(style,exStyle) \
     (((exStyle) & WS_EX_DLGMODALFRAME) || \
      (((style) & WS_DLGFRAME) && !((style) & WS_BORDER)))
diff --git a/windows/winproc.c b/windows/winproc.c
index 601ecf2..94bf14a 100644
--- a/windows/winproc.c
+++ b/windows/winproc.c
@@ -19,6 +19,10 @@
 #include "task.h"
 #include "thread.h"
 
+DECLARE_DEBUG_CHANNEL(msg)
+DECLARE_DEBUG_CHANNEL(relay)
+DECLARE_DEBUG_CHANNEL(win)
+
 /* Window procedure 16-to-32-bit thunk,
  * see BuildSpec16Files() in tools/build.c */
 
diff --git a/windows/x11drv/clipboard.c b/windows/x11drv/clipboard.c
index 92da752..cb07e66 100644
--- a/windows/x11drv/clipboard.c
+++ b/windows/x11drv/clipboard.c
@@ -20,6 +20,8 @@
 #include "windef.h"
 #include "x11drv.h"
 
+DEFAULT_DEBUG_CHANNEL(clipboard)
+
 extern HWND hWndClipOwner;
 extern HWND hWndClipWindow;
 extern WINE_CLIPFORMAT ClipFormats[];
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 1577b8b..f4351c2 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -35,6 +35,9 @@
 #include "winsock.h"
 #include "windef.h"
 #include "x11drv.h"
+
+DECLARE_DEBUG_CHANNEL(event)
+DECLARE_DEBUG_CHANNEL(win)
   
 /* X context to associate a hwnd to an X window */
 extern XContext winContext;
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index 3f304c6..16f2087 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -28,6 +28,9 @@
 #include "x11drv.h"
 #include "winnls.h"
 
+DECLARE_DEBUG_CHANNEL(key)
+DECLARE_DEBUG_CHANNEL(keyboard)
+
 extern LPBYTE pKeyStateTable;
 
 int min_keycode, max_keycode, keysyms_per_keycode;
diff --git a/windows/x11drv/mouse.c b/windows/x11drv/mouse.c
index 44192b8..3fcfa0e 100644
--- a/windows/x11drv/mouse.c
+++ b/windows/x11drv/mouse.c
@@ -17,6 +17,8 @@
 #include "windef.h"
 #include "x11drv.h"
 
+DEFAULT_DEBUG_CHANNEL(cursor)
+
 /**********************************************************************/
 
 Cursor X11DRV_MOUSE_XCursor = None;    /* Current X cursor */
diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index 1993d5e..7432f97 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -30,6 +30,8 @@
 #include "x11drv.h"
 #include "wine/winuser16.h"
 
+DEFAULT_DEBUG_CHANNEL(win)
+
 /**********************************************************************/
 
 extern Cursor X11DRV_MOUSE_XCursor;  /* Current X cursor */