[ros-diffs] [akhaldi] 61414: [MSHTML] * 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 ...

Author: akhaldi
Date: Wed Dec 25 17:40:49 2013
New Revision: 61414

URL: http://svn.reactos.org/svn/reactos?rev=61414&view=rev
Log:
[MSHTML]
* 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/resource file.
* Improve the GUIDs situation.
CORE-7716

Added:
    trunk/reactos/dll/win32/mshtml/guid.c   (with props)
Modified:
    trunk/reactos/dll/win32/mshtml/CMakeLists.txt
    trunk/reactos/dll/win32/mshtml/conpoint.c
    trunk/reactos/dll/win32/mshtml/dispex.c
    trunk/reactos/dll/win32/mshtml/editor.c
    trunk/reactos/dll/win32/mshtml/hlink.c
    trunk/reactos/dll/win32/mshtml/htmlanchor.c
    trunk/reactos/dll/win32/mshtml/htmlattr.c
    trunk/reactos/dll/win32/mshtml/htmlbody.c
    trunk/reactos/dll/win32/mshtml/htmlcomment.c
    trunk/reactos/dll/win32/mshtml/htmlcurstyle.c
    trunk/reactos/dll/win32/mshtml/htmldoc.c
    trunk/reactos/dll/win32/mshtml/htmldoc3.c
    trunk/reactos/dll/win32/mshtml/htmldoc5.c
    trunk/reactos/dll/win32/mshtml/htmlelem.c
    trunk/reactos/dll/win32/mshtml/htmlelem2.c
    trunk/reactos/dll/win32/mshtml/htmlelem3.c
    trunk/reactos/dll/win32/mshtml/htmlelemcol.c
    trunk/reactos/dll/win32/mshtml/htmlembed.c
    trunk/reactos/dll/win32/mshtml/htmlevent.c
    trunk/reactos/dll/win32/mshtml/htmlform.c
    trunk/reactos/dll/win32/mshtml/htmlframe.c
    trunk/reactos/dll/win32/mshtml/htmlframebase.c
    trunk/reactos/dll/win32/mshtml/htmlgeneric.c
    trunk/reactos/dll/win32/mshtml/htmlhead.c
    trunk/reactos/dll/win32/mshtml/htmliframe.c
    trunk/reactos/dll/win32/mshtml/htmlimg.c
    trunk/reactos/dll/win32/mshtml/htmlinput.c
    trunk/reactos/dll/win32/mshtml/htmllink.c
    trunk/reactos/dll/win32/mshtml/htmllocation.c
    trunk/reactos/dll/win32/mshtml/htmlmeta.c
    trunk/reactos/dll/win32/mshtml/htmlnode.c
    trunk/reactos/dll/win32/mshtml/htmlobject.c
    trunk/reactos/dll/win32/mshtml/htmloption.c
    trunk/reactos/dll/win32/mshtml/htmlscreen.c
    trunk/reactos/dll/win32/mshtml/htmlscript.c
    trunk/reactos/dll/win32/mshtml/htmlselect.c
    trunk/reactos/dll/win32/mshtml/htmlstorage.c
    trunk/reactos/dll/win32/mshtml/htmlstyle.c
    trunk/reactos/dll/win32/mshtml/htmlstyle2.c
    trunk/reactos/dll/win32/mshtml/htmlstyle3.c
    trunk/reactos/dll/win32/mshtml/htmlstyleelem.c
    trunk/reactos/dll/win32/mshtml/htmlstylesheet.c
    trunk/reactos/dll/win32/mshtml/htmltable.c
    trunk/reactos/dll/win32/mshtml/htmltablecell.c
    trunk/reactos/dll/win32/mshtml/htmltablerow.c
    trunk/reactos/dll/win32/mshtml/htmltextarea.c
    trunk/reactos/dll/win32/mshtml/htmltextcont.c
    trunk/reactos/dll/win32/mshtml/htmltextnode.c
    trunk/reactos/dll/win32/mshtml/htmlwindow.c
    trunk/reactos/dll/win32/mshtml/ifacewrap.c
    trunk/reactos/dll/win32/mshtml/ipwindow.c
    trunk/reactos/dll/win32/mshtml/lang/Bg.rc
    trunk/reactos/dll/win32/mshtml/lang/Da.rc
    trunk/reactos/dll/win32/mshtml/lang/De.rc
    trunk/reactos/dll/win32/mshtml/lang/En.rc
    trunk/reactos/dll/win32/mshtml/lang/Es.rc
    trunk/reactos/dll/win32/mshtml/lang/Fi.rc
    trunk/reactos/dll/win32/mshtml/lang/Fr.rc
    trunk/reactos/dll/win32/mshtml/lang/He.rc
    trunk/reactos/dll/win32/mshtml/lang/Hu.rc
    trunk/reactos/dll/win32/mshtml/lang/It.rc
    trunk/reactos/dll/win32/mshtml/lang/Ja.rc
    trunk/reactos/dll/win32/mshtml/lang/Ko.rc
    trunk/reactos/dll/win32/mshtml/lang/Lt.rc
    trunk/reactos/dll/win32/mshtml/lang/Nl.rc
    trunk/reactos/dll/win32/mshtml/lang/No.rc
    trunk/reactos/dll/win32/mshtml/lang/Pl.rc
    trunk/reactos/dll/win32/mshtml/lang/Pt.rc
    trunk/reactos/dll/win32/mshtml/lang/Ro.rc
    trunk/reactos/dll/win32/mshtml/lang/Ru.rc
    trunk/reactos/dll/win32/mshtml/lang/Si.rc
    trunk/reactos/dll/win32/mshtml/lang/Sv.rc
    trunk/reactos/dll/win32/mshtml/lang/Tr.rc
    trunk/reactos/dll/win32/mshtml/lang/Uk.rc
    trunk/reactos/dll/win32/mshtml/lang/Zh.rc
    trunk/reactos/dll/win32/mshtml/loadopts.c
    trunk/reactos/dll/win32/mshtml/main.c
    trunk/reactos/dll/win32/mshtml/mshtml_private.h
    trunk/reactos/dll/win32/mshtml/mutation.c
    trunk/reactos/dll/win32/mshtml/navigate.c
    trunk/reactos/dll/win32/mshtml/npplugin.c
    trunk/reactos/dll/win32/mshtml/nsembed.c
    trunk/reactos/dll/win32/mshtml/nsevents.c
    trunk/reactos/dll/win32/mshtml/nsio.c
    trunk/reactos/dll/win32/mshtml/nsservice.c
    trunk/reactos/dll/win32/mshtml/olecmd.c
    trunk/reactos/dll/win32/mshtml/oleobj.c
    trunk/reactos/dll/win32/mshtml/olewnd.c
    trunk/reactos/dll/win32/mshtml/omnavigator.c
    trunk/reactos/dll/win32/mshtml/persist.c
    trunk/reactos/dll/win32/mshtml/pluginhost.c
    trunk/reactos/dll/win32/mshtml/propbag.c
    trunk/reactos/dll/win32/mshtml/protocol.c
    trunk/reactos/dll/win32/mshtml/resource.h
    trunk/reactos/dll/win32/mshtml/rsrc.rc
    trunk/reactos/dll/win32/mshtml/script.c
    trunk/reactos/dll/win32/mshtml/secmgr.c
    trunk/reactos/dll/win32/mshtml/selection.c
    trunk/reactos/dll/win32/mshtml/service.c
    trunk/reactos/dll/win32/mshtml/task.c
    trunk/reactos/dll/win32/mshtml/txtrange.c
    trunk/reactos/dll/win32/mshtml/view.c

