diff --git a/reactos/dll/win32/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt
index a17e5694760..9921f275e73 100644
--- a/reactos/dll/win32/mshtml/CMakeLists.txt
+++ b/reactos/dll/win32/mshtml/CMakeLists.txt
@@ -85,6 +85,7 @@ list(APPEND SOURCE
     task.c
     txtrange.c
     view.c
+    guid.c
     rsrc.rc
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/mshtml.def)
diff --git a/reactos/dll/win32/mshtml/conpoint.c b/reactos/dll/win32/mshtml/conpoint.c
index 404bec2a2b7..e2e8d754767 100644
--- a/reactos/dll/win32/mshtml/conpoint.c
+++ b/reactos/dll/win32/mshtml/conpoint.c
@@ -16,24 +16,8 @@
  * 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)
 {
 #define X(x) \
diff --git a/reactos/dll/win32/mshtml/dispex.c b/reactos/dll/win32/mshtml/dispex.c
index 9b9a3910bcd..33a131852b0 100644
--- a/reactos/dll/win32/mshtml/dispex.c
+++ b/reactos/dll/win32/mshtml/dispex.c
@@ -16,26 +16,8 @@
  * 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
 
 static CRITICAL_SECTION cs_dispex_static_data;
diff --git a/reactos/dll/win32/mshtml/editor.c b/reactos/dll/win32/mshtml/editor.c
index becf21a2fa4..f2dc56473e8 100644
--- a/reactos/dll/win32/mshtml/editor.c
+++ b/reactos/dll/win32/mshtml/editor.c
@@ -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"
diff --git a/reactos/dll/win32/mshtml/guid.c b/reactos/dll/win32/mshtml/guid.c
new file mode 100644
index 00000000000..fca5a138bd4
--- /dev/null
+++ b/reactos/dll/win32/mshtml/guid.c
@@ -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 */
diff --git a/reactos/dll/win32/mshtml/hlink.c b/reactos/dll/win32/mshtml/hlink.c
index b6d874bd546..9bf57ae82f7 100644
--- a/reactos/dll/win32/mshtml/hlink.c
+++ b/reactos/dll/win32/mshtml/hlink.c
@@ -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
diff --git a/reactos/dll/win32/mshtml/htmlanchor.c b/reactos/dll/win32/mshtml/htmlanchor.c
index 0018933359f..4aee0f718ff 100644
--- a/reactos/dll/win32/mshtml/htmlanchor.c
+++ b/reactos/dll/win32/mshtml/htmlanchor.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlattr.c b/reactos/dll/win32/mshtml/htmlattr.c
index 8a468174f83..4eb734d2f81 100644
--- a/reactos/dll/win32/mshtml/htmlattr.c
+++ b/reactos/dll/win32/mshtml/htmlattr.c
@@ -16,25 +16,8 @@
  * 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)
 {
     return CONTAINING_RECORD(iface, HTMLDOMAttribute, IHTMLDOMAttribute_iface);
diff --git a/reactos/dll/win32/mshtml/htmlbody.c b/reactos/dll/win32/mshtml/htmlbody.c
index d9d0d5436d3..69ea194da16 100644
--- a/reactos/dll/win32/mshtml/htmlbody.c
+++ b/reactos/dll/win32/mshtml/htmlbody.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlcomment.c b/reactos/dll/win32/mshtml/htmlcomment.c
index 80c101b11a5..c25c63fd664 100644
--- a/reactos/dll/win32/mshtml/htmlcomment.c
+++ b/reactos/dll/win32/mshtml/htmlcomment.c
@@ -16,25 +16,8 @@
  * 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;
     IHTMLCommentElement IHTMLCommentElement_iface;
diff --git a/reactos/dll/win32/mshtml/htmlcurstyle.c b/reactos/dll/win32/mshtml/htmlcurstyle.c
index 911ba552657..cc1fd9c7914 100644
--- a/reactos/dll/win32/mshtml/htmlcurstyle.c
+++ b/reactos/dll/win32/mshtml/htmlcurstyle.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmldoc.c b/reactos/dll/win32/mshtml/htmldoc.c
index 69cb446d6a9..6e1fc5db568 100644
--- a/reactos/dll/win32/mshtml/htmldoc.c
+++ b/reactos/dll/win32/mshtml/htmldoc.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmldoc3.c b/reactos/dll/win32/mshtml/htmldoc3.c
index 3a4de0c0a69..01661f7b992 100644
--- a/reactos/dll/win32/mshtml/htmldoc3.c
+++ b/reactos/dll/win32/mshtml/htmldoc3.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmldoc5.c b/reactos/dll/win32/mshtml/htmldoc5.c
index e467091e1c0..71b8cb87497 100644
--- a/reactos/dll/win32/mshtml/htmldoc5.c
+++ b/reactos/dll/win32/mshtml/htmldoc5.c
@@ -16,27 +16,8 @@
  * 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)
 {
     return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument5_iface);
