include: Make msxml6.idl a copy of msxml2.idl instead of importing it.

dlls/msxml3/factory.c

@@ -31,7 +31,6 @@
 #include "msxml.h"
 #include "xmldom.h"
 #include "msxml2.h"
-#include "msxml6.h"
 
 /* undef the #define in msxml2 so that we can access the v.2 version
    independent CLSID as well as the v.3 one. */

dlls/msxml3/uuid.c

@@ -42,7 +42,6 @@
 /* Now we can initialize the rest of the uuids */
 #include "initguid.h"
 #include "msxml2.h"
-#include "msxml6.h"
 
 /*
  * Note that because of a #define in msxml2.h, we end up initializing

dlls/msxml6/regsvr.c

@@ -36,7 +36,6 @@
 #include "ole2.h"
 
 #include "initguid.h"
-#include "msxml2.h"
 #include "msxml6.h"
 
 #include "wine/debug.h"

include/msxml2.idl

@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2005 Vijay Kiran Kamuju
  * Copyright (C) 2008 Alistair Leslie-Hughes
+ * Copyright (C) 2010 Nikolay Sivov for CodeWeavers
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,7 +19,7 @@
  */
 
 #include <msxml2did.h>
-#include <olectl.h>
+#include <idispids.h>
 
 import "unknwn.idl";
 import "objidl.idl";