From 6e7e5845895d11b0c52a1769ba917eca0dcfaa10 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Fri, 24 Jan 2014 20:15:05 +0000
Subject: [PATCH] [MSXML3] * Move some inclusions to the main header. CORE-7716

svn path=/trunk/; revision=61792
---
 reactos/dll/win32/msxml3/bsc.c            | 4 ----
 reactos/dll/win32/msxml3/dispex.c         | 2 --
 reactos/dll/win32/msxml3/domdoc.c         | 2 --
 reactos/dll/win32/msxml3/httprequest.c    | 3 ---
 reactos/dll/win32/msxml3/mxnamespace.c    | 2 --
 reactos/dll/win32/msxml3/precomp.h        | 7 ++++++-
 reactos/dll/win32/msxml3/saxreader.c      | 2 --
 reactos/dll/win32/msxml3/xmldoc.c         | 4 ----
 reactos/dll/win32/msxml3/xslpattern.tab.c | 7 ++-----
 reactos/dll/win32/msxml3/xslpattern.yy.c  | 5 +----
 10 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/reactos/dll/win32/msxml3/bsc.c b/reactos/dll/win32/msxml3/bsc.c
index 2bfce0aff38..b660d5bfa19 100644
--- a/reactos/dll/win32/msxml3/bsc.c
+++ b/reactos/dll/win32/msxml3/bsc.c
@@ -18,10 +18,6 @@
 
 #include "precomp.h"
 
-#include <wininet.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
 struct bsc_t {
     IBindStatusCallback IBindStatusCallback_iface;
 
diff --git a/reactos/dll/win32/msxml3/dispex.c b/reactos/dll/win32/msxml3/dispex.c
index 427f9601f9f..578d052f5b4 100644
--- a/reactos/dll/win32/msxml3/dispex.c
+++ b/reactos/dll/win32/msxml3/dispex.c
@@ -18,8 +18,6 @@
 
 #include "precomp.h"
 
-#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/domdoc.c b/reactos/dll/win32/msxml3/domdoc.c
index 36d65731402..db25d5c558b 100644
--- a/reactos/dll/win32/msxml3/domdoc.c
+++ b/reactos/dll/win32/msxml3/domdoc.c
@@ -33,8 +33,6 @@
 #include <olectl.h>
 #include <objsafe.h>
 
-#include <wine/list.h>
-
 #ifdef HAVE_LIBXML2
 
 /* not defined in older versions */
diff --git a/reactos/dll/win32/msxml3/httprequest.c b/reactos/dll/win32/msxml3/httprequest.c
index 992dad0a8ca..8f8e64495f7 100644
--- a/reactos/dll/win32/msxml3/httprequest.c
+++ b/reactos/dll/win32/msxml3/httprequest.c
@@ -22,13 +22,10 @@
 #include "precomp.h"
 
 #include <wingdi.h>
-#include <wininet.h>
 #include <mshtml.h>
 #include <objsafe.h>
 #include <docobj.h>
 
-#include <wine/list.h>
-
 #ifdef HAVE_LIBXML2
 
 static const WCHAR colspaceW[] = {':',' ',0};
diff --git a/reactos/dll/win32/msxml3/mxnamespace.c b/reactos/dll/win32/msxml3/mxnamespace.c
index db021b9f12d..69a7cbea0a6 100644
--- a/reactos/dll/win32/msxml3/mxnamespace.c
+++ b/reactos/dll/win32/msxml3/mxnamespace.c
@@ -20,8 +20,6 @@
 
 #include "precomp.h"
 
-#include <wine/list.h>
-
 struct ns
 {
     BSTR prefix;
diff --git a/reactos/dll/win32/msxml3/precomp.h b/reactos/dll/win32/msxml3/precomp.h
index 89cd273d282..d272c70203c 100644
--- a/reactos/dll/win32/msxml3/precomp.h
+++ b/reactos/dll/win32/msxml3/precomp.h
@@ -15,12 +15,17 @@
 
 #include <windef.h>
 #include <winbase.h>
+#include <winreg.h>
 #include <ole2.h>
 #include <msxml6.h>
+#include <wininet.h>
+#include <shlwapi.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+#include <wine/list.h>
 
 #include "msxml_private.h"
 
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
 #endif /* _MSXML3_PCH_ */
diff --git a/reactos/dll/win32/msxml3/saxreader.c b/reactos/dll/win32/msxml3/saxreader.c
index 3a02dc971e1..4ba8c18eee0 100644
--- a/reactos/dll/win32/msxml3/saxreader.c
+++ b/reactos/dll/win32/msxml3/saxreader.c
@@ -25,8 +25,6 @@
 # include <libxml/parserInternals.h>
 #endif
 
-#include <wine/list.h>
-
 #ifdef HAVE_LIBXML2
 
 typedef enum
diff --git a/reactos/dll/win32/msxml3/xmldoc.c b/reactos/dll/win32/msxml3/xmldoc.c
index f33b508a776..bb12bca2bb4 100644
--- a/reactos/dll/win32/msxml3/xmldoc.c
+++ b/reactos/dll/win32/msxml3/xmldoc.c
@@ -20,10 +20,6 @@
 
 #include "precomp.h"
 
-#include <wininet.h>
-#include <winreg.h>
-#include <shlwapi.h>
-
 #ifdef HAVE_LIBXML2
 
 /* FIXME: IXMLDocument needs to implement
diff --git a/reactos/dll/win32/msxml3/xslpattern.tab.c b/reactos/dll/win32/msxml3/xslpattern.tab.c
index 70d9f382697..9e75e8be3cd 100644
--- a/reactos/dll/win32/msxml3/xslpattern.tab.c
+++ b/reactos/dll/win32/msxml3/xslpattern.tab.c
@@ -78,16 +78,13 @@
 /* Line 189 of yacc.c  */
 #line 21 "xslpattern.y"
 
-#include <config.h>
+#include "precomp.h"
+
 #include <wine/port.h>
 
 #ifdef HAVE_LIBXML2
 #include "xslpattern.h"
 #include <libxml/xpathInternals.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
-
 
 static const xmlChar NameTest_mod_pre[] = "*[name()='";
 static const xmlChar NameTest_mod_post[] = "']";
diff --git a/reactos/dll/win32/msxml3/xslpattern.yy.c b/reactos/dll/win32/msxml3/xslpattern.yy.c
index f61ced65b8a..01b7488f94b 100644
--- a/reactos/dll/win32/msxml3/xslpattern.yy.c
+++ b/reactos/dll/win32/msxml3/xslpattern.yy.c
@@ -526,16 +526,13 @@ static yyconst flex_int16_t yy_chk[178] =
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 #line 22 "xslpattern.l"
-#include "config.h"
+#include "precomp.h"
 #include "wine/port.h"
 
 #ifdef HAVE_LIBXML2
 
 #include "xslpattern.h"
 #include "xslpattern.tab.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 
 #define SCAN    xslpattern_get_extra(yyscanner)