[SHDOCVW]

* 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=61337

reactos/dll/win32/shdocvw/shdocvw.h

@@ -22,24 +22,25 @@
 #ifndef __WINE_SHDOCVW_H
 #define __WINE_SHDOCVW_H
 
+#include <config.h>
+
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
 #define COBJMACROS
 
-#include <stdarg.h>
-
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
-
-#include <ole2.h>
+#include <winreg.h>
 #include <shlobj.h>
-//#include "exdisp.h"
 
 #include <wine/unicode.h>
-//#include "wine/list.h"
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 /**********************************************************************
  * Shell Instance Objects

reactos/dll/win32/shdocvw/shdocvw_main.c

@@ -20,24 +20,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-//#include <stdarg.h>
-//#include <stdio.h>
-
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
 #include "shdocvw.h"
 
-#include <winreg.h>
 #include <shlwapi.h>
 #include <wininet.h>
-//#include "isguids.h"
-
-//#include "initguid.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
 
 LONG SHDOCVW_refCount = 0;
 

reactos/dll/win32/shdocvw/shlinstobj.c

@@ -23,23 +23,8 @@
  * some registry entries. This feature was introduced with win2k. Please
  * search for 'Shell Instance Objects' on MSDN to get more information. */
 
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "objbase.h"
-//#include "oleauto.h"
-
 #include "shdocvw.h"
 
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
-
 #define CHARS_IN_GUID 39
 
 /******************************************************************************