[ros-diffs] [reactos] 01/01: [USER32] Add wine/debug.h to the PCH and remove an unneeded wine/unicode.h inclusion.

[Amine Khaldi]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d93998d6ec0fa6ca13bf…

commit 3d93998d6ec0fa6ca13bfafa32afd30147354ce9
Author: Amine Khaldi <amine.khaldi(a)reactos.org>
AuthorDate: Sat Dec 23 23:42:40 2017 +0100

    [USER32] Add wine/debug.h to the PCH and remove an unneeded wine/unicode.h inclusion.
---
 win32ss/user/user32/controls/appswitch.c |  2 --
 win32ss/user/user32/controls/button.c    |  2 +-
 win32ss/user/user32/controls/combo.c     |  1 -
 win32ss/user/user32/controls/edit.c      |  2 --
 win32ss/user/user32/controls/listbox.c   |  2 --
 win32ss/user/user32/controls/scrollbar.c |  5 -----
 win32ss/user/user32/controls/static.c    |  2 --
 win32ss/user/user32/include/user32.h     |  1 +
 win32ss/user/user32/misc/dde.c           |  2 --
 win32ss/user/user32/misc/ddeclient.c     |  2 --
 win32ss/user/user32/misc/ddemisc.c       |  3 +--
 win32ss/user/user32/misc/ddeserver.c     |  2 --
 win32ss/user/user32/misc/desktop.c       |  1 -
 win32ss/user/user32/misc/display.c       |  5 -----
 win32ss/user/user32/misc/dllmain.c       |  1 -
 win32ss/user/user32/misc/exticon.c       |  2 --
 win32ss/user/user32/misc/imm.c           |  2 --
 win32ss/user/user32/misc/logon.c         |  6 ------
 win32ss/user/user32/misc/object.c        |  5 -----
 win32ss/user/user32/misc/resources.c     |  1 -
 win32ss/user/user32/misc/stubs.c         |  2 --
 win32ss/user/user32/misc/timer.c         |  6 ------
 win32ss/user/user32/misc/usrapihk.c      |  3 +--
 win32ss/user/user32/misc/winhelp.c       |  4 ----
 win32ss/user/user32/misc/winsta.c        |  2 --
 win32ss/user/user32/windows/accel.c      |  4 ----
 win32ss/user/user32/windows/class.c      |  1 -
 win32ss/user/user32/windows/clipboard.c  |  5 -----
 win32ss/user/user32/windows/cursoricon.c |  2 --
 win32ss/user/user32/windows/dc.c         |  7 -------
 win32ss/user/user32/windows/defwnd.c     |  1 -
 win32ss/user/user32/windows/dialog.c     |  3 ---
 win32ss/user/user32/windows/draw.c       |  4 ----
 win32ss/user/user32/windows/hook.c       |  4 ----
 win32ss/user/user32/windows/input.c      | 10 ----------
 win32ss/user/user32/windows/mdi.c        |  2 --
 win32ss/user/user32/windows/menu.c       |  3 ---
 win32ss/user/user32/windows/message.c    |  2 --
 win32ss/user/user32/windows/messagebox.c |  4 ----
 win32ss/user/user32/windows/nonclient.c  |  3 ---
 win32ss/user/user32/windows/rect.c       |  6 ------
 win32ss/user/user32/windows/spy.c        |  3 +--
 win32ss/user/user32/windows/text.c       |  6 ------
 win32ss/user/user32/windows/window.c     |  2 --
 win32ss/user/user32/windows/winpos.c     |  3 ---
 45 files changed, 5 insertions(+), 136 deletions(-)

diff --git a/win32ss/user/user32/controls/appswitch.c
b/win32ss/user/user32/controls/appswitch.c
index cd13841107..c776008ad0 100644
--- a/win32ss/user/user32/controls/appswitch.c
+++ b/win32ss/user/user32/controls/appswitch.c
@@ -15,10 +15,8 @@
 //
 //
 
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 #define DIALOG_MARGIN   8       // margin of dialog contents
diff --git a/win32ss/user/user32/controls/button.c
b/win32ss/user/user32/controls/button.c
index 1dc8af3b59..c6f01c8f2c 100644
--- a/win32ss/user/user32/controls/button.c
+++ b/win32ss/user/user32/controls/button.c
@@ -62,9 +62,9 @@
  *  - Button_SetImageList
  *  - Button_SetTextMargin
  */
+
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(button);
 
 /* GetWindowLong offsets for window extra information */
