[PATCH 2/3] include: Remove old coclass from msxsml6.idl

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes 
---
 dlls/mshtml/xmlhttprequest.c  |   2 +-
 dlls/msxml3/attribute.c       |   1 +
 dlls/msxml3/bsc.c             |   1 +
 dlls/msxml3/cdata.c           |   1 +
 dlls/msxml3/comment.c         |   1 +
 dlls/msxml3/dispex.c          |   1 +
 dlls/msxml3/docfrag.c         |   1 +
 dlls/msxml3/doctype.c         |   1 +
 dlls/msxml3/domdoc.c          |   1 +
 dlls/msxml3/domimpl.c         |   1 +
 dlls/msxml3/element.c         |   1 +
 dlls/msxml3/entityref.c       |   1 +
 dlls/msxml3/factory.c         |   1 +
 dlls/msxml3/httprequest.c     |   1 +
 dlls/msxml3/main.c            |   1 +
 dlls/msxml3/mxnamespace.c     |   1 +
 dlls/msxml3/mxwriter.c        |   2 +-
 dlls/msxml3/node.c            |   1 +
 dlls/msxml3/nodelist.c        |   1 +
 dlls/msxml3/nodemap.c         |   1 +
 dlls/msxml3/parseerror.c      |   1 +
 dlls/msxml3/pi.c              |   1 +
 dlls/msxml3/saxreader.c       |   1 +
 dlls/msxml3/schema.c          |   1 +
 dlls/msxml3/selection.c       |   1 +
 dlls/msxml3/stylesheet.c      |   1 +
 dlls/msxml3/tests/saxreader.c |   1 +
 dlls/msxml3/text.c            |   1 +
 dlls/msxml3/xmldoc.c          |   1 +
 dlls/msxml3/xmlelem.c         |   1 +
 dlls/msxml3/xmlparser.c       |   1 +
 dlls/msxml3/xmlview.c         |   1 +
 include/msxml6.idl            | 390 ----------------------------------
 33 files changed, 32 insertions(+), 392 deletions(-)

diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c
index 80d09d9632..fc8a69b15b 100644
--- a/dlls/mshtml/xmlhttprequest.c
+++ b/dlls/mshtml/xmlhttprequest.c
@@ -31,7 +31,7 @@
 #include "mshtml_private.h"
 #include "htmlevent.h"
 #include "initguid.h"
-#include "msxml6.h"
+#include "msxml2.h"
 #include "objsafe.h"

WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index c303969bc3..80252c7614 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -33,6 +33,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c
index 5cebe09333..a07c972be1 100644
--- a/dlls/msxml3/bsc.c
+++ b/dlls/msxml3/bsc.c
@@ -31,6 +31,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "wininet.h"
 #include "urlmon.h"
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index c255b1b18b..c1456f84b5 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 0317c4fc2d..fdedb21f7d 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c
index b1fb72847e..9858ddc0e8 100644
--- a/dlls/msxml3/dispex.c
+++ b/dlls/msxml3/dispex.c
@@ -31,6 +31,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "msxml6did.h"
 #include "wininet.h"
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index b2dd3e5dec..8edd438731 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c
index 79d74d9fcd..1584f181cf 100644
--- a/dlls/msxml3/doctype.c
+++ b/dlls/msxml3/doctype.c
@@ -33,6 +33,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 8d45c546fb..667622a43d 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -40,6 +40,7 @@
 #include "winnls.h"
 #include "ole2.h"
 #include "olectl.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "wininet.h"
 #include "winreg.h"
diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c
index 74223d5d54..80fb789638 100644
--- a/dlls/msxml3/domimpl.c
+++ b/dlls/msxml3/domimpl.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index ecebd39fea..6587b70b53 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -33,6 +33,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index 5d5d424f25..5aeb944f15 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index 445cfbf730..b8452ff4b4 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -35,6 +35,7 @@
 #include "ole2.h"
 #include "msxml.h"
 #include "msxml2.h"
+#include "msxml6.h"
 #include "xmlparser.h"

