Include msxml2.h rather than msxml.h and xmldom.h.

dlls/msxml3/domdoc.c

@@ -28,9 +28,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 
@@ -487,7 +485,7 @@ static HRESULT WINAPI domdoc_transformNodeToObject(
 
 static HRESULT WINAPI domdoc_get_doctype(
     IXMLDOMDocument *iface,
-    IXMLDOMDocument** documentType )
+    IXMLDOMDocumentType** documentType )
 {
     FIXME("\n");
     return E_NOTIMPL;

dlls/msxml3/element.c

@@ -27,10 +27,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 

dlls/msxml3/factory.c

@@ -26,9 +26,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "uuids.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 

dlls/msxml3/main.c

@@ -27,6 +27,7 @@
 #include "winuser.h"
 #include "winreg.h"
 #include "ole2.h"
+#include "msxml2.h"
 
 #include "wine/debug.h"
 

dlls/msxml3/msxml_private.h

@@ -21,8 +21,6 @@
 #ifndef __MSXML_PRIVATE__
 #define __MSXML_PRIVATE__
 
-#include "xmldom.h"
-
 #ifdef HAVE_LIBXML2
 
 #ifdef HAVE_LIBXML_PARSER_H

dlls/msxml3/node.c

@@ -29,10 +29,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 

dlls/msxml3/nodelist.c

@@ -26,12 +26,8 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
-#include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 

dlls/msxml3/nodemap.c

@@ -28,10 +28,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
-#include "ocidl.h"
-#include "msxml.h"
-#include "xmldom.h"
-#include "msxml.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 

dlls/msxml3/parseerror.c

@@ -28,8 +28,7 @@
 #include "winerror.h"
 #include "winuser.h"
 #include "ole2.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 
 #include "msxml_private.h"
 

dlls/msxml3/tests/domdoc.c

@@ -23,8 +23,7 @@
 
 #include "windows.h"
 #include "ole2.h"
-#include "msxml.h"
-#include "xmldom.h"
+#include "msxml2.h"
 #include <stdio.h>
 
 #include "wine/test.h"
@@ -235,7 +234,7 @@ void test_domdoc( void )
     ok( code == 0, "code %ld\n", code );
     IXMLDOMParseError_Release( error );
 
-    r = IXMLDocument_Release( doc );
+    r = IXMLDOMDocument_Release( doc );
     ok( r == 0, "document ref count incorrect\n");
 
 }
@@ -503,7 +502,7 @@ void test_domnode( void )
     if (element)
         IXMLDOMElement_Release( element );
     if (doc)
-        IXMLDocument_Release( doc );
+        IXMLDOMDocument_Release( doc );
 }
 
 START_TEST(domdoc)