diff --git a/reactos/dll/win32/mshtml/htmlelem.c b/reactos/dll/win32/mshtml/htmlelem.c
index 95601f12bb2..f0287d2ab75 100644
--- a/reactos/dll/win32/mshtml/htmlelem.c
+++ b/reactos/dll/win32/mshtml/htmlelem.c
@@ -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};
diff --git a/reactos/dll/win32/mshtml/htmlelem2.c b/reactos/dll/win32/mshtml/htmlelem2.c
index a44a2118ecf..cd5f3d44b87 100644
--- a/reactos/dll/win32/mshtml/htmlelem2.c
+++ b/reactos/dll/win32/mshtml/htmlelem2.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlelem3.c b/reactos/dll/win32/mshtml/htmlelem3.c
index f0b69c580a8..c5b4faaeca5 100644
--- a/reactos/dll/win32/mshtml/htmlelem3.c
+++ b/reactos/dll/win32/mshtml/htmlelem3.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmlelemcol.c b/reactos/dll/win32/mshtml/htmlelemcol.c
index 56737087bb0..75596e89003 100644
--- a/reactos/dll/win32/mshtml/htmlelemcol.c
+++ b/reactos/dll/win32/mshtml/htmlelemcol.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLElementCollection IHTMLElementCollection_iface;
diff --git a/reactos/dll/win32/mshtml/htmlembed.c b/reactos/dll/win32/mshtml/htmlembed.c
index 8c9411ea769..6414af875bc 100644
--- a/reactos/dll/win32/mshtml/htmlembed.c
+++ b/reactos/dll/win32/mshtml/htmlembed.c
@@ -16,25 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmlevent.c b/reactos/dll/win32/mshtml/htmlevent.c
index 595afec431d..4ed833b3c69 100644
--- a/reactos/dll/win32/mshtml/htmlevent.c
+++ b/reactos/dll/win32/mshtml/htmlevent.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlform.c b/reactos/dll/win32/mshtml/htmlform.c
index 786664fff9f..0a0ed682df0 100644
--- a/reactos/dll/win32/mshtml/htmlform.c
+++ b/reactos/dll/win32/mshtml/htmlform.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlframe.c b/reactos/dll/win32/mshtml/htmlframe.c
index af6f50d26e2..cf03bfb20d7 100644
--- a/reactos/dll/win32/mshtml/htmlframe.c
+++ b/reactos/dll/win32/mshtml/htmlframe.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLFrameElement3 IHTMLFrameElement3_iface;
diff --git a/reactos/dll/win32/mshtml/htmlframebase.c b/reactos/dll/win32/mshtml/htmlframebase.c
index ffa0dcae87e..c034f837e4b 100644
--- a/reactos/dll/win32/mshtml/htmlframebase.c
+++ b/reactos/dll/win32/mshtml/htmlframebase.c
@@ -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};
diff --git a/reactos/dll/win32/mshtml/htmlgeneric.c b/reactos/dll/win32/mshtml/htmlgeneric.c
index a34688c83b2..f1d6a9d4a7e 100644
--- a/reactos/dll/win32/mshtml/htmlgeneric.c
+++ b/reactos/dll/win32/mshtml/htmlgeneric.c
@@ -16,24 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmlhead.c b/reactos/dll/win32/mshtml/htmlhead.c
index c63a3e7536d..fb81ae5e9f7 100644
--- a/reactos/dll/win32/mshtml/htmlhead.c
+++ b/reactos/dll/win32/mshtml/htmlhead.c
@@ -16,24 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmliframe.c b/reactos/dll/win32/mshtml/htmliframe.c
index 6b9507bad25..e841f3255ec 100644
--- a/reactos/dll/win32/mshtml/htmliframe.c
+++ b/reactos/dll/win32/mshtml/htmliframe.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLIFrameElement IHTMLIFrameElement_iface;
diff --git a/reactos/dll/win32/mshtml/htmlimg.c b/reactos/dll/win32/mshtml/htmlimg.c
index e8ffb312129..c8e9d10c0ac 100644
--- a/reactos/dll/win32/mshtml/htmlimg.c
+++ b/reactos/dll/win32/mshtml/htmlimg.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlinput.c b/reactos/dll/win32/mshtml/htmlinput.c
index 78c4ebf6da9..62ed4e6f02e 100644
--- a/reactos/dll/win32/mshtml/htmlinput.c
+++ b/reactos/dll/win32/mshtml/htmlinput.c
@@ -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 <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);
+#include <limits.h>
 
 typedef struct {
     HTMLElement element;
diff --git a/reactos/dll/win32/mshtml/htmllink.c b/reactos/dll/win32/mshtml/htmllink.c
index a9b65952a92..4b9d3bdb198 100644
--- a/reactos/dll/win32/mshtml/htmllink.c
+++ b/reactos/dll/win32/mshtml/htmllink.c
@@ -16,25 +16,8 @@
  * 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;
     IHTMLLinkElement IHTMLLinkElement_iface;
diff --git a/reactos/dll/win32/mshtml/htmllocation.c b/reactos/dll/win32/mshtml/htmllocation.c
index ed0d5758bef..e2a0edda1a1 100644
--- a/reactos/dll/win32/mshtml/htmllocation.c
+++ b/reactos/dll/win32/mshtml/htmllocation.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmlmeta.c b/reactos/dll/win32/mshtml/htmlmeta.c
index 72d61b7a4fa..d6274ef3da4 100644
--- a/reactos/dll/win32/mshtml/htmlmeta.c
+++ b/reactos/dll/win32/mshtml/htmlmeta.c
@@ -16,24 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmlnode.c b/reactos/dll/win32/mshtml/htmlnode.c
index bb5db965c36..0b3f0f8d425 100644
--- a/reactos/dll/win32/mshtml/htmlnode.c
+++ b/reactos/dll/win32/mshtml/htmlnode.c
@@ -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**);
diff --git a/reactos/dll/win32/mshtml/htmlobject.c b/reactos/dll/win32/mshtml/htmlobject.c
index 4efd223e1ac..553db2d1649 100644
--- a/reactos/dll/win32/mshtml/htmlobject.c
+++ b/reactos/dll/win32/mshtml/htmlobject.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmloption.c b/reactos/dll/win32/mshtml/htmloption.c
index 87a48b5a905..4621c4a83b7 100644
--- a/reactos/dll/win32/mshtml/htmloption.c
+++ b/reactos/dll/win32/mshtml/htmloption.c
@@ -16,25 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmlscreen.c b/reactos/dll/win32/mshtml/htmlscreen.c
index 9986eeff7d6..eef50a1ade6 100644
--- a/reactos/dll/win32/mshtml/htmlscreen.c
+++ b/reactos/dll/win32/mshtml/htmlscreen.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLScreen IHTMLScreen_iface;
diff --git a/reactos/dll/win32/mshtml/htmlscript.c b/reactos/dll/win32/mshtml/htmlscript.c
index 316795629bd..09f2abebde4 100644
--- a/reactos/dll/win32/mshtml/htmlscript.c
+++ b/reactos/dll/win32/mshtml/htmlscript.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmlselect.c b/reactos/dll/win32/mshtml/htmlselect.c
index 12532d67edc..20cfb1c2e70 100644
--- a/reactos/dll/win32/mshtml/htmlselect.c
+++ b/reactos/dll/win32/mshtml/htmlselect.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/htmlstorage.c b/reactos/dll/win32/mshtml/htmlstorage.c
index 9ad18e50299..d6b11c127b1 100644
--- a/reactos/dll/win32/mshtml/htmlstorage.c
+++ b/reactos/dll/win32/mshtml/htmlstorage.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLStorage IHTMLStorage_iface;
diff --git a/reactos/dll/win32/mshtml/htmlstyle.c b/reactos/dll/win32/mshtml/htmlstyle.c
index e04b608c9fc..374d5bc396d 100644
--- a/reactos/dll/win32/mshtml/htmlstyle.c
+++ b/reactos/dll/win32/mshtml/htmlstyle.c
@@ -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};
diff --git a/reactos/dll/win32/mshtml/htmlstyle2.c b/reactos/dll/win32/mshtml/htmlstyle2.c
index 086a1e4020a..17b09c8f852 100644
--- a/reactos/dll/win32/mshtml/htmlstyle2.c
+++ b/reactos/dll/win32/mshtml/htmlstyle2.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmlstyle3.c b/reactos/dll/win32/mshtml/htmlstyle3.c
index e9fb3ce3a51..5eacf7f3eb7 100644
--- a/reactos/dll/win32/mshtml/htmlstyle3.c
+++ b/reactos/dll/win32/mshtml/htmlstyle3.c
@@ -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)
 {
diff --git a/reactos/dll/win32/mshtml/htmlstyleelem.c b/reactos/dll/win32/mshtml/htmlstyleelem.c
index 3d8c74520db..69ade763df7 100644
--- a/reactos/dll/win32/mshtml/htmlstyleelem.c
+++ b/reactos/dll/win32/mshtml/htmlstyleelem.c
@@ -16,26 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmlstylesheet.c b/reactos/dll/win32/mshtml/htmlstylesheet.c
index 8896ee8c8c7..4ade7c7a5bc 100644
--- a/reactos/dll/win32/mshtml/htmlstylesheet.c
+++ b/reactos/dll/win32/mshtml/htmlstylesheet.c
@@ -16,24 +16,8 @@
  * 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;
     IHTMLStyleSheet IHTMLStyleSheet_iface;
diff --git a/reactos/dll/win32/mshtml/htmltable.c b/reactos/dll/win32/mshtml/htmltable.c
index 31b32c97a31..04bc2ab1542 100644
--- a/reactos/dll/win32/mshtml/htmltable.c
+++ b/reactos/dll/win32/mshtml/htmltable.c
@@ -16,25 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmltablecell.c b/reactos/dll/win32/mshtml/htmltablecell.c
index 66e00f72faf..e18a99cdf7e 100644
--- a/reactos/dll/win32/mshtml/htmltablecell.c
+++ b/reactos/dll/win32/mshtml/htmltablecell.c
@@ -16,24 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmltablerow.c b/reactos/dll/win32/mshtml/htmltablerow.c
index 684e1c5a778..07268e15b5a 100644
--- a/reactos/dll/win32/mshtml/htmltablerow.c
+++ b/reactos/dll/win32/mshtml/htmltablerow.c
@@ -16,25 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmltextarea.c b/reactos/dll/win32/mshtml/htmltextarea.c
index 4d0871cb30c..bade96ebb8d 100644
--- a/reactos/dll/win32/mshtml/htmltextarea.c
+++ b/reactos/dll/win32/mshtml/htmltextarea.c
@@ -16,25 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/htmltextcont.c b/reactos/dll/win32/mshtml/htmltextcont.c
index 3028d8d9b33..ea5f0f915ba 100644
--- a/reactos/dll/win32/mshtml/htmltextcont.c
+++ b/reactos/dll/win32/mshtml/htmltextcont.c
@@ -16,27 +16,8 @@
  * 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)
 {
     return CONTAINING_RECORD(iface, HTMLTextContainer, IHTMLTextContainer_iface);
diff --git a/reactos/dll/win32/mshtml/htmltextnode.c b/reactos/dll/win32/mshtml/htmltextnode.c
index 3908314f584..aea625c7efc 100644
--- a/reactos/dll/win32/mshtml/htmltextnode.c
+++ b/reactos/dll/win32/mshtml/htmltextnode.c
@@ -16,25 +16,8 @@
  * 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;
     IHTMLDOMTextNode IHTMLDOMTextNode_iface;
diff --git a/reactos/dll/win32/mshtml/htmlwindow.c b/reactos/dll/win32/mshtml/htmlwindow.c
index cfc98af35ae..00919bf7aa4 100644
--- a/reactos/dll/win32/mshtml/htmlwindow.c
+++ b/reactos/dll/win32/mshtml/htmlwindow.c
@@ -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 <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);
+#include <exdispid.h>
 
 static struct list window_list = LIST_INIT(window_list);
 