Modified: trunk/reactos/dll/win32/mshtml/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/CMakeList…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/CMakeLists.txt	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -85,6 +85,7 @@
     task.c
     txtrange.c
     view.c
+    guid.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)

Modified: trunk/reactos/dll/win32/mshtml/conpoint.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/conpoint.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/conpoint.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/conpoint.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const char *debugstr_cp_guid(REFIID riid)
 {

Modified: trunk/reactos/dll/win32/mshtml/dispex.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/dispex.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/dispex.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define MAX_ARGS 16
 

Modified: trunk/reactos/dll/win32/mshtml/editor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/editor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/editor.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmcid.h>
-#include <shlguid.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NSCMD_ALIGN        "cmd_align"
 #define NSCMD_BEGINLINE    "cmd_beginLine"

Added: trunk/reactos/dll/win32/mshtml/guid.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/guid.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/guid.c	(added)
+++ trunk/reactos/dll/win32/mshtml/guid.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -0,0 +1,29 @@
+/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <initguid.h>
+#include <nsiface.h>
+
+DEFINE_GUID(CLSID_AboutProtocol, 0x3050F406, 0x98B5, 0x11CF, 0xBB,0x82,
0x00,0xAA,0x00,0xBD,0xCE,0x0B);
+DEFINE_GUID(CLSID_JSProtocol, 0x3050F3B2, 0x98B5, 0x11CF, 0xBB,0x82,
0x00,0xAA,0x00,0xBD,0xCE,0x0B);
+DEFINE_GUID(CLSID_MailtoProtocol, 0x3050F3DA, 0x98B5, 0x11CF, 0xBB,0x82,
0x00,0xAA,0x00,0xBD,0xCE,0x0B);
+DEFINE_GUID(CLSID_ResProtocol, 0x3050F3BC, 0x98B5, 0x11CF, 0xBB,0x82,
0x00,0xAA,0x00,0xBD,0xCE,0x0B);
+DEFINE_GUID(CLSID_SysimageProtocol, 0x76E67A63, 0x06E9, 0x11D2, 0xA8,0x40,
0x00,0x60,0x08,0x05,0x93,0x82);
+
+DEFINE_GUID(CLSID_CMarkup,0x3050f4fb,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b);
+
+DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0);
+
+DEFINE_GUID(CLSID_JScript, 0xf414c260,0x6ac0,0x11cf,
0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58);
+DEFINE_GUID(CLSID_VBScript, 0xb54f3741,0x5b07,0x11cf,
0xa4,0xb0,0x00,0xaa,0x00,0x4a,0x55,0xe8);
+
+DEFINE_GUID(IID_nsXPCOMCycleCollectionParticipant, 0x9674489b,0x1f6f,0x4550,0xa7,0x30,
0xcc,0xae,0xdd,0x10,0x4c,0xf9);
+
+/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */

