Index: mozilla/editor/libeditor/build/nsEditorRegistration.cpp
===================================================================
RCS file: /cvsroot/mozilla/editor/libeditor/build/nsEditorRegistration.cpp,v
retrieving revision 1.39
diff -p1 -r1.39 mozilla/editor/libeditor/build/nsEditorRegistration.cpp
*** mozilla/editor/libeditor/build/nsEditorRegistration.cpp
--- mozilla/editor/libeditor/build/nsEditorRegistration.cpp
*************** static const nsModuleComponentInfo compo
*** 216,218 ****
      { "Text Editor", NS_TEXTEDITOR_CID,
!       "@mozilla.org/editor/texteditor;1", nsPlaintextEditorConstructor, },
  
--- 216,218 ----
      { "Text Editor", NS_TEXTEDITOR_CID,
!       NS_TEXTEDITOR_CONTRACTID, nsPlaintextEditorConstructor, },
  
*************** static const nsModuleComponentInfo compo
*** 221,226 ****
      { "HTML Editor", NS_HTMLEDITOR_CID,
!       "@mozilla.org/editor/htmleditor;1", nsHTMLEditorLogConstructor, },
  #else
      { "HTML Editor", NS_HTMLEDITOR_CID,
!       "@mozilla.org/editor/htmleditor;1", nsHTMLEditorConstructor, },
  #endif
--- 221,226 ----
      { "HTML Editor", NS_HTMLEDITOR_CID,
!       NS_HTMLEDITOR_CONTRACTID, nsHTMLEditorLogConstructor, },
  #else
      { "HTML Editor", NS_HTMLEDITOR_CID,
!       NS_HTMLEDITOR_CONTRACTID, nsHTMLEditorConstructor, },
  #endif
Index: mozilla/editor/public/nsEditorCID.h
===================================================================
RCS file: /cvsroot/mozilla/editor/public/nsEditorCID.h,v
retrieving revision 1.6
diff -p1 -r1.6 mozilla/editor/public/nsEditorCID.h
*** mozilla/editor/public/nsEditorCID.h
--- mozilla/editor/public/nsEditorCID.h
***************
*** 2,7 ****
  
! #define NS_EDITOR_CID \
! {/* {D3DE3431-8A75-11d2-918C-0080C8E44DB5}*/ \
! 0xd3de3431, 0x8a75, 0x11d2, \
! { 0x91, 0x8c, 0x0, 0x80, 0xc8, 0xe4, 0x4d, 0xb5 } }
  
--- 2,5 ----
  
! #define NS_TEXTEDITOR_CONTRACTID \
!   "@mozilla.org/editor/texteditor;1"
  
***************
*** 12,13 ****
--- 10,14 ----
  
+ #define NS_HTMLEDITOR_CONTACTID \
+   "@mozilla.org/editor/htmleditor;1"
+ 
  #define NS_HTMLEDITOR_CID \
Index: mozilla/embedding/minimo/chromelite/nsSimpleChromeRegistry.cpp
===================================================================
RCS file: /cvsroot/mozilla/embedding/minimo/chromelite/nsSimpleChromeRegistry.cpp,v
retrieving revision 1.5
diff -p1 -r1.5 mozilla/embedding/minimo/chromelite/nsSimpleChromeRegistry.cpp
*** mozilla/embedding/minimo/chromelite/nsSimpleChromeRegistry.cpp
--- mozilla/embedding/minimo/chromelite/nsSimpleChromeRegistry.cpp
***************
*** 40,42 ****
  
! 
  static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
--- 40,42 ----
  
! // XXX NS_CSS_LOADER_CID does not belong to us.
  static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
Index: mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
===================================================================
RCS file: /cvsroot/mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp,v
retrieving revision 1.115
diff -p1 -r1.115 mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
*** mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
--- mozilla/extensions/typeaheadfind/src/nsTypeAheadFind.cpp
*************** static NS_DEFINE_IID(kRangeCID, NS_RANGE
*** 131,132 ****
--- 131,133 ----
  static NS_DEFINE_CID(kStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+ // XXX NS_FRAMETRAVERSAL_CID does not belong to us.
  static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);
Index: mozilla/rdf/chrome/src/nsChromeRegistry.cpp
===================================================================
RCS file: /cvsroot/mozilla/rdf/chrome/src/nsChromeRegistry.cpp,v
retrieving revision 1.328
diff -p1 -r1.328 mozilla/rdf/chrome/src/nsChromeRegistry.cpp
*** mozilla/rdf/chrome/src/nsChromeRegistry.cpp
--- mozilla/rdf/chrome/src/nsChromeRegistry.cpp
*************** static NS_DEFINE_CID(kRDFXMLDataSourceCI
*** 108,109 ****
--- 108,110 ----
  static NS_DEFINE_CID(kRDFContainerUtilsCID,      NS_RDFCONTAINERUTILS_CID);
+ // XXX NS_CSS_LOADER_CID does not belong to us.
  static NS_DEFINE_CID(kCSSLoaderCID, NS_CSS_LOADER_CID);
Index: mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp,v
retrieving revision 1.19
diff -p1 -r1.19 mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
*** mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
--- mozilla/toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
*************** NS_IMPL_RELEASE(nsTypeAheadFind)
*** 108,109 ****
--- 108,110 ----
  static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID);
+ // XXX NS_FRAMETRAVERSAL_CID does not belong to us.
  static NS_DEFINE_CID(kFrameTraversalCID, NS_FRAMETRAVERSAL_CID);