diff --git a/reactos/dll/win32/mshtml/ifacewrap.c b/reactos/dll/win32/mshtml/ifacewrap.c
index 060db4a0242..24edf9dff7e 100644
--- a/reactos/dll/win32/mshtml/ifacewrap.c
+++ b/reactos/dll/win32/mshtml/ifacewrap.c
@@ -16,26 +16,8 @@
  * 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
  * us to return external interface from our QI implementation preserving COM rules.
diff --git a/reactos/dll/win32/mshtml/ipwindow.c b/reactos/dll/win32/mshtml/ipwindow.c
index 1dd2cb9ca50..a110998ebf1 100644
--- a/reactos/dll/win32/mshtml/ipwindow.c
+++ b/reactos/dll/win32/mshtml/ipwindow.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/lang/Bg.rc b/reactos/dll/win32/mshtml/lang/Bg.rc
index 458caacf3c8..eb25376d913 100644
--- a/reactos/dll/win32/mshtml/lang/Bg.rc
+++ b/reactos/dll/win32/mshtml/lang/Bg.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Da.rc b/reactos/dll/win32/mshtml/lang/Da.rc
index 805a5dcd049..19efe336181 100644
--- a/reactos/dll/win32/mshtml/lang/Da.rc
+++ b/reactos/dll/win32/mshtml/lang/Da.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/mshtml/lang/De.rc b/reactos/dll/win32/mshtml/lang/De.rc
index a1a9f3e7533..6b761a64e85 100644
--- a/reactos/dll/win32/mshtml/lang/De.rc
+++ b/reactos/dll/win32/mshtml/lang/De.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/dll/win32/mshtml/lang/En.rc b/reactos/dll/win32/mshtml/lang/En.rc
index 10ffa7fa490..a0ccd75d7cc 100644
--- a/reactos/dll/win32/mshtml/lang/En.rc
+++ b/reactos/dll/win32/mshtml/lang/En.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Es.rc b/reactos/dll/win32/mshtml/lang/Es.rc
index 0f7d9da9128..6363f9a4ba2 100644
--- a/reactos/dll/win32/mshtml/lang/Es.rc
+++ b/reactos/dll/win32/mshtml/lang/Es.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Fi.rc b/reactos/dll/win32/mshtml/lang/Fi.rc
index 8148cc60e4d..5d3e2fef406 100644
--- a/reactos/dll/win32/mshtml/lang/Fi.rc
+++ b/reactos/dll/win32/mshtml/lang/Fi.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Fr.rc b/reactos/dll/win32/mshtml/lang/Fr.rc
index 937523af0bb..7862c0be875 100644
--- a/reactos/dll/win32/mshtml/lang/Fr.rc
+++ b/reactos/dll/win32/mshtml/lang/Fr.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/He.rc b/reactos/dll/win32/mshtml/lang/He.rc
index b08384966b9..8c2dc2f9ca7 100644
--- a/reactos/dll/win32/mshtml/lang/He.rc
+++ b/reactos/dll/win32/mshtml/lang/He.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Hu.rc b/reactos/dll/win32/mshtml/lang/Hu.rc
index d5dfc6f70a3..e17589b0a6f 100644
--- a/reactos/dll/win32/mshtml/lang/Hu.rc
+++ b/reactos/dll/win32/mshtml/lang/Hu.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/It.rc b/reactos/dll/win32/mshtml/lang/It.rc
index 37c4e1d3159..23ad33fb69e 100644
--- a/reactos/dll/win32/mshtml/lang/It.rc
+++ b/reactos/dll/win32/mshtml/lang/It.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /*UTF-8*/
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/Ja.rc b/reactos/dll/win32/mshtml/lang/Ja.rc
index e54a683a160..d2c519b900b 100644
--- a/reactos/dll/win32/mshtml/lang/Ja.rc
+++ b/reactos/dll/win32/mshtml/lang/Ja.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/Ko.rc b/reactos/dll/win32/mshtml/lang/Ko.rc
index 8464b1acde7..f7c76423644 100644
--- a/reactos/dll/win32/mshtml/lang/Ko.rc
+++ b/reactos/dll/win32/mshtml/lang/Ko.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Lt.rc b/reactos/dll/win32/mshtml/lang/Lt.rc
index b8184fcef9a..af08a0396cc 100644
--- a/reactos/dll/win32/mshtml/lang/Lt.rc
+++ b/reactos/dll/win32/mshtml/lang/Lt.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/Nl.rc b/reactos/dll/win32/mshtml/lang/Nl.rc
index 6139a1204fb..a62b52ddec7 100644
--- a/reactos/dll/win32/mshtml/lang/Nl.rc
+++ b/reactos/dll/win32/mshtml/lang/Nl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/No.rc b/reactos/dll/win32/mshtml/lang/No.rc
index 77b133763cf..458d7316bab 100644
--- a/reactos/dll/win32/mshtml/lang/No.rc
+++ b/reactos/dll/win32/mshtml/lang/No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
diff --git a/reactos/dll/win32/mshtml/lang/Pl.rc b/reactos/dll/win32/mshtml/lang/Pl.rc
index 078fefc6bd9..b41d20249f1 100644
--- a/reactos/dll/win32/mshtml/lang/Pl.rc
+++ b/reactos/dll/win32/mshtml/lang/Pl.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Pt.rc b/reactos/dll/win32/mshtml/lang/Pt.rc
index 15cccaff3f8..c3492057c0a 100644
--- a/reactos/dll/win32/mshtml/lang/Pt.rc
+++ b/reactos/dll/win32/mshtml/lang/Pt.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
diff --git a/reactos/dll/win32/mshtml/lang/Ro.rc b/reactos/dll/win32/mshtml/lang/Ro.rc
index cd1c45d2df8..10fe0a2d0ce 100644
--- a/reactos/dll/win32/mshtml/lang/Ro.rc
+++ b/reactos/dll/win32/mshtml/lang/Ro.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/dll/win32/mshtml/lang/Ru.rc b/reactos/dll/win32/mshtml/lang/Ru.rc
index 406207a5c73..e40006c451d 100644
--- a/reactos/dll/win32/mshtml/lang/Ru.rc
+++ b/reactos/dll/win32/mshtml/lang/Ru.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/Si.rc b/reactos/dll/win32/mshtml/lang/Si.rc
index 27b28a00f48..8c7d8d4222d 100644
--- a/reactos/dll/win32/mshtml/lang/Si.rc
+++ b/reactos/dll/win32/mshtml/lang/Si.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/mshtml/lang/Sv.rc b/reactos/dll/win32/mshtml/lang/Sv.rc
index bc5dbd7dd61..b07f2b2f17a 100644
--- a/reactos/dll/win32/mshtml/lang/Sv.rc
+++ b/reactos/dll/win32/mshtml/lang/Sv.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Tr.rc b/reactos/dll/win32/mshtml/lang/Tr.rc
index e757a5b3f3c..5d25ec6afbc 100644
--- a/reactos/dll/win32/mshtml/lang/Tr.rc
+++ b/reactos/dll/win32/mshtml/lang/Tr.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
diff --git a/reactos/dll/win32/mshtml/lang/Uk.rc b/reactos/dll/win32/mshtml/lang/Uk.rc
index d919d946f56..3defa4ae9c5 100644
--- a/reactos/dll/win32/mshtml/lang/Uk.rc
+++ b/reactos/dll/win32/mshtml/lang/Uk.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/dll/win32/mshtml/lang/Zh.rc b/reactos/dll/win32/mshtml/lang/Zh.rc
index d8a67bc1f98..7a151006ed0 100644
--- a/reactos/dll/win32/mshtml/lang/Zh.rc
+++ b/reactos/dll/win32/mshtml/lang/Zh.rc
@@ -19,8 +19,6 @@
  * 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)
 
