Index: mozilla/docshell/base/nsDocShell.cpp
===================================================================
RCS file: /cvsroot/mozilla/docshell/base/nsDocShell.cpp,v
retrieving revision 1.792
diff -pU1 -r1.792 mozilla/docshell/base/nsDocShell.cpp
--- mozilla/docshell/base/nsDocShell.cpp
+++ mozilla/docshell/base/nsDocShell.cpp
@@ -177,2 +177,3 @@ static NS_DEFINE_CID(kSimpleURICID, NS_S
 static NS_DEFINE_CID(kDocumentCharsetInfoCID, NS_DOCUMENTCHARSETINFO_CID);
+// XXX NS_DOM_SCRIPT_OBJECT_FACTORY_CID does not belong to us.
 static NS_DEFINE_CID(kDOMScriptObjectFactoryCID,
Index: mozilla/extensions/inspector/base/src/inDOMUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/extensions/inspector/base/src/inDOMUtils.cpp,v
retrieving revision 1.36
diff -pU1 -r1.36 mozilla/extensions/inspector/base/src/inDOMUtils.cpp
Index: mozilla/extensions/webdav/src/nsWebDAVService.cpp
===================================================================
RCS file: /cvsroot/mozilla/extensions/webdav/src/nsWebDAVService.cpp,v
retrieving revision 1.30
diff -pU1 -r1.30 mozilla/extensions/webdav/src/nsWebDAVService.cpp
--- mozilla/extensions/webdav/src/nsWebDAVService.cpp
+++ mozilla/extensions/webdav/src/nsWebDAVService.cpp
@@ -221,2 +221,3 @@ nsWebDAVService::CreatePropfindDocument(
     nsresult rv;
+    // XXX NS_DOM_IMPLEMENTATION_CID does not belong to us.
     static NS_DEFINE_CID(kDOMDOMDOMDOMImplementationCID,
Index: mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
===================================================================
RCS file: /cvsroot/mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp,v
retrieving revision 1.41
diff -pU1 -r1.41 mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
--- mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
+++ mozilla/extensions/webservices/soap/src/nsSOAPMessage.cpp
@@ -51,3 +51,2 @@
 
-static NS_DEFINE_CID(kDOMParserCID, NS_DOMPARSER_CID);
 /////////////////////////////////////////////
@@ -289,3 +288,3 @@ NS_IMETHODIMP
   nsCOMPtr<nsIDOMNode> ignored;
-  nsCOMPtr<nsIDOMParser> parser = do_CreateInstance(kDOMParserCID, &rv);
+  nsCOMPtr<nsIDOMParser> parser = do_CreateInstance(NS_DOMPARSER_CONTRACTID, &rv);
   if (NS_FAILED(rv))