[HLINK]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61367

reactos/dll/win32/hlink/browse_ctx.c

@@ -20,11 +20,8 @@
 
 #include "hlink_private.h"
 
-#include <wine/debug.h>
 #include <wine/list.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
-
 struct link_entry
 {
     struct list entry;

reactos/dll/win32/hlink/extserv.c

@@ -18,11 +18,6 @@
 
 #include "hlink_private.h"
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
-
 typedef struct {
     IUnknown           IUnknown_inner;
     IAuthenticate      IAuthenticate_iface;

reactos/dll/win32/hlink/hlink_main.c

@@ -22,11 +22,6 @@
 
 #include <winreg.h>
 #include <rpcproxy.h>
-#include <hlguids.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 static HINSTANCE instance;
 

reactos/dll/win32/hlink/hlink_private.h

@@ -16,23 +16,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "winerror.h"
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
 #include <ole2.h>
 #include <hlink.h>
+#include <hlguids.h>
 
 #include <wine/unicode.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(hlink);
+
 extern HRESULT HLink_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 extern HRESULT HLinkBrowseContext_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN;
 

reactos/dll/win32/hlink/link.c

@@ -21,11 +21,6 @@
 #include "hlink_private.h"
 
 #include <shellapi.h>
-#include <hlguids.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(hlink);
 
 #define HLINK_SAVE_MAGIC    0x00000002
 #define HLINK_SAVE_MONIKER_PRESENT      0x01