diff --git a/reactos/dll/win32/mshtml/loadopts.c b/reactos/dll/win32/mshtml/loadopts.c
index 9d3e22ea938..8239286f1ca 100644
--- a/reactos/dll/win32/mshtml/loadopts.c
+++ b/reactos/dll/win32/mshtml/loadopts.c
@@ -16,28 +16,8 @@
  * 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;
     PVOID buffer;
diff --git a/reactos/dll/win32/mshtml/main.c b/reactos/dll/win32/mshtml/main.c
index c96f10633ca..b2696a09424 100644
--- a/reactos/dll/win32/mshtml/main.c
+++ b/reactos/dll/win32/mshtml/main.c
@@ -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 <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 <advpub.h>
+#include <rpcproxy.h>
+#include <initguid.h>
 
 HINSTANCE hInst;
 DWORD mshtml_tls = TLS_OUT_OF_INDEXES;
diff --git a/reactos/dll/win32/mshtml/mshtml_private.h b/reactos/dll/win32/mshtml/mshtml_private.h
index b7d8a49e55d..a1644ea6dfc 100644
--- a/reactos/dll/win32/mshtml/mshtml_private.h
+++ b/reactos/dll/win32/mshtml/mshtml_private.h
@@ -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 @@ HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN;
 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"
diff --git a/reactos/dll/win32/mshtml/mutation.c b/reactos/dll/win32/mshtml/mutation.c
index 62735c00e9b..0b5be218d1e 100644
--- a/reactos/dll/win32/mshtml/mutation.c
+++ b/reactos/dll/win32/mshtml/mutation.c
@@ -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
diff --git a/reactos/dll/win32/mshtml/navigate.c b/reactos/dll/win32/mshtml/navigate.c
index f7f7af7a1a4..127451a9577 100644
--- a/reactos/dll/win32/mshtml/navigate.c
+++ b/reactos/dll/win32/mshtml/navigate.c
@@ -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 <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 <hlguids.h>
+#include <htiface.h>
 
 #define CONTENT_LENGTH "Content-Length"
 #define UTF8_STR "utf-8"