diff --git a/win32ss/user/user32/controls/combo.c b/win32ss/user/user32/controls/combo.c
index 8ec5bd9994..eb9d6fd86d 100644
--- a/win32ss/user/user32/controls/combo.c
+++ b/win32ss/user/user32/controls/combo.c
@@ -34,7 +34,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(combo);
 
 /*
diff --git a/win32ss/user/user32/controls/edit.c b/win32ss/user/user32/controls/edit.c
index 2eadddb00a..f1db16f8e0 100644
--- a/win32ss/user/user32/controls/edit.c
+++ b/win32ss/user/user32/controls/edit.c
@@ -46,8 +46,6 @@
 #define WIN32_LEAN_AND_MEAN
 #include <usp10.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(edit);
 WINE_DECLARE_DEBUG_CHANNEL(combo);
 WINE_DECLARE_DEBUG_CHANNEL(relay);
diff --git a/win32ss/user/user32/controls/listbox.c
b/win32ss/user/user32/controls/listbox.c
index f440a6d4aa..d149688d71 100644
--- a/win32ss/user/user32/controls/listbox.c
+++ b/win32ss/user/user32/controls/listbox.c
@@ -32,8 +32,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(listbox);
 
 /* Items array granularity */
diff --git a/win32ss/user/user32/controls/scrollbar.c
b/win32ss/user/user32/controls/scrollbar.c
index 496985a03a..dac106bb70 100644
--- a/win32ss/user/user32/controls/scrollbar.c
+++ b/win32ss/user/user32/controls/scrollbar.c
@@ -26,15 +26,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* INCLUDES *******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(scrollbar);
 
-/* GLOBAL VARIABLES ***********************************************************/
-
 /* Definitions for scrollbar hit testing [See SCROLLBARINFO in MSDN] */
 #define SCROLL_NOWHERE		0x00    /* Outside the scroll bar */
 #define SCROLL_TOP_ARROW	0x01    /* Top or left arrow */
diff --git a/win32ss/user/user32/controls/static.c
b/win32ss/user/user32/controls/static.c
index b5bca091a5..76d22d9ba1 100644
--- a/win32ss/user/user32/controls/static.c
+++ b/win32ss/user/user32/controls/static.c
@@ -44,8 +44,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(static);
 
 static void STATIC_PaintOwnerDrawfn( HWND hwnd, HDC hdc, DWORD style );
diff --git a/win32ss/user/user32/include/user32.h b/win32ss/user/user32/include/user32.h
index 46923824b5..4993f4694a 100644
--- a/win32ss/user/user32/include/user32.h
+++ b/win32ss/user/user32/include/user32.h
@@ -54,6 +54,7 @@
 
 /* WINE Headers */
 #include <wine/unicode.h>
+#include <wine/debug.h>
 
 /* Internal User32 Headers */
 #include "user32p.h"
diff --git a/win32ss/user/user32/misc/dde.c b/win32ss/user/user32/misc/dde.c
index 2d959a0974..5500c498a2 100644
--- a/win32ss/user/user32/misc/dde.c
+++ b/win32ss/user/user32/misc/dde.c
@@ -7,11 +7,9 @@
  */
 
 #include <user32.h>
-#include <wine/debug.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
-
 BOOL FASTCALL DdeAddPair(HGLOBAL ClientMem, HGLOBAL ServerMem);
 HGLOBAL FASTCALL DdeGetPair(HGLOBAL ServerMem);
 
diff --git a/win32ss/user/user32/misc/ddeclient.c b/win32ss/user/user32/misc/ddeclient.c
index 6f5a5e9c0c..f0959f48d2 100644
--- a/win32ss/user/user32/misc/ddeclient.c
+++ b/win32ss/user/user32/misc/ddeclient.c
@@ -25,8 +25,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 static LRESULT CALLBACK WDML_ClientProc(HWND, UINT, WPARAM, LPARAM);	/* only for one
client, not conv list */
diff --git a/win32ss/user/user32/misc/ddemisc.c b/win32ss/user/user32/misc/ddemisc.c
index 498bdb2885..d94617be1f 100644
--- a/win32ss/user/user32/misc/ddemisc.c
+++ b/win32ss/user/user32/misc/ddemisc.c
@@ -24,9 +24,8 @@
  */
 
 #include <user32.h>
+
 #include "dde_private.h"