Propchange: trunk/reactos/dll/win32/mshtml/guid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/mshtml/hlink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/hlink.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/hlink.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/hlink.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /**********************************************************
  * IHlinkTarget implementation

Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlanchor.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlanchor.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "binding.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlattr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlattr.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlattr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlattr.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLDOMAttribute *impl_from_IHTMLDOMAttribute(IHTMLDOMAttribute *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlbody.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlbody.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlbody.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlbody.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLTextContainer textcont;

Modified: trunk/reactos/dll/win32/mshtml/htmlcomment.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcomme…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlcomment.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlcomment.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLCommentElement {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlcurstyle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcurst…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlcurstyle.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlcurstyle.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-#include "htmlstyle.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLCurrentStyle {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmldoc.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmldoc.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,33 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <wininet.h>
-#include <ole2.h>
-//#include "perhist.h"
-#include <mshtmdid.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "pluginhost.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLDocument *impl_from_IHTMLDocument2(IHTMLDocument2 *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmldoc3.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc3.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmldoc3.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmldoc3.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 HRESULT get_doc_elem_by_id(HTMLDocumentNode *doc, const WCHAR *id, HTMLElement **ret)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmldoc5.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc5.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmldoc5.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmldoc5.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLDocument *impl_from_IHTMLDocument5(IHTMLDocument5 *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlelem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlelem.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlelem.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "htmlstyle.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const WCHAR aW[]        = {'A',0};
 static const WCHAR bodyW[]     = {'B','O','D','Y',0};

Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlelem2.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlelem2.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-#include <math.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "htmlstyle.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmlelem3.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem3…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlelem3.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlelem3.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLElement *impl_from_IHTMLElement3(IHTMLElement3 *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlelemcol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelemc…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlelemcol.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlelemcol.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmlembed.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlembed…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlembed.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlembed.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlevent.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlevent…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlevent.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlevent.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmdid.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "htmlscript.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     IDispatch *handler_prop;

Modified: trunk/reactos/dll/win32/mshtml/htmlform.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlform.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlform.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlform.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLFormElement {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlframe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlframe.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlframe.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLFrameBase framebase;

Modified: trunk/reactos/dll/win32/mshtml/htmlframebase.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlframe…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlframebase.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlframebase.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-#include "binding.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const WCHAR autoW[] = {'a','u','t','o',0};
 static const WCHAR yesW[] = {'y','e','s',0};

Modified: trunk/reactos/dll/win32/mshtml/htmlgeneric.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlgener…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlgeneric.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlgeneric.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlhead.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlhead.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlhead.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlhead.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmliframe.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlifram…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmliframe.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmliframe.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLFrameBase framebase;

Modified: trunk/reactos/dll/win32/mshtml/htmlimg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlimg.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlimg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlimg.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlinput.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlinput.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
+#include "mshtml_private.h"
+
 #include <limits.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
-#include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmllink.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllink.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmllink.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmllink.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <assert.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmllocation.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmllocat…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmllocation.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmllocation.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-#include <wininet.h>
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "binding.h"
-//#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static HRESULT get_url(HTMLLocation *This, const WCHAR **ret)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlmeta.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlmeta.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlmeta.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlmeta.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlnode.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlnode.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static HTMLDOMNode *get_node_obj(IHTMLDOMNode*);
 static HRESULT create_node(HTMLDocumentNode*,nsIDOMNode*,HTMLDOMNode**);

Modified: trunk/reactos/dll/win32/mshtml/htmlobject.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlobjec…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlobject.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlobject.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <assert.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "pluginhost.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLPluginContainer plugin_container;

Modified: trunk/reactos/dll/win32/mshtml/htmloption.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmloptio…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmloption.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmloption.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLOptionElement {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlscreen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscree…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlscreen.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlscreen.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmlscript.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlscrip…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlscript.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlscript.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlscript.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlselect.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlselec…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlselect.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlselect.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlstorage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstora…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstorage.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstorage.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstyle.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstyle.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-#include <math.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmdid.h>
-
 #include "mshtml_private.h"
-#include "htmlstyle.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const WCHAR attrBackground[] =
    
{'b','a','c','k','g','r','o','u','n','d',0};

Modified: trunk/reactos/dll/win32/mshtml/htmlstyle2.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstyle2.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstyle2.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-#include "htmlstyle.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLStyle *impl_from_IHTMLStyle2(IHTMLStyle2 *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlstyle3.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstyle3.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstyle3.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-#include "htmlstyle.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLStyle *impl_from_IHTMLStyle3(IHTMLStyle3 *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmlstyleelem.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstyleelem.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstyleelem.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <assert.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlstylesheet.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlstylesheet.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLStyleSheet {
     DispatchEx dispex;

Modified: trunk/reactos/dll/win32/mshtml/htmltable.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltable.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltable.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLTable {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmltablecell.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltablecell.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltablecell.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmltablerow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltablerow.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltablerow.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmltextarea.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltexta…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltextarea.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltextarea.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     HTMLElement element;

Modified: trunk/reactos/dll/win32/mshtml/htmltextcont.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextc…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltextcont.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltextcont.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static inline HTMLTextContainer *impl_from_IHTMLTextContainer(IHTMLTextContainer *iface)
 {

Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmltextnode.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmltextnode.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
 #include "mshtml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 struct HTMLDOMTextNode {
     HTMLDOMNode node;

Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/htmlwindow.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/htmlwindow.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,35 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmdid.h>
-#include <shlguid.h>
-#include <shobjidl.h>
+#include "mshtml_private.h"
+
 #include <exdispid.h>
-
-#define NO_SHLWAPI_REG
-#include "shlwapi.h"
-
-#include <wine/debug.h>
-
-#include "mshtml_private.h"
-#include "htmlevent.h"
-#include "htmlscript.h"
-#include "binding.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static struct list window_list = LIST_INIT(window_list);
 

Modified: trunk/reactos/dll/win32/mshtml/ifacewrap.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ifacewrap…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/ifacewrap.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/ifacewrap.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,25 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /*
  * This object wraps any unrecognized interface overriding its IUnknown methods,
allowing

Modified: trunk/reactos/dll/win32/mshtml/ipwindow.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/ipwindow.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/ipwindow.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/ipwindow.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "shlobj.h"
-
 #include "mshtml_private.h"
-#include "pluginhost.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     IOleInPlaceFrame IOleInPlaceFrame_iface;

Modified: trunk/reactos/dll/win32/mshtml/lang/Bg.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Bg.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Bg.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Bg.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Da.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Da.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mshtml/lang/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/De.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/De.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mshtml/lang/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/En.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/En.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Es.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Es.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Fi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Fi.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Fi.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Fi.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Fr.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Fr.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/He.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/He.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Hu.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Hu.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/It.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/It.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /*UTF-8*/
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ja.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Ja.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ko.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Ko.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,8 +16,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Lt.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Lt.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Nl.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Nl.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mshtml/lang/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/No.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/No.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Pl.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Pl.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Pt.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Pt.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,8 +16,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ro.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Ro.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,8 +16,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Ru.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Ru.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Si.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Si.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Sv.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Sv.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Tr.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Tr.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -15,8 +15,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/mshtml/lang/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Uk.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Uk.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,8 +16,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/lang/Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/lang/Zh.r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/lang/Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/lang/Zh.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/mshtml/loadopts.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/loadopts.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/loadopts.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/loadopts.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <optary.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct load_opt {
     DWORD option;

Modified: trunk/reactos/dll/win32/mshtml/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/main.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -20,32 +20,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-//#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winreg.h>
-#include <ole2.h>
+#include "mshtml_private.h"
+
 #include <advpub.h>
-//#include "shlwapi.h"
-#include <optary.h>
-#include "rpcproxy.h"
-#include <shlguid.h>
-
-#include <wine/debug.h>
-
-#define INIT_GUID
-#include "mshtml_private.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+#include <rpcproxy.h>
+#include <initguid.h>
 
 HINSTANCE hInst;
 DWORD mshtml_tls = TLS_OUT_OF_INDEXES;

Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/mshtml_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/mshtml_private.h	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,47 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <math.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
 #include <wingdi.h>
-#include "docobj.h"
-#include "docobjectservice.h"
-#include <comcat.h>
-#include <mshtml.h>
+#include <ole2.h>
+#include <docobjectservice.h>
 #include <mshtmhst.h>
-#include <hlink.h>
+#include <mshtmcid.h>
+#include <mshtmdid.h>
 #include <perhist.h>
-#include <dispex.h>
-#include "objsafe.h"
-#include "htiframe.h"
-#include "tlogstg.h"
+#include <objsafe.h>
+#include <htiframe.h>
+#include <tlogstg.h>
 #include <shdeprecated.h>
+#include <shlguid.h>
+#define NO_SHLWAPI_REG
+#include <shlwapi.h>
+#include <optary.h>
+#include <idispids.h>
+#include <wininet.h>
+#include <nsiface.h>
 
 #include <wine/list.h>
 #include <wine/unicode.h>
 
-#ifdef INIT_GUID
-#include <initguid.h>
-#endif
-
-#include <nsiface.h>
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NS_ERROR_GENERATE_FAILURE(module,code) \
     ((nsresult) (((UINT32)(1<<31)) | ((UINT32)(module+0x45)<<16) |
((UINT32)(code))))
@@ -1178,3 +1197,10 @@
 void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN;
 
 extern HINSTANCE hInst DECLSPEC_HIDDEN;
+
+#include "binding.h"
+#include "htmlevent.h"
+#include "htmlscript.h"
+#include "htmlstyle.h"
+#include "pluginhost.h"
+#include "resource.h"

Modified: trunk/reactos/dll/win32/mshtml/mutation.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/mutation.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/mutation.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,31 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-#include <shlguid.h>
-
 #include "mshtml_private.h"
-#include "htmlscript.h"
-#include "htmlevent.h"
-#include "binding.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define IE_MAJOR_VERSION 7
 #define IE_MINOR_VERSION 0

Modified: trunk/reactos/dll/win32/mshtml/navigate.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/navigate.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/navigate.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,37 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winreg.h>
-#include <ole2.h>
+#include "mshtml_private.h"
+
 #include <hlguids.h>
-#include <shlguid.h>
-#include <wininet.h>
-#include <shlwapi.h>
-#include "htiface.h"
-#include "shdeprecated.h"
-
-#include <wine/debug.h>
-
-#include "mshtml_private.h"
-#include "htmlscript.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+#include <htiface.h>
 
 #define CONTENT_LENGTH "Content-Length"
 #define UTF8_STR "utf-8"

Modified: trunk/reactos/dll/win32/mshtml/npplugin.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/npplugin.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/npplugin.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/npplugin.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "shlobj.h"
-
 #include "mshtml_private.h"
-#include "pluginhost.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /* Parts of npapi.h */
 

Modified: trunk/reactos/dll/win32/mshtml/nsembed.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/nsembed.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/nsembed.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,31 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winreg.h>
-#include <ole2.h>
-#include "shlobj.h"
-#include "shlwapi.h"
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlevent.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+
+#include <wincon.h>
+#include <shlobj.h>
+
 WINE_DECLARE_DEBUG_CHANNEL(gecko);
 
 #define NS_APPSTARTUPNOTIFIER_CONTRACTID
&quot;(a)mozilla.org/embedcomp/appstartup-notifier;1&quot;

Modified: trunk/reactos/dll/win32/mshtml/nsevents.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/nsevents.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/nsevents.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,31 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmcid.h>
-#include <shlguid.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlscript.h"
-#include "htmlevent.h"
-#include "binding.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const PRUnichar blurW[]      =
{'b','l','u','r',0};
 static const PRUnichar focusW[]     =
{'f','o','c','u','s',0};

Modified: trunk/reactos/dll/win32/mshtml/nsio.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/nsio.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/nsio.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,31 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <winreg.h>
-#include <ole2.h>
-#include <shlguid.h>
-#include <wininet.h>
-#include <shlwapi.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NS_IOSERVICE_CLASSNAME "nsIOService"
 #define NS_IOSERVICE_CONTRACTID &quot;(a)mozilla.org/network/io-service;1&quot;

Modified: trunk/reactos/dll/win32/mshtml/nsservice.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsservice…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/nsservice.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/nsservice.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winreg.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NS_PROMPTSERVICE_CONTRACTID &quot;(a)mozilla.org/embedcomp/prompt-service;1&quot;
 #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID
&quot;(a)mozilla.org/embedcomp/tooltiptextprovider;1&quot;

Modified: trunk/reactos/dll/win32/mshtml/olecmd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/olecmd.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/olecmd.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,29 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <shlguid.h>
-//#include "mshtmdid.h"
-//#include "idispids.h"
-#include <mshtmcid.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "binding.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define NSCMD_COPY "cmd_copy"
 

Modified: trunk/reactos/dll/win32/mshtml/oleobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/oleobj.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/oleobj.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,30 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <shlguid.h>
-#include <shdeprecated.h>
-#include <mshtmdid.h>
-#include <idispids.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define DOCHOST_DOCCANNAVIGATE  0
 

Modified: trunk/reactos/dll/win32/mshtml/olewnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olewnd.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/olewnd.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/olewnd.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-//#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /**********************************************************
  * IOleInPlaceActiveObject implementation

Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/omnavigator.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/omnavigator.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #ifdef __REACTOS__
 /* HACK This is a Vista+ API */

Modified: trunk/reactos/dll/win32/mshtml/persist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/persist.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/persist.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,37 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <shlguid.h>
-#include <idispids.h>
-
-#define NO_SHLWAPI_REG
-#include "shlwapi.h"
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-#include "htmlscript.h"
-#include "htmlevent.h"
-#include "binding.h"
-#include "resource.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /* Undocumented notification, see tests */
 #define CMDID_EXPLORER_UPDATEHISTORY 38

Modified: trunk/reactos/dll/win32/mshtml/pluginhost.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/pluginhos…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/pluginhost.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/pluginhost.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,29 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "shlobj.h"
-#include <mshtmdid.h>
-
 #include "mshtml_private.h"
-#include "pluginhost.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 const IID IID_HTMLPluginContainer =
     {0xbd7a6050,0xb373,0x4f6f,{0xa4,0x93,0xdd,0x40,0xc5,0x23,0xa8,0x6a}};

Modified: trunk/reactos/dll/win32/mshtml/propbag.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/propbag.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/propbag.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/propbag.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-
-#include <stdarg.h>
-
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "shlobj.h"
-
 #include "mshtml_private.h"
-#include "pluginhost.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     IPropertyBag  IPropertyBag_iface;

Modified: trunk/reactos/dll/win32/mshtml/protocol.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/protocol.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/protocol.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 /********************************************************************
  * common ProtocolFactory implementation

Modified: trunk/reactos/dll/win32/mshtml/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/resource.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/resource.h	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,9 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
-#include <winuser.h>
-#include <commctrl.h>
+#pragma once
 
 #define IDS_HTMLDOCUMENT    7501
 

Modified: trunk/reactos/dll/win32/mshtml/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/rsrc.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/rsrc.rc	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,10 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include "windef.h"
+#include <windef.h>
 #include <winuser.h>
 #include <commctrl.h>
-//#include "mshtmcid.h"
 
 #include "resource.h"
 

Modified: trunk/reactos/dll/win32/mshtml/script.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/script.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/script.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/script.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,32 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-//#include "activscp.h"
+#include "mshtml_private.h"
+
 #include <activdbg.h>
-
-#include <wine/debug.h>
-
-#include "mshtml_private.h"
-#include "htmlscript.h"
-#include "pluginhost.h"
-#include "htmlevent.h"
-#include "binding.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #ifdef _WIN64
 

Modified: trunk/reactos/dll/win32/mshtml/secmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/secmgr.c?…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/secmgr.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/secmgr.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
+#include "mshtml_private.h"
+
 #include <activscp.h>
-
-#include <wine/debug.h>
-
-#include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const WCHAR about_blankW[] =
{'a','b','o','u','t',':','b','l','a','n','k',0};
 

Modified: trunk/reactos/dll/win32/mshtml/selection.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/selection…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/selection.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/selection.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,23 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     IHTMLSelectionObject IHTMLSelectionObject_iface;

Modified: trunk/reactos/dll/win32/mshtml/service.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/service.c…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/service.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/service.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,26 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 typedef struct {
     IOleUndoManager IOleUndoManager_iface;

Modified: trunk/reactos/dll/win32/mshtml/task.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/task.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/task.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,27 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-#include <stdio.h>
-#include <assert.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define WM_PROCESSTASK 0x8008
 #define TIMER_ID 0x3000

Modified: trunk/reactos/dll/win32/mshtml/txtrange.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/txtrange.…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/txtrange.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/txtrange.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,24 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <mshtmcid.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 static const WCHAR brW[] = {'b','r',0};
 static const WCHAR hrW[] = {'h','r',0};

Modified: trunk/reactos/dll/win32/mshtml/view.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/view.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mshtml/view.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mshtml/view.c	[iso-8859-1] Wed Dec 25 17:40:49 2013
@@ -16,28 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#include <stdarg.h>
-//#include <stdio.h>
-
-#define COBJMACROS
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "commctrl.h"
-#include <ole2.h>
-#include "resource.h"
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 
 #define TIMER_ID 0x1000