diff --git a/reactos/dll/win32/mshtml/npplugin.c b/reactos/dll/win32/mshtml/npplugin.c
index 10bde6d0814..e4c777a70ce 100644
--- a/reactos/dll/win32/mshtml/npplugin.c
+++ b/reactos/dll/win32/mshtml/npplugin.c
@@ -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 */
 
diff --git a/reactos/dll/win32/mshtml/nsembed.c b/reactos/dll/win32/mshtml/nsembed.c
index 57d2ff2b18f..f9652e9118e 100644
--- a/reactos/dll/win32/mshtml/nsembed.c
+++ b/reactos/dll/win32/mshtml/nsembed.c
@@ -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 "@mozilla.org/embedcomp/appstartup-notifier;1"
diff --git a/reactos/dll/win32/mshtml/nsevents.c b/reactos/dll/win32/mshtml/nsevents.c
index bfd2f8b54e7..740d5a2e3b4 100644
--- a/reactos/dll/win32/mshtml/nsevents.c
+++ b/reactos/dll/win32/mshtml/nsevents.c
@@ -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};
diff --git a/reactos/dll/win32/mshtml/nsio.c b/reactos/dll/win32/mshtml/nsio.c
index 07b20e477ce..b035037a817 100644
--- a/reactos/dll/win32/mshtml/nsio.c
+++ b/reactos/dll/win32/mshtml/nsio.c
@@ -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 "@mozilla.org/network/io-service;1"
diff --git a/reactos/dll/win32/mshtml/nsservice.c b/reactos/dll/win32/mshtml/nsservice.c
index bbe09ff5858..a37326610f3 100644
--- a/reactos/dll/win32/mshtml/nsservice.c
+++ b/reactos/dll/win32/mshtml/nsservice.c
@@ -16,27 +16,8 @@
  * 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 "@mozilla.org/embedcomp/prompt-service;1"
 #define NS_TOOLTIPTEXTPROVIDER_CONTRACTID "@mozilla.org/embedcomp/tooltiptextprovider;1"
 