-#include "wine/unicode.h"
-#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
diff --git a/win32ss/user/user32/misc/ddeserver.c b/win32ss/user/user32/misc/ddeserver.c
index b6bde97a13..289f87dfbd 100644
--- a/win32ss/user/user32/misc/ddeserver.c
+++ b/win32ss/user/user32/misc/ddeserver.c
@@ -25,8 +25,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(ddeml);
 
 static const WCHAR szServerNameClass[] = L"DDEMLMom";
diff --git a/win32ss/user/user32/misc/desktop.c b/win32ss/user/user32/misc/desktop.c
index 49f23c248c..2f78f7b189 100644
--- a/win32ss/user/user32/misc/desktop.c
+++ b/win32ss/user/user32/misc/desktop.c
@@ -10,7 +10,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /*********************************************************************
diff --git a/win32ss/user/user32/misc/display.c b/win32ss/user/user32/misc/display.c
index 7548c8cc59..b3047feeee 100644
--- a/win32ss/user/user32/misc/display.c
+++ b/win32ss/user/user32/misc/display.c
@@ -5,11 +5,8 @@
  * PROGRAMMER:      Casper S. Hornstrup (chorns(a)users.sourceforge.net)
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 #define SIZEOF_DEVMODEA_300 124
@@ -19,8 +16,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32);
 #define SIZEOF_DEVMODEW_400 212
 #define SIZEOF_DEVMODEW_500 220
 
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/misc/dllmain.c b/win32ss/user/user32/misc/dllmain.c
index 0316de135d..5bf68551f7 100644
--- a/win32ss/user/user32/misc/dllmain.c
+++ b/win32ss/user/user32/misc/dllmain.c
@@ -2,7 +2,6 @@
 
 #include <ndk/cmfuncs.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 #define KEY_LENGTH 1024
diff --git a/win32ss/user/user32/misc/exticon.c b/win32ss/user/user32/misc/exticon.c
index 5ae3ea765d..8b65d83430 100644
--- a/win32ss/user/user32/misc/exticon.c
+++ b/win32ss/user/user32/misc/exticon.c
@@ -24,8 +24,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 /* Start of Hack section */
 
 WINE_DEFAULT_DEBUG_CHANNEL(icon);
diff --git a/win32ss/user/user32/misc/imm.c b/win32ss/user/user32/misc/imm.c
index 9c26bcf199..b06bb5da1d 100644
--- a/win32ss/user/user32/misc/imm.c
+++ b/win32ss/user/user32/misc/imm.c
@@ -11,8 +11,6 @@
 #include <user32.h>
 
 #include <winnls32.h>
-
-#include <wine/debug.h>
 #include <strsafe.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
diff --git a/win32ss/user/user32/misc/logon.c b/win32ss/user/user32/misc/logon.c
index 3df5a953f0..bc735aa7ab 100644
--- a/win32ss/user/user32/misc/logon.c
+++ b/win32ss/user/user32/misc/logon.c
@@ -6,16 +6,10 @@
  * PROGRAMMER:      Thomas Weidenmueller (w3seek(a)users.sourceforge.net)
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/misc/object.c b/win32ss/user/user32/misc/object.c
index e14eb0402d..812d0d61ee 100644
--- a/win32ss/user/user32/misc/object.c
+++ b/win32ss/user/user32/misc/object.c
@@ -25,15 +25,10 @@
  *      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/misc/resources.c b/win32ss/user/user32/misc/resources.c
index 9148f2f9b2..3145e718d5 100644
--- a/win32ss/user/user32/misc/resources.c
+++ b/win32ss/user/user32/misc/resources.c
@@ -1,6 +1,5 @@
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 #ifndef _CFGMGR32_H_
diff --git a/win32ss/user/user32/misc/stubs.c b/win32ss/user/user32/misc/stubs.c
index aa7e75e760..b73397d44b 100644
--- a/win32ss/user/user32/misc/stubs.c
+++ b/win32ss/user/user32/misc/stubs.c
@@ -11,8 +11,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /*
diff --git a/win32ss/user/user32/misc/timer.c b/win32ss/user/user32/misc/timer.c
index ce653a42b2..3988822fe5 100644
--- a/win32ss/user/user32/misc/timer.c
+++ b/win32ss/user/user32/misc/timer.c
@@ -25,14 +25,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-/* FUNCTIONS *****************************************************************/
-
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c
index 30cefd81f7..7e856d4324 100644
--- a/win32ss/user/user32/misc/usrapihk.c
+++ b/win32ss/user/user32/misc/usrapihk.c
@@ -11,9 +11,8 @@
  *   http://www.reactos.org/wiki/RegisterUserApiHook
  *
  */
