diff --git a/mozilla/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp
index b3ba31d94d1..49b417322dd 100644
--- a/mozilla/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/chrome/src/nsChromeRegistry.cpp
@@ -108,6 +108,7 @@
 #include "nsIContent.h"
 #include "nsIDOMWindowCollection.h"
 #include "imgICache.h"
+#include "nsIAtom.h"
 
 static char kChromePrefix[] = "chrome://";
 static char kUseXBLFormsPref[] = "nglayout.debug.enable_xbl_forms";
@@ -244,7 +245,8 @@ NS_IMETHODIMP nsOverlayEnumerator::GetNext(nsISupports **aResult)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-nsChromeRegistry::nsChromeRegistry()
+nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull),
+                                       mRDFContainerUtils(nsnull)
 {
   NS_INIT_REFCNT();
 
@@ -3105,6 +3107,7 @@ nsChromeRegistry::ProcessNewChromeBuffer(char *aBuffer, PRInt32 aLength)
 
   mBatchInstallFlushes = PR_TRUE;
 
+  // process chromeType, chromeProfile, chromeLocType, chromeLocation
   while (aBuffer < bufferEnd) {
     // parse one line of installed-chrome.txt
     chromeType = aBuffer;
@@ -3157,7 +3160,7 @@ nsChromeRegistry::ProcessNewChromeBuffer(char *aBuffer, PRInt32 aLength)
       if (NS_FAILED(rv))
         return rv;
 
-      /* xpidl strings aren't unified with strings, so this fu is necessary.
+      /* 
        * all we want here is the canonical url
        */
       rv = NS_GetURLSpecFromFile(chromeFile, chromeURL);
diff --git a/mozilla/content/base/src/nsContentList.h b/mozilla/content/base/src/nsContentList.h
index aa7a86359a5..b08a69b78a6 100644
--- a/mozilla/content/base/src/nsContentList.h
+++ b/mozilla/content/base/src/nsContentList.h
@@ -45,6 +45,7 @@
 #include "nsIDOMNodeList.h"
 #include "nsIDocumentObserver.h"
 #include "nsIContentList.h"
+#include "nsIAtom.h"
 
 typedef PRBool (*nsContentListMatchFunc)(nsIContent* aContent,
                                          nsString* aData);
diff --git a/mozilla/content/html/style/src/nsCSSDeclaration.cpp b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
index 83d9549b741..0fa108e9365 100644
--- a/mozilla/content/html/style/src/nsCSSDeclaration.cpp
+++ b/mozilla/content/html/style/src/nsCSSDeclaration.cpp
@@ -39,6 +39,7 @@
 #include "nscore.h"
 #include "nsCSSDeclaration.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsCSSProps.h"
diff --git a/mozilla/content/html/style/src/nsCSSStruct.cpp b/mozilla/content/html/style/src/nsCSSStruct.cpp
index 83d9549b741..0fa108e9365 100644
--- a/mozilla/content/html/style/src/nsCSSStruct.cpp
+++ b/mozilla/content/html/style/src/nsCSSStruct.cpp
@@ -39,6 +39,7 @@
 #include "nscore.h"
 #include "nsCSSDeclaration.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsCSSProps.h"
diff --git a/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h b/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h
index 1faef443fc7..2b65548ac97 100644
--- a/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h
+++ b/mozilla/content/xbl/public/nsIXBLPrototypeBinding.h
@@ -53,6 +53,7 @@ class nsISupportsArray;
 class nsCString; 
 class nsIScriptContext;
 class nsXBLProtoImpl;
+class nsIAtom;
 
 // {34D700F5-C1A2-4408-A0B1-DD8F891DD1FE}
 #define NS_IXBLPROTOTYPEBINDING_IID \
diff --git a/mozilla/content/xbl/public/nsIXBLService.h b/mozilla/content/xbl/public/nsIXBLService.h
index d455f38ada1..f9ae59a3db3 100644
--- a/mozilla/content/xbl/public/nsIXBLService.h
+++ b/mozilla/content/xbl/public/nsIXBLService.h
@@ -56,6 +56,7 @@ class nsIDOMNodeList;
 class nsIXBLBinding;
 class nsIXBLDocumentInfo;
 class nsIURI;
+class nsIAtom;
 
 // {0E7903E1-C7BB-11d3-97FB-00400553EEF0}
 #define NS_IXBLSERVICE_IID \
diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp
index 57810c95d3c..8b616280385 100644
--- a/mozilla/content/xbl/src/nsXBLBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLBinding.cpp
@@ -40,6 +40,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsCOMPtr.h"
+#include "nsIAtom.h"
 #include "nsIXBLBinding.h"
 #include "nsIXBLDocumentInfo.h"
 #include "nsIInputStream.h"
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
index 4b0ed91ddf3..18ffa97b08c 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeBinding.cpp
@@ -38,6 +38,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsCOMPtr.h"
+#include "nsIAtom.h"
 #include "nsIXBLPrototypeBinding.h"
 #include "nsIXBLDocumentInfo.h"
 #include "nsIInputStream.h"
diff --git a/mozilla/content/xul/document/src/nsElementMap.cpp b/mozilla/content/xul/document/src/nsElementMap.cpp
index 20d0259828c..5d12d594dd5 100644
--- a/mozilla/content/xul/document/src/nsElementMap.cpp
+++ b/mozilla/content/xul/document/src/nsElementMap.cpp
@@ -53,6 +53,7 @@
 #include "nsElementMap.h"
 #include "nsISupportsArray.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsReadableUtils.h"
 #include "prlog.h"
 
diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index f7dbfbe3926..6be1e04774d 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -75,6 +75,7 @@
 #include "nsIThread.h"
 #include "nsITimer.h"
 #include "nsDOMClassInfo.h"
+#include "nsIAtom.h"
 
 #ifdef MOZ_LOGGING
 // Force PR_LOGGING so we can get JS strict warnings even in release builds
@@ -88,8 +89,6 @@
 
 const size_t gStackSize = 8192;
 
-static NS_DEFINE_IID(kPrefServiceCID, NS_PREF_CID);
-
 #ifdef PR_LOGGING
 static PRLogModuleInfo* gJSDiagnostics = nsnull;
 #endif
@@ -350,7 +349,7 @@ int PR_CALLBACK
 nsJSContext::JSOptionChangedCallback(const char *pref, void *data)
 {
   nsresult rv;
-  nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
+  nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
   if (NS_SUCCEEDED(rv)) {
     nsJSContext *context = NS_REINTERPRET_CAST(nsJSContext *, data);
     PRUint32 oldDefaultJSOptions = context->mDefaultJSOptions;
@@ -413,7 +412,7 @@ nsJSContext::nsJSContext(JSRuntime *aRuntime) : mGCOnDestruction(PR_TRUE)
     ::JS_SetOptions(mContext, mDefaultJSOptions);
 
     // Check for the JS strict option, which enables extra error checks
-    nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
+    nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
     if (NS_SUCCEEDED(rv)) {
       (void) prefs->RegisterCallback(js_options_dot_str,
                                      JSOptionChangedCallback,
@@ -446,7 +445,7 @@ nsJSContext::~nsJSContext()
   ::JS_SetContextPrivate(mContext, nsnull);
 
   // Unregister our "javascript.options.*" pref-changed callback.
-  nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID));
+  nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREFSERVICE_CONTRACTID));
   if (prefs) {
     prefs->UnregisterCallback(js_options_dot_str, JSOptionChangedCallback,
                               this);
diff --git a/mozilla/editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp b/mozilla/editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
index 0952af99ec0..5e8d55530d2 100644
--- a/mozilla/editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
+++ b/mozilla/editor/libeditor/base/ChangeCSSInlineStyleTxn.cpp
@@ -48,6 +48,7 @@
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
+#include "nsIAtom.h"
 
 void
 ChangeCSSInlineStyleTxn::AppendDeclaration(nsAString & aOutputString,
diff --git a/mozilla/editor/libeditor/base/IMETextTxn.h b/mozilla/editor/libeditor/base/IMETextTxn.h
index b13cfc3f08d..fff235b543e 100644
--- a/mozilla/editor/libeditor/base/IMETextTxn.h
+++ b/mozilla/editor/libeditor/base/IMETextTxn.h
@@ -44,6 +44,7 @@
 #include "nsIPrivateTextRange.h"
 #include "nsCOMPtr.h"
 #include "nsWeakPtr.h"
+#include "nsIAtom.h"
 
 // {D4D25721-2813-11d3-9EA3-0060089FE59B}
 #define IME_TEXT_TXN_CID							\
diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
index 7af605a8618..7994c1454f1 100644
--- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
+++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
@@ -35,6 +35,7 @@
 #include "nsIServiceManager.h"
 #include "nsComponentManagerUtils.h"
 #include "nsXPIDLString.h"
+#include "nsIAtom.h"
 #include "nsReadableUtils.h"
 #include "nsUnicharUtils.h"
 #include "nsISimpleEnumerator.h"
diff --git a/mozilla/extensions/inspector/base/src/win/inScreenCapturer.h b/mozilla/extensions/inspector/base/src/win/inScreenCapturer.h
index 3de19d94a0c..3936772a342 100644
--- a/mozilla/extensions/inspector/base/src/win/inScreenCapturer.h
+++ b/mozilla/extensions/inspector/base/src/win/inScreenCapturer.h
@@ -41,6 +41,7 @@
 
 #include "inIScreenCapturer.h"
 #include "nsIInspectorCSSUtils.h"
+#include "nsCOMPtr.h"
 #include <windows.h>
 
 class inScreenCapturer : public inIScreenCapturer                            
diff --git a/mozilla/gfx/src/gtk/nsDeviceContextSpecG.h b/mozilla/gfx/src/gtk/nsDeviceContextSpecG.h
index 7119a70c721..4217e387c02 100644
--- a/mozilla/gfx/src/gtk/nsDeviceContextSpecG.h
+++ b/mozilla/gfx/src/gtk/nsDeviceContextSpecG.h
@@ -44,6 +44,7 @@
 #include "nsIPrintSettings.h"
 #include "nsIPrintOptions.h" 
 #include "nsVoidArray.h"
+#include "nsCOMPtr.h"
 #ifdef USE_POSTSCRIPT
 #include "nsIDeviceContextSpecPS.h"
 #endif /* USE_POSTSCRIPT */
diff --git a/mozilla/gfx/src/nsPrintOptionsImpl.h b/mozilla/gfx/src/nsPrintOptionsImpl.h
index 509d9b74986..bf85d3115fe 100644
--- a/mozilla/gfx/src/nsPrintOptionsImpl.h
+++ b/mozilla/gfx/src/nsPrintOptionsImpl.h
@@ -24,6 +24,7 @@
 #ifndef nsPrintOptionsImpl_h__
 #define nsPrintOptionsImpl_h__
 
+#include "nsCOMPtr.h"
 #include "nsIPrintOptions.h"  
 #include "nsIPrintSettingsService.h"  
 class nsIPref;
diff --git a/mozilla/gfx/src/nsRenderingContextImpl.cpp b/mozilla/gfx/src/nsRenderingContextImpl.cpp
index 6cec1d5886c..add8988cc19 100644
--- a/mozilla/gfx/src/nsRenderingContextImpl.cpp
+++ b/mozilla/gfx/src/nsRenderingContextImpl.cpp
@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsCOMPtr.h"
 #include "nsRenderingContextImpl.h"
 #include "nsIDeviceContext.h"
 #include "nsIImage.h"
diff --git a/mozilla/gfx/src/ps/nsFontMetricsPS.h b/mozilla/gfx/src/ps/nsFontMetricsPS.h
index c25778ff6c7..febfd6466ec 100644
--- a/mozilla/gfx/src/ps/nsFontMetricsPS.h
+++ b/mozilla/gfx/src/ps/nsFontMetricsPS.h
@@ -43,6 +43,7 @@
 #include "nsAFMObject.h"
 #include "nsFont.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsUnitConversion.h"
 #include "nsIDeviceContext.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/gfx/src/ps/nsPostScriptObj.cpp b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
index f33fe7bec77..c81f1ee53cd 100644
--- a/mozilla/gfx/src/ps/nsPostScriptObj.cpp
+++ b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
@@ -34,6 +34,7 @@
 #include "prlog.h"
 
 #include "nscore.h"
+#include "nsIAtom.h"
 #include "nsPostScriptObj.h"
 #include "isotab.c"
 #include "nsFont.h"
diff --git a/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp b/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp
index 6cec1d5886c..add8988cc19 100644
--- a/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp
+++ b/mozilla/gfx/src/shared/nsRenderingContextImpl.cpp
@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsCOMPtr.h"
 #include "nsRenderingContextImpl.h"
 #include "nsIDeviceContext.h"
 #include "nsIImage.h"
diff --git a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.h b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.h
index e9cfdd7a448..ec5c44a66c7 100644
--- a/mozilla/gfx/src/windows/nsDeviceContextSpecWin.h
+++ b/mozilla/gfx/src/windows/nsDeviceContextSpecWin.h
@@ -39,6 +39,7 @@
 #ifndef nsDeviceContextSpecWin_h___
 #define nsDeviceContextSpecWin_h___
 
+#include "nsCOMPtr.h"
 #include "nsIDeviceContextSpec.h"
 #include "nsIPrintOptions.h" // For nsIPrinterEnumerator
 #include "nsIPrintSettings.h"
diff --git a/mozilla/gfx/src/windows/nsPrintOptionsWin.cpp b/mozilla/gfx/src/windows/nsPrintOptionsWin.cpp
index f46b219cac0..b9263f8bd06 100644
--- a/mozilla/gfx/src/windows/nsPrintOptionsWin.cpp
+++ b/mozilla/gfx/src/windows/nsPrintOptionsWin.cpp
@@ -35,6 +35,7 @@
  * the terms of any one of the NPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+#include "nsCOMPtr.h"
 #include "nsPrintOptionsWin.h"
 #include "nsPrintSettingsWin.h"
 
diff --git a/mozilla/htmlparser/public/nsIParserNode.h b/mozilla/htmlparser/public/nsIParserNode.h
index be774cd7dda..7870040e5d6 100644
--- a/mozilla/htmlparser/public/nsIParserNode.h
+++ b/mozilla/htmlparser/public/nsIParserNode.h
@@ -64,7 +64,7 @@
 //#define HEAP_ALLOCATED_NODES 
 //#define DEBUG_TRACK_NODES
 
-
+class nsIAtom;
 class CToken;
 
 // 6e59f160-2717-11d2-9246-00805f8a7ab6
diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp
index 430fdbbe933..35376adbee8 100644
--- a/mozilla/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/htmlparser/src/CNavDTD.cpp
@@ -43,7 +43,8 @@
 #define ENABLE_RESIDUALSTYLE  
 
      
-#include "nsDebug.h" 
+#include "nsDebug.h"
+#include "nsIAtom.h"
 #include "CNavDTD.h" 
 #include "nsHTMLTokens.h"
 #include "nsCRT.h"
diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp
index 5194254e247..d95065e60fb 100644
--- a/mozilla/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/htmlparser/src/COtherDTD.cpp
@@ -42,7 +42,8 @@
      
           
 #include "nsDebug.h"      
-#include "COtherDTD.h" 
+#include "nsIAtom.h"
+#include "COtherDTD.h"
 #include "nsHTMLTokens.h"
 #include "nsCRT.h"     
 #include "nsParser.h"  
diff --git a/mozilla/htmlparser/src/CParserContext.cpp b/mozilla/htmlparser/src/CParserContext.cpp
index 7d39ab618b5..da1a9297f45 100644
--- a/mozilla/htmlparser/src/CParserContext.cpp
+++ b/mozilla/htmlparser/src/CParserContext.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
+#include "nsIAtom.h"
 #include "CParserContext.h"
 #include "nsToken.h"
 #include "prenv.h"  
diff --git a/mozilla/htmlparser/src/nsDTDUtils.cpp b/mozilla/htmlparser/src/nsDTDUtils.cpp
index e6e72d3fa6e..b7f37b9707a 100644
--- a/mozilla/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/htmlparser/src/nsDTDUtils.cpp
@@ -38,9 +38,10 @@
  * ***** END LICENSE BLOCK ***** */
        
   
+#include "nsIAtom.h"
 #include "nsDTDUtils.h" 
 #include "CNavDTD.h" 
-#include "nsIParserNode.h" 
+#include "nsIParserNode.h"
 #include "nsParserNode.h" 
 #include "nsIChannel.h"
 #include "nsIServiceManager.h"
diff --git a/mozilla/htmlparser/src/nsElementTable.cpp b/mozilla/htmlparser/src/nsElementTable.cpp
index 686dcd44c50..c0e3150e295 100644
--- a/mozilla/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/htmlparser/src/nsElementTable.cpp
@@ -43,6 +43,7 @@
  * 
  */ 
 
+#include "nsIAtom.h"
 #include "nsElementTable.h"
 
 /***************************************************************************** 
diff --git a/mozilla/htmlparser/src/nsHTMLNullSink.cpp b/mozilla/htmlparser/src/nsHTMLNullSink.cpp
index 320191effe0..8edfbdf9e42 100644
--- a/mozilla/htmlparser/src/nsHTMLNullSink.cpp
+++ b/mozilla/htmlparser/src/nsHTMLNullSink.cpp
@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsIHTMLContentSink.h"
+#include "nsIAtom.h"
 #include "nsHTMLTokens.h"
 #include "nsIParser.h"
 #include "prtypes.h" 
diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
index 317c87eeced..7defcf9eaf6 100644
--- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
@@ -43,6 +43,7 @@
  * 
  */
 
+#include "nsIAtom.h"
 #include "nsHTMLTokenizer.h"
 #include "nsScanner.h"
 #include "nsElementTable.h"
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index 8fb9147310f..46b64c47674 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -40,7 +40,8 @@
 #include <time.h>
 #include <stdio.h>  
 #include "nsScanner.h"
-#include "nsToken.h" 
+#include "nsToken.h"
+#include "nsIAtom.h"
 #include "nsHTMLTokens.h"
 #include "prtypes.h"
 #include "nsDebug.h"
diff --git a/mozilla/htmlparser/src/nsLoggingSink.cpp b/mozilla/htmlparser/src/nsLoggingSink.cpp
index 1475b19f205..d0a90ae1f8a 100644
--- a/mozilla/htmlparser/src/nsLoggingSink.cpp
+++ b/mozilla/htmlparser/src/nsLoggingSink.cpp
@@ -35,6 +35,7 @@
  * the terms of any one of the NPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+#include "nsIAtom.h"
 #include "nsLoggingSink.h"
 #include "nsHTMLTags.h"
 #include "nsString.h"
diff --git a/mozilla/htmlparser/src/nsParser.cpp b/mozilla/htmlparser/src/nsParser.cpp
index d7a095b33a9..1787e9d4378 100644
--- a/mozilla/htmlparser/src/nsParser.cpp
+++ b/mozilla/htmlparser/src/nsParser.cpp
@@ -42,8 +42,9 @@
 
 
 
+#include "nsIAtom.h"
 #include "nsParser.h"
-#include "nsIContentSink.h" 
+#include "nsIContentSink.h"
 #include "nsString.h"
 #include "nsCRT.h" 
 #include "nsScanner.h"
diff --git a/mozilla/htmlparser/src/nsParserModule.cpp b/mozilla/htmlparser/src/nsParserModule.cpp
index e1376e9ed13..13e7aba6d20 100644
--- a/mozilla/htmlparser/src/nsParserModule.cpp
+++ b/mozilla/htmlparser/src/nsParserModule.cpp
@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsIAtom.h"
 #include "nsString.h"
 #include "nspr.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/htmlparser/src/nsParserNode.cpp b/mozilla/htmlparser/src/nsParserNode.cpp
index 0e4a6604893..874765982bb 100644
--- a/mozilla/htmlparser/src/nsParserNode.cpp
+++ b/mozilla/htmlparser/src/nsParserNode.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
+#include "nsIAtom.h"
 #include "nsParserNode.h" 
 #include <string.h>
 #include "nsHTMLTokens.h"
diff --git a/mozilla/htmlparser/src/nsParserService.cpp b/mozilla/htmlparser/src/nsParserService.cpp
index 49296ae8db1..4ffd43b00c9 100644
--- a/mozilla/htmlparser/src/nsParserService.cpp
+++ b/mozilla/htmlparser/src/nsParserService.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "nsIAtom.h"
 #include "nsParserService.h"
 #include "nsHTMLEntities.h"
 #include "nsElementTable.h"
diff --git a/mozilla/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
index b40f9fbcaa8..f61f096595e 100644
--- a/mozilla/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/htmlparser/src/nsViewSourceHTML.cpp
@@ -68,6 +68,7 @@
 #  define START_TIMER()
 #endif
 
+#include "nsIAtom.h"
 #include "nsViewSourceHTML.h"
 #include "nsCRT.h"
 #include "nsParser.h"
diff --git a/mozilla/layout/forms/nsIFormControlFrame.h b/mozilla/layout/forms/nsIFormControlFrame.h
index 0393b126734..63246e71ee2 100644
--- a/mozilla/layout/forms/nsIFormControlFrame.h
+++ b/mozilla/layout/forms/nsIFormControlFrame.h
@@ -43,6 +43,7 @@
 class nsIPresContext;
 class nsAString;
 class nsIContent;
+class nsIAtom;
 
 
 // IID for the nsIFormControlFrame class
diff --git a/mozilla/layout/html/forms/public/nsIFormControlFrame.h b/mozilla/layout/html/forms/public/nsIFormControlFrame.h
index 0393b126734..63246e71ee2 100644
--- a/mozilla/layout/html/forms/public/nsIFormControlFrame.h
+++ b/mozilla/layout/html/forms/public/nsIFormControlFrame.h
@@ -43,6 +43,7 @@
 class nsIPresContext;
 class nsAString;
 class nsIContent;
+class nsIAtom;
 
 
 // IID for the nsIFormControlFrame class
diff --git a/mozilla/layout/style/nsCSSDeclaration.cpp b/mozilla/layout/style/nsCSSDeclaration.cpp
index 83d9549b741..0fa108e9365 100644
--- a/mozilla/layout/style/nsCSSDeclaration.cpp
+++ b/mozilla/layout/style/nsCSSDeclaration.cpp
@@ -39,6 +39,7 @@
 #include "nscore.h"
 #include "nsCSSDeclaration.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsCSSProps.h"
diff --git a/mozilla/layout/style/nsCSSStruct.cpp b/mozilla/layout/style/nsCSSStruct.cpp
index 83d9549b741..0fa108e9365 100644
--- a/mozilla/layout/style/nsCSSStruct.cpp
+++ b/mozilla/layout/style/nsCSSStruct.cpp
@@ -39,6 +39,7 @@
 #include "nscore.h"
 #include "nsCSSDeclaration.h"
 #include "nsString.h"
+#include "nsIAtom.h"
 #include "nsUnicharUtils.h"
 #include "nsCRT.h"
 #include "nsCSSProps.h"
diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeUtils.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeUtils.cpp
index 2d064cd5f49..391f24faf2f 100644
--- a/mozilla/layout/xul/base/src/tree/src/nsTreeUtils.cpp
+++ b/mozilla/layout/xul/base/src/tree/src/nsTreeUtils.cpp
@@ -40,6 +40,7 @@
 #include "nsTreeUtils.h"
 #include "nsChildIterator.h"
 #include "nsCRT.h"
+#include "nsIAtom.h"
 
 nsresult
 nsTreeUtils::TokenizeProperties(const nsAString& aProperties, nsISupportsArray* aPropertiesArray)
diff --git a/mozilla/parser/htmlparser/public/nsIParserNode.h b/mozilla/parser/htmlparser/public/nsIParserNode.h
index be774cd7dda..7870040e5d6 100644
--- a/mozilla/parser/htmlparser/public/nsIParserNode.h
+++ b/mozilla/parser/htmlparser/public/nsIParserNode.h
@@ -64,7 +64,7 @@
 //#define HEAP_ALLOCATED_NODES 
 //#define DEBUG_TRACK_NODES
 
-
+class nsIAtom;
 class CToken;
 
 // 6e59f160-2717-11d2-9246-00805f8a7ab6
diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp
index 430fdbbe933..35376adbee8 100644
--- a/mozilla/parser/htmlparser/src/CNavDTD.cpp
+++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp
@@ -43,7 +43,8 @@
 #define ENABLE_RESIDUALSTYLE  
 
      
-#include "nsDebug.h" 
+#include "nsDebug.h"
+#include "nsIAtom.h"
 #include "CNavDTD.h" 
 #include "nsHTMLTokens.h"
 #include "nsCRT.h"
diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp
index 5194254e247..d95065e60fb 100644
--- a/mozilla/parser/htmlparser/src/COtherDTD.cpp
+++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp
@@ -42,7 +42,8 @@
      
           
 #include "nsDebug.h"      
-#include "COtherDTD.h" 
+#include "nsIAtom.h"
+#include "COtherDTD.h"
 #include "nsHTMLTokens.h"
 #include "nsCRT.h"     
 #include "nsParser.h"  
diff --git a/mozilla/parser/htmlparser/src/CParserContext.cpp b/mozilla/parser/htmlparser/src/CParserContext.cpp
index 7d39ab618b5..da1a9297f45 100644
--- a/mozilla/parser/htmlparser/src/CParserContext.cpp
+++ b/mozilla/parser/htmlparser/src/CParserContext.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
+#include "nsIAtom.h"
 #include "CParserContext.h"
 #include "nsToken.h"
 #include "prenv.h"  
diff --git a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
index e6e72d3fa6e..b7f37b9707a 100644
--- a/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/mozilla/parser/htmlparser/src/nsDTDUtils.cpp
@@ -38,9 +38,10 @@
  * ***** END LICENSE BLOCK ***** */
        
   
+#include "nsIAtom.h"
 #include "nsDTDUtils.h" 
 #include "CNavDTD.h" 
-#include "nsIParserNode.h" 
+#include "nsIParserNode.h"
 #include "nsParserNode.h" 
 #include "nsIChannel.h"
 #include "nsIServiceManager.h"
diff --git a/mozilla/parser/htmlparser/src/nsElementTable.cpp b/mozilla/parser/htmlparser/src/nsElementTable.cpp
index 686dcd44c50..c0e3150e295 100644
--- a/mozilla/parser/htmlparser/src/nsElementTable.cpp
+++ b/mozilla/parser/htmlparser/src/nsElementTable.cpp
@@ -43,6 +43,7 @@
  * 
  */ 
 
+#include "nsIAtom.h"
 #include "nsElementTable.h"
 
 /***************************************************************************** 
diff --git a/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp b/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp
index 320191effe0..8edfbdf9e42 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLNullSink.cpp
@@ -36,6 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nsIHTMLContentSink.h"
+#include "nsIAtom.h"
 #include "nsHTMLTokens.h"
 #include "nsIParser.h"
 #include "prtypes.h" 
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index 317c87eeced..7defcf9eaf6 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -43,6 +43,7 @@
  * 
  */
 
+#include "nsIAtom.h"
 #include "nsHTMLTokenizer.h"
 #include "nsScanner.h"
 #include "nsElementTable.h"
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index 8fb9147310f..46b64c47674 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -40,7 +40,8 @@
 #include <time.h>
 #include <stdio.h>  
 #include "nsScanner.h"
-#include "nsToken.h" 
+#include "nsToken.h"
+#include "nsIAtom.h"
 #include "nsHTMLTokens.h"
 #include "prtypes.h"
 #include "nsDebug.h"
diff --git a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
index 1475b19f205..d0a90ae1f8a 100644
--- a/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
+++ b/mozilla/parser/htmlparser/src/nsLoggingSink.cpp
@@ -35,6 +35,7 @@
  * the terms of any one of the NPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+#include "nsIAtom.h"
 #include "nsLoggingSink.h"
 #include "nsHTMLTags.h"
 #include "nsString.h"
diff --git a/mozilla/parser/htmlparser/src/nsParser.cpp b/mozilla/parser/htmlparser/src/nsParser.cpp
index d7a095b33a9..1787e9d4378 100644
--- a/mozilla/parser/htmlparser/src/nsParser.cpp
+++ b/mozilla/parser/htmlparser/src/nsParser.cpp
@@ -42,8 +42,9 @@
 
 
 
+#include "nsIAtom.h"
 #include "nsParser.h"
-#include "nsIContentSink.h" 
+#include "nsIContentSink.h"
 #include "nsString.h"
 #include "nsCRT.h" 
 #include "nsScanner.h"
diff --git a/mozilla/parser/htmlparser/src/nsParserModule.cpp b/mozilla/parser/htmlparser/src/nsParserModule.cpp
index e1376e9ed13..13e7aba6d20 100644
--- a/mozilla/parser/htmlparser/src/nsParserModule.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserModule.cpp
@@ -37,6 +37,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#include "nsIAtom.h"
 #include "nsString.h"
 #include "nspr.h"
 #include "nsCOMPtr.h"
diff --git a/mozilla/parser/htmlparser/src/nsParserNode.cpp b/mozilla/parser/htmlparser/src/nsParserNode.cpp
index 0e4a6604893..874765982bb 100644
--- a/mozilla/parser/htmlparser/src/nsParserNode.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserNode.cpp
@@ -37,6 +37,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 
+#include "nsIAtom.h"
 #include "nsParserNode.h" 
 #include <string.h>
 #include "nsHTMLTokens.h"
diff --git a/mozilla/parser/htmlparser/src/nsParserService.cpp b/mozilla/parser/htmlparser/src/nsParserService.cpp
index 49296ae8db1..4ffd43b00c9 100644
--- a/mozilla/parser/htmlparser/src/nsParserService.cpp
+++ b/mozilla/parser/htmlparser/src/nsParserService.cpp
@@ -19,6 +19,7 @@
  *
  */
 
+#include "nsIAtom.h"
 #include "nsParserService.h"
 #include "nsHTMLEntities.h"
 #include "nsElementTable.h"
diff --git a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
index b40f9fbcaa8..f61f096595e 100644
--- a/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
+++ b/mozilla/parser/htmlparser/src/nsViewSourceHTML.cpp
@@ -68,6 +68,7 @@
 #  define START_TIMER()
 #endif
 
+#include "nsIAtom.h"
 #include "nsViewSourceHTML.h"
 #include "nsCRT.h"
 #include "nsParser.h"
diff --git a/mozilla/rdf/base/src/nsRDFContentSink.cpp b/mozilla/rdf/base/src/nsRDFContentSink.cpp
index 70c86160b90..5a160129927 100644
--- a/mozilla/rdf/base/src/nsRDFContentSink.cpp
+++ b/mozilla/rdf/base/src/nsRDFContentSink.cpp
@@ -93,6 +93,7 @@
 #include "nsReadableUtils.h"
 #include "nsIExpatSink.h"
 #include "nsCRT.h"
+#include "nsIAtom.h"
 
 ////////////////////////////////////////////////////////////////////////
 
diff --git a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
index b3ba31d94d1..49b417322dd 100644
--- a/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
+++ b/mozilla/rdf/chrome/src/nsChromeRegistry.cpp
@@ -108,6 +108,7 @@
 #include "nsIContent.h"
 #include "nsIDOMWindowCollection.h"
 #include "imgICache.h"
+#include "nsIAtom.h"
 
 static char kChromePrefix[] = "chrome://";
 static char kUseXBLFormsPref[] = "nglayout.debug.enable_xbl_forms";
@@ -244,7 +245,8 @@ NS_IMETHODIMP nsOverlayEnumerator::GetNext(nsISupports **aResult)
 
 ////////////////////////////////////////////////////////////////////////////////
 
-nsChromeRegistry::nsChromeRegistry()
+nsChromeRegistry::nsChromeRegistry() : mRDFService(nsnull),
+                                       mRDFContainerUtils(nsnull)
 {
   NS_INIT_REFCNT();
 
@@ -3105,6 +3107,7 @@ nsChromeRegistry::ProcessNewChromeBuffer(char *aBuffer, PRInt32 aLength)
 
   mBatchInstallFlushes = PR_TRUE;
 
+  // process chromeType, chromeProfile, chromeLocType, chromeLocation
   while (aBuffer < bufferEnd) {
     // parse one line of installed-chrome.txt
     chromeType = aBuffer;
@@ -3157,7 +3160,7 @@ nsChromeRegistry::ProcessNewChromeBuffer(char *aBuffer, PRInt32 aLength)
       if (NS_FAILED(rv))
         return rv;
 
-      /* xpidl strings aren't unified with strings, so this fu is necessary.
+      /* 
        * all we want here is the canonical url
        */
       rv = NS_GetURLSpecFromFile(chromeFile, chromeURL);
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 57eb524be33..8006c2de42e 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1115,31 +1115,6 @@ PRBool nsString::EqualsWithConversion(const char* aString,PRBool aIgnoreCase,PRI
 }
 
 PRInt32 Compare2To2(const PRUnichar* aStr1,const PRUnichar* aStr2,PRUint32 aCount);
-/**
- * Compare this to given atom; note that we compare full strings here.
- * The optional length argument just lets us know how long the given string is.
- * If you provide a length, it is compared to length of this string as an
- * optimization.
- * 
- * @update gess 01/04/99
- * @param  aString -- unistring to compare to this
- * @param  aLength -- length of given string.
- * @return TRUE if equal
- */
-PRBool nsString::EqualsAtom(nsIAtom* aAtom) const{
-  NS_ASSERTION(0!=aAtom,kNullPointerError);
-  PRBool result=PR_FALSE;
-  if(aAtom){
-    PRInt32 cmp=0;
-    const PRUnichar* unicode;
-    if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
-        return PR_FALSE;
-    cmp=Compare2To2(mUStr,unicode, nsCharTraits<PRUnichar>::length(mUStr));
-    result=PRBool(0==cmp);
-  }
-
-   return result;
-}
 
 /**
  *  Determine if given char is a valid space character
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index e1a8d23a85f..005e9b21dae 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -74,7 +74,6 @@
 #include "nsXPIDLString.h"
 #endif
 
-#include "nsIAtom.h"
 #include "nsStr.h"
 
 class UTF8traits
@@ -408,8 +407,6 @@ public:
   
   PRBool  EqualsWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
-  PRBool  EqualsAtom(nsIAtom* anAtom) const;
-
   PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
 
   /**
diff --git a/mozilla/xpcom/io/nsDirectoryService.h b/mozilla/xpcom/io/nsDirectoryService.h
index 9d33a134070..e86b5c7a26d 100644
--- a/mozilla/xpcom/io/nsDirectoryService.h
+++ b/mozilla/xpcom/io/nsDirectoryService.h
@@ -43,8 +43,7 @@
 #include "nsHashtable.h"
 #include "nsILocalFile.h"
 #include "nsISupportsArray.h"
-#include "nsXPIDLString.h"
-
+#include "nsIAtom.h"
 
 class nsDirectoryService : public nsIDirectoryService,
                            public nsIProperties,
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 57eb524be33..8006c2de42e 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1115,31 +1115,6 @@ PRBool nsString::EqualsWithConversion(const char* aString,PRBool aIgnoreCase,PRI
 }
 
 PRInt32 Compare2To2(const PRUnichar* aStr1,const PRUnichar* aStr2,PRUint32 aCount);
-/**
- * Compare this to given atom; note that we compare full strings here.
- * The optional length argument just lets us know how long the given string is.
- * If you provide a length, it is compared to length of this string as an
- * optimization.
- * 
- * @update gess 01/04/99
- * @param  aString -- unistring to compare to this
- * @param  aLength -- length of given string.
- * @return TRUE if equal
- */
-PRBool nsString::EqualsAtom(nsIAtom* aAtom) const{
-  NS_ASSERTION(0!=aAtom,kNullPointerError);
-  PRBool result=PR_FALSE;
-  if(aAtom){
-    PRInt32 cmp=0;
-    const PRUnichar* unicode;
-    if (aAtom->GetUnicode(&unicode) != NS_OK || unicode == nsnull)
-        return PR_FALSE;
-    cmp=Compare2To2(mUStr,unicode, nsCharTraits<PRUnichar>::length(mUStr));
-    result=PRBool(0==cmp);
-  }
-
-   return result;
-}
 
 /**
  *  Determine if given char is a valid space character
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index e1a8d23a85f..005e9b21dae 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -74,7 +74,6 @@
 #include "nsXPIDLString.h"
 #endif
 
-#include "nsIAtom.h"
 #include "nsStr.h"
 
 class UTF8traits
@@ -408,8 +407,6 @@ public:
   
   PRBool  EqualsWithConversion(const char* aString,PRBool aIgnoreCase=PR_FALSE,PRInt32 aCount=-1) const;
 
-  PRBool  EqualsAtom(nsIAtom* anAtom) const;
-
   PRBool  EqualsIgnoreCase(const char* aString,PRInt32 aCount=-1) const;
 
   /**
diff --git a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
index 3aeb2d4f366..686acf9170e 100644
--- a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
+++ b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp
@@ -51,6 +51,7 @@
 #include "nsIDateTimeFormat.h"
 #include "nsDateTimeFormatCID.h"
 #include "nsQuickSort.h"
+#include "nsIAtom.h"
 
 #include "nsWildCard.h"