diff --git a/reactos/dll/win32/mshtml/olecmd.c b/reactos/dll/win32/mshtml/olecmd.c
index ae8c4d5de31..0a409c862d2 100644
--- a/reactos/dll/win32/mshtml/olecmd.c
+++ b/reactos/dll/win32/mshtml/olecmd.c
@@ -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"
 
diff --git a/reactos/dll/win32/mshtml/oleobj.c b/reactos/dll/win32/mshtml/oleobj.c
index 3a69b1c2593..5851abdcde4 100644
--- a/reactos/dll/win32/mshtml/oleobj.c
+++ b/reactos/dll/win32/mshtml/oleobj.c
@@ -16,31 +16,8 @@
  * 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
 
 typedef struct {
diff --git a/reactos/dll/win32/mshtml/olewnd.c b/reactos/dll/win32/mshtml/olewnd.c
index f58db87602b..3a9916d9e11 100644
--- a/reactos/dll/win32/mshtml/olewnd.c
+++ b/reactos/dll/win32/mshtml/olewnd.c
@@ -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
diff --git a/reactos/dll/win32/mshtml/omnavigator.c b/reactos/dll/win32/mshtml/omnavigator.c
index 95528b1f405..5bb23c75c38 100644
--- a/reactos/dll/win32/mshtml/omnavigator.c
+++ b/reactos/dll/win32/mshtml/omnavigator.c
@@ -16,24 +16,8 @@
  * 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 */
 static INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags )
