From 13ceeb7415250e1d27fd986d63fe661617ec10aa Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 26 Dec 2013 12:57:01 +0000
Subject: [PATCH] [MSXML3] * Create a main header and move some inclusions to
 it. * Set the default debugging channel globally through the main header. *
 Remove inclusions and definitions that already exist in the main header.
 CORE-7716

svn path=/trunk/; revision=61424
---
 reactos/dll/win32/msxml3/attribute.c   | 26 +--------------------
 reactos/dll/win32/msxml3/bsc.c         | 26 +--------------------
 reactos/dll/win32/msxml3/cdata.c       | 25 +-------------------
 reactos/dll/win32/msxml3/comment.c     | 25 +-------------------
 reactos/dll/win32/msxml3/dispex.c      | 32 ++------------------------
 reactos/dll/win32/msxml3/docfrag.c     | 25 +-------------------
 reactos/dll/win32/msxml3/doctype.c     | 26 +--------------------
 reactos/dll/win32/msxml3/domdoc.c      | 27 ++--------------------
 reactos/dll/win32/msxml3/domimpl.c     | 25 +-------------------
 reactos/dll/win32/msxml3/element.c     | 26 +--------------------
 reactos/dll/win32/msxml3/entityref.c   | 25 +-------------------
 reactos/dll/win32/msxml3/factory.c     | 15 +++++-------
 reactos/dll/win32/msxml3/httprequest.c | 27 +---------------------
 reactos/dll/win32/msxml3/main.c        | 21 +----------------
 reactos/dll/win32/msxml3/mxnamespace.c | 26 +--------------------
 reactos/dll/win32/msxml3/mxwriter.c    | 23 +-----------------
 reactos/dll/win32/msxml3/node.c        | 24 +------------------
 reactos/dll/win32/msxml3/nodelist.c    | 24 +------------------
 reactos/dll/win32/msxml3/nodemap.c     | 25 +-------------------
 reactos/dll/win32/msxml3/parseerror.c  | 26 +--------------------
 reactos/dll/win32/msxml3/pi.c          | 25 +-------------------
 reactos/dll/win32/msxml3/precomp.h     | 26 +++++++++++++++++++++
 reactos/dll/win32/msxml3/saxreader.c   | 26 +--------------------
 reactos/dll/win32/msxml3/schema.c      | 27 ++--------------------
 reactos/dll/win32/msxml3/selection.c   | 22 +-----------------
 reactos/dll/win32/msxml3/stylesheet.c  | 25 +-------------------
 reactos/dll/win32/msxml3/text.c        | 22 +-----------------
 reactos/dll/win32/msxml3/uuid.c        |  5 ++--
 reactos/dll/win32/msxml3/xdr.c         |  7 ++----
 reactos/dll/win32/msxml3/xmldoc.c      | 25 +-------------------
 reactos/dll/win32/msxml3/xmlelem.c     | 26 +--------------------
 reactos/dll/win32/msxml3/xmlparser.c   | 25 +-------------------
 reactos/dll/win32/msxml3/xmlview.c     | 25 +-------------------
 33 files changed, 68 insertions(+), 717 deletions(-)
 create mode 100644 reactos/dll/win32/msxml3/precomp.h

diff --git a/reactos/dll/win32/msxml3/attribute.c b/reactos/dll/win32/msxml3/attribute.c
index b74e7183d9f..707e59614fa 100644
--- a/reactos/dll/win32/msxml3/attribute.c
+++ b/reactos/dll/win32/msxml3/attribute.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/HTMLtree.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/bsc.c b/reactos/dll/win32/msxml3/bsc.c
index 999a83ae141..2bfce0aff38 100644
--- a/reactos/dll/win32/msxml3/bsc.c
+++ b/reactos/dll/win32/msxml3/bsc.c
@@ -16,36 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
 #include <wininet.h>
