diff --git a/win32ss/user/user32/controls/icontitle.c b/win32ss/user/user32/controls/icontitle.c
index 4948b8268ca..5cba7552386 100644
--- a/win32ss/user/user32/controls/icontitle.c
+++ b/win32ss/user/user32/controls/icontitle.c
@@ -20,9 +20,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
 static BOOL bMultiLineTitle;
 static HFONT hIconTitleFont;
 
diff --git a/win32ss/user/user32/controls/regcontrol.c b/win32ss/user/user32/controls/regcontrol.c
index b6888bf8e66..ff9c9c96096 100644
--- a/win32ss/user/user32/controls/regcontrol.c
+++ b/win32ss/user/user32/controls/regcontrol.c
@@ -10,9 +10,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
 DWORD RegisterDefaultClasses = FALSE;
 
 static PFNCLIENT pfnClientA;
diff --git a/win32ss/user/user32/misc/exit.c b/win32ss/user/user32/misc/exit.c
index e2230392e9c..5ede4e6213f 100644
--- a/win32ss/user/user32/misc/exit.c
+++ b/win32ss/user/user32/misc/exit.c
@@ -8,10 +8,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
 /*
  * Sequence of events:
  *
diff --git a/win32ss/user/user32/misc/misc.c b/win32ss/user/user32/misc/misc.c
index 994ff5aaae6..5c8e961c305 100644
--- a/win32ss/user/user32/misc/misc.c
+++ b/win32ss/user/user32/misc/misc.c
@@ -6,16 +6,8 @@
  * PROGRAMMER:      Thomas Weidenmueller (w3seek@users.sourceforge.net)
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
-/* FUNCTIONS *****************************************************************/
-
 VOID
 WINAPI
 UserSetLastError(IN DWORD dwErrCode)
diff --git a/win32ss/user/user32/windows/caret.c b/win32ss/user/user32/windows/caret.c
index 923acaf999e..4e89a817c80 100644
--- a/win32ss/user/user32/windows/caret.c
+++ b/win32ss/user/user32/windows/caret.c
@@ -25,16 +25,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
-/* FUNCTIONS *****************************************************************/
-
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c
index 383c293a26e..563005a42c2 100644
--- a/win32ss/user/user32/windows/defwnd.c
+++ b/win32ss/user/user32/windows/defwnd.c
@@ -9,17 +9,8 @@
  *      06-06-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(user32);
-
-/* GLOBALS *******************************************************************/
-
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/font.c b/win32ss/user/user32/windows/font.c
index 56d0ec06561..6031ae970da 100644
--- a/win32ss/user/user32/windows/font.c
+++ b/win32ss/user/user32/windows/font.c
@@ -29,10 +29,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(text);
-
 DWORD WINAPI GdiGetCodePage(HDC hdc);
 
 INT WINAPI DrawTextExWorker( HDC hdc, LPWSTR str, INT i_count,