diff --git a/reactos/dll/win32/mshtml/persist.c b/reactos/dll/win32/mshtml/persist.c
index 6d2b041db08..df918243984 100644
--- a/reactos/dll/win32/mshtml/persist.c
+++ b/reactos/dll/win32/mshtml/persist.c
@@ -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
diff --git a/reactos/dll/win32/mshtml/pluginhost.c b/reactos/dll/win32/mshtml/pluginhost.c
index 7a0daf5dcf1..02838ce1e3f 100644
--- a/reactos/dll/win32/mshtml/pluginhost.c
+++ b/reactos/dll/win32/mshtml/pluginhost.c
@@ -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}};
diff --git a/reactos/dll/win32/mshtml/propbag.c b/reactos/dll/win32/mshtml/propbag.c
index e764b4935a6..d0595d0740f 100644
--- a/reactos/dll/win32/mshtml/propbag.c
+++ b/reactos/dll/win32/mshtml/propbag.c
@@ -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;
diff --git a/reactos/dll/win32/mshtml/protocol.c b/reactos/dll/win32/mshtml/protocol.c
index a8b65c07df5..c2bff8d5b5b 100644
--- a/reactos/dll/win32/mshtml/protocol.c
+++ b/reactos/dll/win32/mshtml/protocol.c
@@ -16,27 +16,8 @@
  * 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
  */