-#include <user32.h>
 
-#include <wine/debug.h>
+#include <user32.h>
 
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
diff --git a/win32ss/user/user32/misc/winhelp.c b/win32ss/user/user32/misc/winhelp.c
index 8bb6be9d7e..1e25c11d93 100644
--- a/win32ss/user/user32/misc/winhelp.c
+++ b/win32ss/user/user32/misc/winhelp.c
@@ -25,12 +25,8 @@
  *      23-08-2002  RDD  Created from wine sources
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 /* WinHelp internal structure */
 typedef struct
 {
diff --git a/win32ss/user/user32/misc/winsta.c b/win32ss/user/user32/misc/winsta.c
index a5ecc5cd62..b3b888747f 100644
--- a/win32ss/user/user32/misc/winsta.c
+++ b/win32ss/user/user32/misc/winsta.c
@@ -10,10 +10,8 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(winsta);
 
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/accel.c b/win32ss/user/user32/windows/accel.c
index d25b01fd83..08995b4c3c 100644
--- a/win32ss/user/user32/windows/accel.c
+++ b/win32ss/user/user32/windows/accel.c
@@ -26,12 +26,8 @@
  *      08/07/2003  KJK  Fully implemented
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 /* this is the 8 byte accel struct used in Win32 resources (internal only) */
 typedef struct
 {
diff --git a/win32ss/user/user32/windows/class.c b/win32ss/user/user32/windows/class.c
index caa5931d57..c0ad6a65d3 100644
--- a/win32ss/user/user32/windows/class.c
+++ b/win32ss/user/user32/windows/class.c
@@ -10,7 +10,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 #define USE_VERSIONED_CLASSES
diff --git a/win32ss/user/user32/windows/clipboard.c
b/win32ss/user/user32/windows/clipboard.c
index 955b2c1280..66a4217301 100644
--- a/win32ss/user/user32/windows/clipboard.c
+++ b/win32ss/user/user32/windows/clipboard.c
@@ -9,17 +9,12 @@
  *
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
 #define NDEBUG
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/cursoricon.c
b/win32ss/user/user32/windows/cursoricon.c
index 97ce68bf39..ee286580bd 100644
--- a/win32ss/user/user32/windows/cursoricon.c
+++ b/win32ss/user/user32/windows/cursoricon.c
@@ -8,8 +8,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(cursor);
 WINE_DECLARE_DEBUG_CHANNEL(icon);
 //WINE_DECLARE_DEBUG_CHANNEL(resource);
diff --git a/win32ss/user/user32/windows/dc.c b/win32ss/user/user32/windows/dc.c
index 658c2df03f..6841c37564 100644
--- a/win32ss/user/user32/windows/dc.c
+++ b/win32ss/user/user32/windows/dc.c
@@ -25,15 +25,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
-
 BOOL
 WINAPI
 GdiReleaseDC(HDC hdc);
diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c
index 9239775029..7098c34446 100644
--- a/win32ss/user/user32/windows/defwnd.c
+++ b/win32ss/user/user32/windows/defwnd.c
@@ -11,7 +11,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /*
diff --git a/win32ss/user/user32/windows/dialog.c b/win32ss/user/user32/windows/dialog.c
index aa3940199c..7042f45324 100644
--- a/win32ss/user/user32/windows/dialog.c
+++ b/win32ss/user/user32/windows/dialog.c
@@ -28,11 +28,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* MACROS/DEFINITIONS ********************************************************/
diff --git a/win32ss/user/user32/windows/draw.c b/win32ss/user/user32/windows/draw.c
index 3cb9f10077..dd1d6dd752 100644
--- a/win32ss/user/user32/windows/draw.c
+++ b/win32ss/user/user32/windows/draw.c
@@ -28,12 +28,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-/* INCLUDES *******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* GLOBALS *******************************************************************/
diff --git a/win32ss/user/user32/windows/hook.c b/win32ss/user/user32/windows/hook.c
index 827638936b..e0cb8e4a04 100644
--- a/win32ss/user/user32/windows/hook.c
+++ b/win32ss/user/user32/windows/hook.c
@@ -26,12 +26,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 typedef struct _NOTIFYEVENT
diff --git a/win32ss/user/user32/windows/input.c b/win32ss/user/user32/windows/input.c
index 5372e0ce7d..aa398d7dcc 100644
--- a/win32ss/user/user32/windows/input.c
+++ b/win32ss/user/user32/windows/input.c
@@ -25,22 +25,12 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
 #include <strsafe.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
-/* GLOBALS *******************************************************************/
-
-
-
-/* FUNCTIONS *****************************************************************/
-
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/mdi.c b/win32ss/user/user32/windows/mdi.c
index b1039081aa..9f25daf86e 100644
--- a/win32ss/user/user32/windows/mdi.c
+++ b/win32ss/user/user32/windows/mdi.c
@@ -82,8 +82,6 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(mdi);
 
 #define MDI_MAXTITLELENGTH      0xa1
diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c
index d95c30008a..231c2f78ae 100644
--- a/win32ss/user/user32/windows/menu.c
+++ b/win32ss/user/user32/windows/menu.c
@@ -8,10 +8,7 @@
  *                  James Tabor
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
-#include <wine/debug.h>
 
 BOOL WINAPI GdiValidateHandle(HGDIOBJ hobj);
 
diff --git a/win32ss/user/user32/windows/message.c
b/win32ss/user/user32/windows/message.c
index f9ef59fc83..44345e7c54 100644
--- a/win32ss/user/user32/windows/message.c
+++ b/win32ss/user/user32/windows/message.c
@@ -10,10 +10,8 @@
 
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
-
 #ifdef __i386__
 /* For bad applications which provide bad (non stdcall) WndProc */
 extern
diff --git a/win32ss/user/user32/windows/messagebox.c
b/win32ss/user/user32/windows/messagebox.c
index 7d136c2967..2ceb24fe15 100644
--- a/win32ss/user/user32/windows/messagebox.c
+++ b/win32ss/user/user32/windows/messagebox.c
@@ -29,12 +29,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 /* DEFINES *******************************************************************/
diff --git a/win32ss/user/user32/windows/nonclient.c
b/win32ss/user/user32/windows/nonclient.c
index 80d1128b6a..ba2440aacc 100644
--- a/win32ss/user/user32/windows/nonclient.c
+++ b/win32ss/user/user32/windows/nonclient.c
@@ -19,11 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/* INCLUDES *******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 #define HASSIZEGRIP(Style, ExStyle, ParentStyle, WindowRect, ParentClientRect) \
diff --git a/win32ss/user/user32/windows/rect.c b/win32ss/user/user32/windows/rect.c
index 51226e42ca..8b7826d713 100644
--- a/win32ss/user/user32/windows/rect.c
+++ b/win32ss/user/user32/windows/rect.c
@@ -25,14 +25,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
 /*
  * @implemented
  */
diff --git a/win32ss/user/user32/windows/spy.c b/win32ss/user/user32/windows/spy.c
index cbefeceb33..e17a521222 100644
--- a/win32ss/user/user32/windows/spy.c
+++ b/win32ss/user/user32/windows/spy.c
@@ -20,13 +20,12 @@
  */
 
 #include <user32.h>
+
 #include <wine/commctrl.h>
 #include <commdlg.h>
 #include <richedit.h>
 #include <prsht.h>
 
-#include <wine/debug.h>
-
 WINE_DEFAULT_DEBUG_CHANNEL(message);
 
 #define SPY_MAX_MSGNUM   WM_USER
diff --git a/win32ss/user/user32/windows/text.c b/win32ss/user/user32/windows/text.c
index ab9f575a6f..a27d68d7ea 100644
--- a/win32ss/user/user32/windows/text.c
+++ b/win32ss/user/user32/windows/text.c
@@ -25,14 +25,8 @@
  *      09-05-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
-
-/* FUNCTIONS *****************************************************************/
-
 static WORD
 GetC1Type(WCHAR Ch)
 {
diff --git a/win32ss/user/user32/windows/window.c b/win32ss/user/user32/windows/window.c
index 75dc96e616..fd006481d1 100644
--- a/win32ss/user/user32/windows/window.c
+++ b/win32ss/user/user32/windows/window.c
@@ -8,11 +8,9 @@
  *      06-06-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
 #define DEBUG
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT
*id );
diff --git a/win32ss/user/user32/windows/winpos.c b/win32ss/user/user32/windows/winpos.c
index 5cf21b6455..156b46a28e 100644
--- a/win32ss/user/user32/windows/winpos.c
+++ b/win32ss/user/user32/windows/winpos.c
@@ -8,11 +8,8 @@
  *      06-06-2001  CSH  Created
  */
 
-/* INCLUDES ******************************************************************/
-
 #include <user32.h>
 
-#include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(user32);
 
 void mirror_rect( const RECT *window_rect, RECT *rect )