-//#include "urlmon.h"
 #include <winreg.h>
 #include <shlwapi.h>
 
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 struct bsc_t {
     IBindStatusCallback IBindStatusCallback_iface;
 
diff --git a/reactos/dll/win32/msxml3/cdata.c b/reactos/dll/win32/msxml3/cdata.c
index b8d099f4347..91e90478de9 100644
--- a/reactos/dll/win32/msxml3/cdata.c
+++ b/reactos/dll/win32/msxml3/cdata.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/comment.c b/reactos/dll/win32/msxml3/comment.c
index 77440a5f0f4..6df3082ecd4 100644
--- a/reactos/dll/win32/msxml3/comment.c
+++ b/reactos/dll/win32/msxml3/comment.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/dispex.c b/reactos/dll/win32/msxml3/dispex.c
index 9eb5ae33e5b..427f9601f9f 100644
--- a/reactos/dll/win32/msxml3/dispex.c
+++ b/reactos/dll/win32/msxml3/dispex.c
@@ -16,37 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
-//#include "wininet.h"
-//#include "urlmon.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
-#include <wine/list.h>
-//#include "wine/unicode.h"
-
-#include "msxml_private.h"
+#include "precomp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include <wine/list.h>
 
 static CRITICAL_SECTION cs_dispex_static_data;
 static CRITICAL_SECTION_DEBUG cs_dispex_static_data_dbg =
diff --git a/reactos/dll/win32/msxml3/docfrag.c b/reactos/dll/win32/msxml3/docfrag.c
index 0e9d0a1f2f0..11534c7048b 100644
--- a/reactos/dll/win32/msxml3/docfrag.c
+++ b/reactos/dll/win32/msxml3/docfrag.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/doctype.c b/reactos/dll/win32/msxml3/doctype.c
index ec1b842a498..17fed13d889 100644
--- a/reactos/dll/win32/msxml3/doctype.c
+++ b/reactos/dll/win32/msxml3/doctype.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c
index 03937d953b2..36d65731402 100644
--- a/reactos/dll/win32/msxml3/domdoc.c
+++ b/reactos/dll/win32/msxml3/domdoc.c
@@ -19,45 +19,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <config.h>
-
-//#include <stdarg.h>
 #include <assert.h>
+
 #ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
 # include <libxml/xpathInternals.h>
 # include <libxml/xmlsave.h>
 # include <libxml/SAX2.h>
 # include <libxml/parserInternals.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
 #include <olectl.h>
-#include <msxml6.h>
-//#include "wininet.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-//#include "ocidl.h"
 #include <objsafe.h>
 
-#include <wine/debug.h>
 #include <wine/list.h>
 
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 /* not defined in older versions */
diff --git a/reactos/dll/win32/msxml3/domimpl.c b/reactos/dll/win32/msxml3/domimpl.c
index c19dc0e505d..5cb8df72a91 100644
--- a/reactos/dll/win32/msxml3/domimpl.c
+++ b/reactos/dll/win32/msxml3/domimpl.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/element.c b/reactos/dll/win32/msxml3/element.c
index d507b77ee49..120530c800c 100644
--- a/reactos/dll/win32/msxml3/element.c
+++ b/reactos/dll/win32/msxml3/element.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/entityref.c b/reactos/dll/win32/msxml3/entityref.c
index 57a6d3aedf0..4946d70e802 100644
--- a/reactos/dll/win32/msxml3/entityref.c
+++ b/reactos/dll/win32/msxml3/entityref.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/factory.c b/reactos/dll/win32/msxml3/factory.c
index f22d08e23cd..cb9ac32d3ca 100644
--- a/reactos/dll/win32/msxml3/factory.c
+++ b/reactos/dll/win32/msxml3/factory.c
@@ -19,25 +19,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
 #include <config.h>
 
-//#include <stdarg.h>
 #ifdef HAVE_LIBXML2
 # include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
 #endif
 
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
 #include <ole2.h>
-//#include "msxml.h"
 #include <msxml2.h>
+
 #include "xmlparser.h"
 
 /* undef the #define in msxml2 so that we can access the v.2 version
diff --git a/reactos/dll/win32/msxml3/httprequest.c b/reactos/dll/win32/msxml3/httprequest.c
index 5dbb4cb64f0..992dad0a8ca 100644
--- a/reactos/dll/win32/msxml3/httprequest.c
+++ b/reactos/dll/win32/msxml3/httprequest.c
@@ -19,41 +19,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/encoding.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
 #include <wingdi.h>
 #include <wininet.h>
-#include <winreg.h>
-//#include "winuser.h"
-#include <ole2.h>
 #include <mshtml.h>
-#include <msxml6.h>
 #include <objsafe.h>
 #include <docobj.h>
-#include <shlwapi.h>
-
-#include "msxml_private.h"
 
-#include <wine/debug.h>
 #include <wine/list.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 static const WCHAR colspaceW[] = {':',' ',0};
diff --git a/reactos/dll/win32/msxml3/main.c b/reactos/dll/win32/msxml3/main.c
index 25ff33e5cbb..939743f744e 100644
--- a/reactos/dll/win32/msxml3/main.c
+++ b/reactos/dll/win32/msxml3/main.c
@@ -19,18 +19,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <config.h>
 #include <wine/port.h>
 
-#define COBJMACROS
-
-//#include <stdarg.h>
 #ifdef HAVE_LIBXML2
-//# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
 # ifdef SONAME_LIBXSLT
 #  ifdef HAVE_LIBXSLT_PATTERN_H
 #   include <libxslt/pattern.h>
@@ -43,22 +36,10 @@
 # endif
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
 #include <rpcproxy.h>
-//#include "msxml.h"
-#include <msxml6.h>
 
-//#include "wine/unicode.h"
-#include <wine/debug.h>
 #include <wine/library.h>
 
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 HINSTANCE MSXML_hInstance = NULL;
 
 #ifdef HAVE_LIBXML2
diff --git a/reactos/dll/win32/msxml3/mxnamespace.c b/reactos/dll/win32/msxml3/mxnamespace.c
index f72bf6904f4..db021b9f12d 100644
--- a/reactos/dll/win32/msxml3/mxnamespace.c
+++ b/reactos/dll/win32/msxml3/mxnamespace.c
@@ -18,34 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/encoding.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
 #include <wine/list.h>
 
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 struct ns
 {
     BSTR prefix;
diff --git a/reactos/dll/win32/msxml3/mxwriter.c b/reactos/dll/win32/msxml3/mxwriter.c
index 324fd8dd653..6aad6c6c9d0 100644
--- a/reactos/dll/win32/msxml3/mxwriter.c
+++ b/reactos/dll/win32/msxml3/mxwriter.c
@@ -19,28 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-#include <ole2.h>
-
-#include <msxml6.h>
-
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 static const WCHAR emptyW[] = {0};
 static const WCHAR spaceW[] = {' '};
diff --git a/reactos/dll/win32/msxml3/node.c b/reactos/dll/win32/msxml3/node.c
index 53efb61cc43..b9f79dbc0af 100644
--- a/reactos/dll/win32/msxml3/node.c
+++ b/reactos/dll/win32/msxml3/node.c
@@ -18,18 +18,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#include <config.h>
-
-#define COBJMACROS
-
-//#include <stdarg.h>
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
-//# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
 # include <libxml/HTMLtree.h>
 # ifdef SONAME_LIBXSLT
 #  ifdef HAVE_LIBXSLT_PATTERN_H
@@ -43,19 +34,6 @@
 # endif
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 #ifdef SONAME_LIBXSLT
diff --git a/reactos/dll/win32/msxml3/nodelist.c b/reactos/dll/win32/msxml3/nodelist.c
index 994d5b93921..171d2a37a0d 100644
--- a/reactos/dll/win32/msxml3/nodelist.c
+++ b/reactos/dll/win32/msxml3/nodelist.c
@@ -18,30 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
 #include <msxml2did.h>
 
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
 /* This file implements the object returned by childNodes property. Note that this is
  * not the IXMLDOMNodeList returned by XPath queries - it's implemented in selection.c.
  * They are different because the list returned by childNodes:
@@ -51,8 +31,6 @@
  *    thus the child is inaccessible by an XPath query
  */
 
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 typedef struct
diff --git a/reactos/dll/win32/msxml3/nodemap.c b/reactos/dll/win32/msxml3/nodemap.c
index 61982ae6ed1..9924d8c5342 100644
--- a/reactos/dll/win32/msxml3/nodemap.c
+++ b/reactos/dll/win32/msxml3/nodemap.c
@@ -18,33 +18,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <config.h>
-
-#define COBJMACROS
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
 #include <msxml2did.h>
 
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 typedef struct
diff --git a/reactos/dll/win32/msxml3/parseerror.c b/reactos/dll/win32/msxml3/parseerror.c
index 91abf5df0f6..100c86a0d86 100644
--- a/reactos/dll/win32/msxml3/parseerror.c
+++ b/reactos/dll/win32/msxml3/parseerror.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 typedef struct
 {
diff --git a/reactos/dll/win32/msxml3/pi.c b/reactos/dll/win32/msxml3/pi.c
index e846e32be6c..a51029964c1 100644
--- a/reactos/dll/win32/msxml3/pi.c
+++ b/reactos/dll/win32/msxml3/pi.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/precomp.h b/reactos/dll/win32/msxml3/precomp.h
new file mode 100644
index 00000000000..89cd273d282
--- /dev/null
+++ b/reactos/dll/win32/msxml3/precomp.h
@@ -0,0 +1,26 @@
+#ifndef _MSXML3_PCH_
+#define _MSXML3_PCH_
+
+#include <config.h>
+
+#ifdef HAVE_LIBXML2
+# include <libxml/parser.h>
+#endif
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <ole2.h>
+#include <msxml6.h>
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+#include "msxml_private.h"
+
+#endif /* _MSXML3_PCH_ */
diff --git a/reactos/dll/win32/msxml3/saxreader.c b/reactos/dll/win32/msxml3/saxreader.c
index 241f681a59c..3a02dc971e1 100644
--- a/reactos/dll/win32/msxml3/saxreader.c
+++ b/reactos/dll/win32/msxml3/saxreader.c
@@ -18,39 +18,15 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
 
-#define COBJMACROS
+#include "precomp.h"
 
-#include <config.h>
-
-//#include <stdarg.h>
 #ifdef HAVE_LIBXML2
-//# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/SAX2.h>
 # include <libxml/parserInternals.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winnls.h"
-#include <ole2.h>
-#include <msxml6.h>
-//#include "wininet.h"
-//#include "urlmon.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-
-#include <wine/debug.h>
 #include <wine/list.h>
 
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 typedef enum
diff --git a/reactos/dll/win32/msxml3/schema.c b/reactos/dll/win32/msxml3/schema.c
index f00ba3a3b45..b491890c8f4 100644
--- a/reactos/dll/win32/msxml3/schema.c
+++ b/reactos/dll/win32/msxml3/schema.c
@@ -19,40 +19,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
+#include "precomp.h"
 
 #include <assert.h>
-//#include <stdarg.h>
+
 #ifdef HAVE_LIBXML2
-//# include <libxml/xmlerror.h>
-//# include <libxml/tree.h>
 # include <libxml/xmlschemas.h>
 # include <libxml/schemasInternals.h>
-//# include <libxml/hash.h>
-//# include <libxml/parser.h>
 # include <libxml/parserInternals.h>
-//# include <libxml/xmlIO.h>
-//# include <libxml/xmlversion.h>
 # include <libxml/xpath.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 /* We use a chained hashtable, which can hold any number of schemas
  * TODO: grow/shrink hashtable depending on load factor
  * TODO: implement read-only where appropriate
diff --git a/reactos/dll/win32/msxml3/selection.c b/reactos/dll/win32/msxml3/selection.c
index eeb7203aab1..01fc8476ca9 100644
--- a/reactos/dll/win32/msxml3/selection.c
+++ b/reactos/dll/win32/msxml3/selection.c
@@ -20,32 +20,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
 #ifdef HAVE_LIBXML2
-//# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/xpath.h>
 # include <libxml/xpathInternals.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
 #include <msxml2did.h>
 
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
 /* This file implements the object returned by a XPath query. Note that this is
  * not the IXMLDOMNodeList returned by childNodes - it's implemented in nodelist.c.
  * They are different because the list returned by XPath queries:
@@ -55,8 +37,6 @@
  *
  */
 
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 int registerNamespaces(xmlXPathContextPtr ctxt);
diff --git a/reactos/dll/win32/msxml3/stylesheet.c b/reactos/dll/win32/msxml3/stylesheet.c
index 3c85de36441..d9543a90c2d 100644
--- a/reactos/dll/win32/msxml3/stylesheet.c
+++ b/reactos/dll/win32/msxml3/stylesheet.c
@@ -18,30 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 typedef struct
 {
diff --git a/reactos/dll/win32/msxml3/text.c b/reactos/dll/win32/msxml3/text.c
index 68a40085f3a..b412ff4c25c 100644
--- a/reactos/dll/win32/msxml3/text.c
+++ b/reactos/dll/win32/msxml3/text.c
@@ -19,32 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
 #ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
 # include <libxml/parserInternals.h>
-//# include <libxml/xmlerror.h>
 #endif
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 #ifdef HAVE_LIBXML2
 
 typedef struct _domtext
diff --git a/reactos/dll/win32/msxml3/uuid.c b/reactos/dll/win32/msxml3/uuid.c
index 0fcedc20260..f0d83b4e506 100644
--- a/reactos/dll/win32/msxml3/uuid.c
+++ b/reactos/dll/win32/msxml3/uuid.c
@@ -31,14 +31,13 @@
 
 #include <windef.h>
 #include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
+#include <objbase.h>
 
 /*
  * First include the version 2 headers so that we don't redefine their
  * uuids - they're already in libuuid
  */
-//#include "msxml.h"
+#include <msxml.h>
 
 /* Now we can initialize the rest of the uuids */
 #include <initguid.h>
diff --git a/reactos/dll/win32/msxml3/xdr.c b/reactos/dll/win32/msxml3/xdr.c
index 9abee989391..53783c30cd1 100644
--- a/reactos/dll/win32/msxml3/xdr.c
+++ b/reactos/dll/win32/msxml3/xdr.c
@@ -19,17 +19,14 @@
  */
 
 
-#include <config.h>
+#include "precomp.h"
 
 #include <assert.h>
+
 #ifdef HAVE_LIBXML2
 # include <libxml/tree.h>
 #endif
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 /* Both XDR and XSD are valid XML
  * We just convert the doc tree, no need for a parser.
  */
diff --git a/reactos/dll/win32/msxml3/xmldoc.c b/reactos/dll/win32/msxml3/xmldoc.c
index 3bb300480d0..f33b508a776 100644
--- a/reactos/dll/win32/msxml3/xmldoc.c
+++ b/reactos/dll/win32/msxml3/xmldoc.c
@@ -18,34 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
 #include <wininet.h>
 #include <winreg.h>
 #include <shlwapi.h>
-//#include "ocidl.h"
-
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/xmlelem.c b/reactos/dll/win32/msxml3/xmlelem.c
index 830e6721501..dd9f8e648aa 100644
--- a/reactos/dll/win32/msxml3/xmlelem.c
+++ b/reactos/dll/win32/msxml3/xmlelem.c
@@ -18,31 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-//#include "ocidl.h"
-
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include "precomp.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/reactos/dll/win32/msxml3/xmlparser.c b/reactos/dll/win32/msxml3/xmlparser.c
index 7807ea1b309..1d116125eba 100644
--- a/reactos/dll/win32/msxml3/xmlparser.c
+++ b/reactos/dll/win32/msxml3/xmlparser.c
@@ -17,35 +17,12 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
 
-#define COBJMACROS
-
-#include <config.h>
-
-//#include <stdarg.h>
-#ifdef HAVE_LIBXML2
-# include <libxml/parser.h>
-//# include <libxml/xmlerror.h>
-//# include <libxml/HTMLtree.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-#include <ole2.h>
-#include <msxml6.h>
-
-#include "msxml_private.h"
+#include "precomp.h"
 
 #include <initguid.h>
 #include "xmlparser.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 typedef struct _xmlparser
 {
     IXMLParser IXMLParser_iface;
diff --git a/reactos/dll/win32/msxml3/xmlview.c b/reactos/dll/win32/msxml3/xmlview.c
index 17ad84aed80..ce5467af190 100644
--- a/reactos/dll/win32/msxml3/xmlview.c
+++ b/reactos/dll/win32/msxml3/xmlview.c
@@ -16,35 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
+#include "precomp.h"
 
-#include <config.h>
-
-//#include <stdarg.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
-#ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
-#endif
-
-#include <windef.h>
-#include <winbase.h>
 #include <wingdi.h>
-#include <ole2.h>
-#include <msxml6.h>
 #include <mshtml.h>
 #include <mshtmhst.h>
 #include <perhist.h>
-//#include "docobj.h"
-
-#include <wine/debug.h>
-
-#include "msxml_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
 #ifdef HAVE_LIBXML2
 
-- 
2.17.1