/* undef the #define in msxml2 so that we can access the v.2 version
diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c
index 7286eb97bb..c02add35e1 100644
--- a/dlls/msxml3/httprequest.c
+++ b/dlls/msxml3/httprequest.c
@@ -39,6 +39,7 @@
 #include "winuser.h"
 #include "ole2.h"
 #include "mshtml.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "objsafe.h"
 #include "docobj.h"
diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c
index ec204aeb3b..0e99f19541 100644
--- a/dlls/msxml3/main.c
+++ b/dlls/msxml3/main.c
@@ -51,6 +51,7 @@
 #include "ole2.h"
 #include "rpcproxy.h"
 #include "msxml.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "wine/unicode.h"
diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c
index dc6ff9c85a..612b17f6e5 100644
--- a/dlls/msxml3/mxnamespace.c
+++ b/dlls/msxml3/mxnamespace.c
@@ -33,6 +33,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c
index 029e9aac0d..dc211ab9dc 100644
--- a/dlls/msxml3/mxwriter.c
+++ b/dlls/msxml3/mxwriter.c
@@ -30,7 +30,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "ole2.h"
-
+#include "msxml2.h"
 #include "msxml6.h"

#include "wine/debug.h"
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 35777d6591..0034923ebe 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -49,6 +49,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c
index 2c1d10efb6..714fbd8921 100644
--- a/dlls/msxml3/nodelist.c
+++ b/dlls/msxml3/nodelist.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "msxml2did.h"

diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c
index a9fef4769d..a0c5cf2d30 100644
--- a/dlls/msxml3/nodemap.c
+++ b/dlls/msxml3/nodemap.c
@@ -33,6 +33,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "msxml2did.h"

diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c
index 2ca0885708..e9f5407647 100644
--- a/dlls/msxml3/parseerror.c
+++ b/dlls/msxml3/parseerror.c
@@ -34,6 +34,7 @@
 #include "winerror.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index cea9570808..04771c3596 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index fc27260cc2..000be7f21d 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -35,6 +35,7 @@
 #include "winuser.h"
 #include "winnls.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "wininet.h"
 #include "urlmon.h"
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index e385b9b563..c2d1fd8845 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -42,6 +42,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "wine/debug.h"
diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c
index 31be4d8f10..703d8013f0 100644
--- a/dlls/msxml3/selection.c
+++ b/dlls/msxml3/selection.c
@@ -36,6 +36,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "msxml2did.h"

diff --git a/dlls/msxml3/stylesheet.c b/dlls/msxml3/stylesheet.c
index 9863ed7aa4..b85541f064 100644
--- a/dlls/msxml3/stylesheet.c
+++ b/dlls/msxml3/stylesheet.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c
index 986f429cc1..db39919a41 100644
--- a/dlls/msxml3/tests/saxreader.c
+++ b/dlls/msxml3/tests/saxreader.c
@@ -29,6 +29,7 @@
 #include "windows.h"
 #include "ole2.h"
 #include "msxml2.h"
+#include "msxml6.h"
 #include "msxml2did.h"
 #include "ocidl.h"
 #include "dispex.h"
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index abd89dbd6b..4c8f5fb701 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -34,6 +34,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c
index d0c65a44a3..3392d8c258 100644
--- a/dlls/msxml3/xmldoc.c
+++ b/dlls/msxml3/xmldoc.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "wininet.h"
 #include "winreg.h"
diff --git a/dlls/msxml3/xmlelem.c b/dlls/msxml3/xmlelem.c
index 96b2007ce3..0b146945c2 100644
--- a/dlls/msxml3/xmlelem.c
+++ b/dlls/msxml3/xmlelem.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "ocidl.h"

diff --git a/dlls/msxml3/xmlparser.c b/dlls/msxml3/xmlparser.c
index 6fcdb82c56..b354ea2d27 100644
--- a/dlls/msxml3/xmlparser.c
+++ b/dlls/msxml3/xmlparser.c
@@ -32,6 +32,7 @@
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"

#include "msxml_private.h"
diff --git a/dlls/msxml3/xmlview.c b/dlls/msxml3/xmlview.c
index f1299ef957..f68109e810 100644
--- a/dlls/msxml3/xmlview.c
+++ b/dlls/msxml3/xmlview.c
@@ -30,6 +30,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "ole2.h"
+#include "msxml2.h"
 #include "msxml6.h"
 #include "mshtml.h"
 #include "mshtmhst.h"
diff --git a/include/msxml6.idl b/include/msxml6.idl
index fe20d5c495..a966b83497 100644
--- a/include/msxml6.idl
+++ b/include/msxml6.idl
@@ -1418,42 +1418,6 @@ interface IXMLDOMParseErrorCollection : IDispatch
     HRESULT _newEnum( [retval, out] IUnknown **ppunk);
 }

-[
-    uuid(F6D90F11-9C73-11D3-B32E-00C04F990BB4)
-]
-coclass DOMDocument
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(f5078f1b-c551-11d3-89b9-0000f81fe221)
-]
-coclass DOMDocument26
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(f5078f32-c551-11d3-89b9-0000f81fe221)
-]
-coclass DOMDocument30
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(88d969c0-f192-11d4-a65f-0040963251e5)
-]
-coclass DOMDocument40
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
 [
     helpstring("XML DOM Document 6.0"),
     progid("Msxml2.DOMDocument.6.0"),
@@ -1466,42 +1430,6 @@ coclass DOMDocument60
     [default, source] dispinterface XMLDOMDocumentEvents;
 }

-[
-    uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4)
-]
-coclass FreeThreadedDOMDocument
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(f5078f1c-c551-11d3-89b9-0000f81fe221)
-]
-coclass FreeThreadedDOMDocument26
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(f5078f33-c551-11d3-89b9-0000f81fe221)
-]
-coclass FreeThreadedDOMDocument30
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
-[
-    uuid(88d969c1-f192-11d4-a65f-0040963251e5)
-]
-coclass FreeThreadedDOMDocument40
-{
-    [default] interface IXMLDOMDocument2;
-    [default, source] dispinterface XMLDOMDocumentEvents;
-}
-
 [
     helpstring("Free threaded XML DOM Document 6.0"),
     progid("Msxml2.FreeThreadedDOMDocument.6.0"),
@@ -1514,38 +1442,6 @@ coclass FreeThreadedDOMDocument60
     [default, source] dispinterface XMLDOMDocumentEvents;
 }

-[
-    uuid(f6d90f16-9c73-11d3-b32e-00c04f990bb4)
-]
-coclass XMLHTTP
-{
-    [default] interface IXMLHTTPRequest;
-}
-
-[
-    uuid(f5078f1e-c551-11d3-89b9-0000f81fe221)
-]
-coclass XMLHTTP26
-{
-    [default] interface IXMLHTTPRequest;
-}
-
-[
-    uuid(f5078f35-c551-11d3-89b9-0000f81fe221)
-]
-coclass XMLHTTP30
-{
-    [default] interface IXMLHTTPRequest;
-}
-
-[
-    uuid(88d969c5-f192-11d4-a65f-0040963251e5)
-]
-coclass XMLHTTP40
-{
-    [default] interface IXMLHTTPRequest;
-}
-
 [
     helpstring("XML HTTP 6.0"),
     progid("Msxml2.XMLHTTP.6.0"),
@@ -1557,30 +1453,6 @@ coclass XMLHTTP60
     [default] interface IXMLHTTPRequest;
 }

-[
-    uuid(afba6b42-5692-48ea-8141-dc517dcf0ef1)
-]
-coclass ServerXMLHTTP
-{
-    [default] interface IServerXMLHTTPRequest;
-}
-
-[
-    uuid(afb40ffd-b609-40a3-9828-f88bbe11e4e3)
-]
-coclass ServerXMLHTTP30
-{
-    [default] interface IServerXMLHTTPRequest;
-}
-
-[
-    uuid(88d969c6-f192-11d4-a65f-0040963251e5)
-]
-coclass ServerXMLHTTP40
-{
-    [default] interface IServerXMLHTTPRequest2;
-}
-
 [
     helpstring("Server XML HTTP 6.0"),
     progid("Msxml2.ServerXMLHTTP.6.0"),
@@ -1592,38 +1464,6 @@ coclass ServerXMLHTTP60
     [default] interface IServerXMLHTTPRequest2;
 }

-[
-    uuid(373984c9-b845-449b-91e7-45ac83036ade)
-]
-coclass XMLSchemaCache
-{
-    [default] interface IXMLDOMSchemaCollection;
-}
-
-[
-    uuid(f5078f1d-c551-11d3-89b9-0000f81fe221)
-]
-coclass XMLSchemaCache26
-{
-    [default] interface IXMLDOMSchemaCollection;
-}
-
-[
-    uuid(f5078f34-c551-11d3-89b9-0000f81fe221)
-]
-coclass XMLSchemaCache30
-{
-    [default] interface IXMLDOMSchemaCollection;
-}
-
-[
-    uuid(88d969c2-f192-11d4-a65f-0040963251e5)
-]
-coclass XMLSchemaCache40
-{
-    [default] interface IXMLDOMSchemaCollection2;
-}
-
 [
     helpstring("XML Schema Cache 6.0"),
     progid("Msxml2.XMLSchemaCache.6.0"),
@@ -1635,38 +1475,6 @@ coclass XMLSchemaCache60
     [default] interface IXMLDOMSchemaCollection2;
 }

-[
-    uuid(2933BF94-7B36-11d2-B20E-00C04F983E60)
-]
-coclass XSLTemplate
-{
-    [default] interface IXSLTemplate;
-}
-
-[
-    uuid(f5078f21-c551-11d3-89b9-0000f81fe221)
-]
-coclass XSLTemplate26
-{
-    [default] interface IXSLTemplate;
-}
-
-[
-    uuid(f5078f36-c551-11d3-89b9-0000f81fe221)
-]
-coclass XSLTemplate30
-{
-    [default] interface IXSLTemplate;
-}
-
-[
-    uuid(88d969c3-f192-11d4-a65f-0040963251e5)
-]
-coclass XSLTemplate40
-{
-    [default] interface IXSLTemplate;
-}
-
 [
     helpstring("XSL Template 6.0"),
     progid("Msxml2.XSLTemplate.6.0"),
@@ -3133,36 +2941,6 @@ interface ISchemaNotation : ISchemaItem
         [out,retval] BSTR* uri);
 }

-
-[
-    uuid(079aa557-4a18-424a-8eee-e39f0a8d41b9)
-]
-coclass SAXXMLReader
-{
-    [default] interface IVBSAXXMLReader;
-    interface ISAXXMLReader;
-    interface IMXReaderControl;
-}
-
-[
-    uuid(3124c396-fb13-4836-a6ad-1317f1713688)
-]
-coclass SAXXMLReader30
-{
-    [default] interface IVBSAXXMLReader;
-    interface ISAXXMLReader;
-    interface IMXReaderControl;
-}
-
-[
-    uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f)
-]
-coclass SAXXMLReader40
-{
-    [default] interface IVBSAXXMLReader;
-    interface ISAXXMLReader;
-}
-
 [
     helpstring("SAX XML Reader 6.0"),
     progid("Msxml2.SAXXMLReader.6.0"),
@@ -3175,66 +2953,6 @@ coclass SAXXMLReader60
     interface ISAXXMLReader;
 }

-[
-    uuid(a4c23ec3-6b70-4466-9127-550077239978)
-]
-coclass MXHTMLWriter
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXErrorHandler;
-    interface ISAXDTDHandler;
-    interface ISAXLexicalHandler;
-    interface ISAXDeclHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
-[
-    uuid(853d1540-c1a7-4aa9-a226-4d3bd301146d)
-]
-coclass MXHTMLWriter30
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
-[
-    uuid(88d969c9-f192-11d4-a65f-0040963251e5)
-]
-coclass MXHTMLWriter40
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
 [
     helpstring("MXHTMLWriter 6.0"),
     progid("Msxml2.MXHTMLWriter.6.0"),
@@ -3258,66 +2976,6 @@ coclass MXHTMLWriter60
     interface IVBSAXLexicalHandler;
 }

-[
-    uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020)
-]
-coclass MXXMLWriter
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXErrorHandler;
-    interface ISAXDTDHandler;
-    interface ISAXLexicalHandler;
-    interface ISAXDeclHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
-[
-    uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c)
-]
-coclass MXXMLWriter30
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
-[
-    uuid(88d969c8-f192-11d4-a65f-0040963251e5),
-]
-coclass MXXMLWriter40
-{
-    [default] interface IMXWriter;
-
-    interface ISAXContentHandler;
-    interface ISAXDeclHandler;
-    interface ISAXDTDHandler;
-    interface ISAXErrorHandler;
-    interface ISAXLexicalHandler;
-
-    interface IVBSAXContentHandler;
-    interface IVBSAXDeclHandler;
-    interface IVBSAXDTDHandler;
-    interface IVBSAXErrorHandler;
-    interface IVBSAXLexicalHandler;
-}
-
 [
     helpstring("MXXMLWriter 6.0"),
     progid("Msxml2.MXXMLWriter.6.0"),
@@ -3341,24 +2999,6 @@ coclass MXXMLWriter60
     interface IVBSAXLexicalHandler;
 }

-[
-    uuid(88d969d5-f192-11d4-a65f-0040963251e5)
-]
-coclass MXNamespaceManager
-{
-    [default] interface IVBMXNamespaceManager;
-    interface IMXNamespaceManager;
-}
-
-[
-    uuid(88d969d6-f192-11d4-a65f-0040963251e5)
-]
-coclass MXNamespaceManager40
-{
-    [default] interface IVBMXNamespaceManager;
-    interface IMXNamespaceManager;
-}
-
 [
     helpstring("MXNamespaceManager 6.0"),
     progid("Msxml2.MXNamespaceManager.6.0"),
@@ -3371,36 +3011,6 @@ coclass MXNamespaceManager60
     interface IMXNamespaceManager;
 }

-[
-    uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0)
-]
-coclass SAXAttributes
-{
-    [default] interface IMXAttributes;
-    interface IVBSAXAttributes;
-    interface ISAXAttributes;
-}
-
-[
-    uuid(3e784a01-f3ae-4dc0-9354-9526b9370eba)
-]
-coclass SAXAttributes30
-{
-    [default] interface IMXAttributes;
-    interface IVBSAXAttributes;
-    interface ISAXAttributes;
-}
-
-[
-    uuid(88d969ca-f192-11d4-a65f-0040963251e5),
-]
-coclass SAXAttributes40
-{
-    [default] interface IMXAttributes;
-    interface IVBSAXAttributes;
-    interface ISAXAttributes;
-}
-
 [
     helpstring("SAXAttributes 6.0"),
     progid("Msxml2.SAXAttributes.6.0"),