diff --git a/reactos/dll/win32/mshtml/resource.h b/reactos/dll/win32/mshtml/resource.h
index 96e4920553f..49f4feb953e 100644
--- a/reactos/dll/win32/mshtml/resource.h
+++ b/reactos/dll/win32/mshtml/resource.h
@@ -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
 
diff --git a/reactos/dll/win32/mshtml/rsrc.rc b/reactos/dll/win32/mshtml/rsrc.rc
index c8a4f8f50d0..21756910cb6 100644
--- a/reactos/dll/win32/mshtml/rsrc.rc
+++ b/reactos/dll/win32/mshtml/rsrc.rc
@@ -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"
 
diff --git a/reactos/dll/win32/mshtml/script.c b/reactos/dll/win32/mshtml/script.c
index 6284064d471..7df602b0c8b 100644
--- a/reactos/dll/win32/mshtml/script.c
+++ b/reactos/dll/win32/mshtml/script.c
@@ -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 <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);
+#include <activdbg.h>
 
 #ifdef _WIN64
 
diff --git a/reactos/dll/win32/mshtml/secmgr.c b/reactos/dll/win32/mshtml/secmgr.c
index d7f0c98215d..083f41b3580 100644
--- a/reactos/dll/win32/mshtml/secmgr.c
+++ b/reactos/dll/win32/mshtml/secmgr.c
@@ -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 <activscp.h>
-
-#include <wine/debug.h>
-
 #include "mshtml_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
+#include <activscp.h>
 
 static const WCHAR about_blankW[] = {'a','b','o','u','t',':','b','l','a','n','k',0};
 
diff --git a/reactos/dll/win32/mshtml/selection.c b/reactos/dll/win32/mshtml/selection.c
index 5d74d291490..86ac26fb24b 100644
--- a/reactos/dll/win32/mshtml/selection.c
+++ b/reactos/dll/win32/mshtml/selection.c
@@ -16,24 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/service.c b/reactos/dll/win32/mshtml/service.c
index fdf1fdac8e4..e40cc6d12f0 100644
--- a/reactos/dll/win32/mshtml/service.c
+++ b/reactos/dll/win32/mshtml/service.c
@@ -16,27 +16,8 @@
  * 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;
 
diff --git a/reactos/dll/win32/mshtml/task.c b/reactos/dll/win32/mshtml/task.c
index 6942c4fadf1..8c059d8bdcd 100644
--- a/reactos/dll/win32/mshtml/task.c
+++ b/reactos/dll/win32/mshtml/task.c
@@ -16,28 +16,8 @@
  * 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
 
diff --git a/reactos/dll/win32/mshtml/txtrange.c b/reactos/dll/win32/mshtml/txtrange.c
index b4cd9b1ac54..3d7facbdf25 100644
--- a/reactos/dll/win32/mshtml/txtrange.c
+++ b/reactos/dll/win32/mshtml/txtrange.c
@@ -16,25 +16,8 @@
  * 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};
 
diff --git a/reactos/dll/win32/mshtml/view.c b/reactos/dll/win32/mshtml/view.c
index f1c0819a7df..bfc6412a485 100644
--- a/reactos/dll/win32/mshtml/view.c
+++ b/reactos/dll/win32/mshtml/view.c
@@ -16,29 +16,8 @@
  * 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
 
 static const WCHAR wszInternetExplorer_Server[] =