[UXTHEME]

* Set the default debugging channel globally through the main header.
* Remove one time inclusions from the main header and put them back where they belong.
CORE-7716

svn path=/trunk/; revision=61456

reactos/dll/win32/uxtheme/buffer.c

@@ -19,9 +19,6 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 /***********************************************************************
  *      BufferedPaintInit                                  (UXTHEME.@)

reactos/dll/win32/uxtheme/draw.c

@@ -19,9 +19,8 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+#include <stdlib.h>
 
 /***********************************************************************
  * Defines and global variables

reactos/dll/win32/uxtheme/main.c

@@ -19,9 +19,6 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 /***********************************************************************/
 

reactos/dll/win32/uxtheme/metric.c

@@ -19,9 +19,6 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 /***********************************************************************
  *      GetThemeSysBool                                     (UXTHEME.@)

reactos/dll/win32/uxtheme/msstyles.c

@@ -19,10 +19,8 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+#include <wine/unicode.h>
 
 /***********************************************************************
  * Defines and global variables

reactos/dll/win32/uxtheme/ncscrollbar.c

@@ -10,9 +10,8 @@
  */
  
 #include "uxthemep.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+#include <assert.h>
 
 static BOOL SCROLL_trackVertical;
 static enum SCROLL_HITTEST SCROLL_trackHitTest;

reactos/dll/win32/uxtheme/nonclient.c

@@ -7,9 +7,6 @@
  */
  
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 HFONT hMenuFont = NULL;
 HFONT hMenuFontBold = NULL;

reactos/dll/win32/uxtheme/property.c

@@ -19,9 +19,6 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 /***********************************************************************
  *      GetThemeBool                                        (UXTHEME.@)

reactos/dll/win32/uxtheme/stylemap.c

@@ -19,7 +19,6 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
 
 typedef struct _MSSTYLES_PROPERTY_MAP {
     WORD dwPrimitiveType;

reactos/dll/win32/uxtheme/system.c

@@ -19,9 +19,9 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+#include <winreg.h>
+#include <uxundoc.h>
 
 /***********************************************************************
  * Defines and global variables

reactos/dll/win32/uxtheme/themehooks.c

@@ -7,9 +7,6 @@
  */
  
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
 
 USERAPIHOOK user32ApiHook;
 BYTE gabDWPmessages[UAHOWP_MAX_SIZE];

reactos/dll/win32/uxtheme/uxini.c

@@ -19,10 +19,7 @@
  */
 
 #include "uxthemep.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
-
+#include <winnls.h>
 /***********************************************************************
  * Defines and global variables
  */

reactos/dll/win32/uxtheme/uxthemep.h

@@ -1,21 +1,19 @@
 #include <stdio.h>
-#include <assert.h>
-#include <stdlib.h>
 
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winreg.h>
-#include <winnls.h>
 #include <winuser.h>
 #include <windowsx.h>
 #include <undocuser.h>
 #include <uxtheme.h>
-#include <uxundoc.h>
 #include <vfwmsgs.h>
 #include <tmschema.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(uxtheme);
+
 #define TMT_ENUM 200
 
 #define MAX_THEME_APP_NAME 60