Include nscore.h instead of nsCom.h. b=226555 r=dougt sr=darin a=asa

intl/lwbrk/src/nsLWBreakerFImp.h

@@ -40,7 +40,7 @@
 
 
 
-#include "nsCom.h"
+#include "nscore.h"
 #include "nsISupports.h"
 
 #include "nsILineBreakerFactory.h"

intl/unicharutil/src/nsCaseConversionImp2.h

@@ -39,7 +39,7 @@
 #ifndef nsCaseConversionImp2_h__
 #define nsCaseConversionImp2_h__
 
-#include "nsCom.h"
+#include "nscore.h"
 #include "nsISupports.h"
 
 #include "nsICaseConversion.h"

intl/unicharutil/src/nsCategoryImp.cpp

@@ -36,7 +36,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsCom.h"
+#include "nscore.h"
 #include "pratom.h"
 #include "nsUUDll.h"
 #include "nsISupports.h"

intl/unicharutil/src/nsCategoryImp.h

@@ -38,7 +38,7 @@
 #ifndef nsCategoryImp_h__
 #define nsCategoryImp_h__
 
-#include "nsCom.h"
+#include "nscore.h"
 #include "nsISupports.h"
 #include "nsIUGenCategory.h"
 

intl/unicharutil/src/nsUnicodeNormalizer.h

@@ -38,7 +38,7 @@
 #ifndef nsUnicodeNormalizer_h__
 #define nsUnicodeNormalizer_h__
 
-#include "nsCom.h"
+#include "nscore.h"
 #include "nsISupports.h"
 
 #include "nsIUnicodeNormalizer.h"

mailnews/base/src/nsMessenger.h

@@ -38,7 +38,6 @@
 #ifndef __nsMsgAppCore_h
 #define __nsMsgAppCore_h
 
-#include "nsCom.h"
 #include "nscore.h"
 #include "nsIMessenger.h"
 #include "nsCOMPtr.h"

mailnews/base/util/nsMsgIncomingServer.cpp

@@ -38,7 +38,6 @@
 
 #include "nsMsgIncomingServer.h"
 #include "nscore.h"
-#include "nsCom.h"
 #include "plstr.h"
 #include "prmem.h"
 #include "prprf.h"

modules/oji/src/nsJVMManager.h

@@ -40,7 +40,7 @@
 
 #include "jvmmgr.h"
 #include "prtypes.h"
-#include "nsCom.h"
+#include "nscore.h"
 #include "jni.h"
 #include "jsdbgapi.h"
 #include "nsError.h"

uriloader/base/nsDocLoader.cpp

@@ -48,7 +48,7 @@
 
 #include "nsIURL.h"
 #include "nsCOMPtr.h"
-#include "nsCom.h"
+#include "nscore.h"
 #include "nsWeakPtr.h"
 
 #include "nsIDOMWindow.h"

uriloader/exthandler/mac/nsDecodeAppleFile.h

@@ -38,7 +38,6 @@
 #ifndef nsDecodeAppleFile_h__
 #define nsDecodeAppleFile_h__
 
-#include "nsCom.h"
 #include "nscore.h"
 #include "nsCOMPtr.h"
 #include "nsIFile.h"

xpcom/ds/nsFixedSizeAllocator.h

@@ -129,7 +129,6 @@
 #define nsFixedSizeAllocator_h__
 
 #include "nscore.h"
-#include "nsCom.h"
 #include "nsError.h"
 #include "plarena.h"
 

xpcom/ds/nsHashtable.h

@@ -40,7 +40,6 @@
 #include "pldhash.h"
 #include "prlock.h"
 #include "nscore.h"
-#include "nsCom.h"
 #include "nsString.h"
 
 class nsIObjectInputStream;

xpcom/ds/nsStatistics.h

@@ -29,7 +29,6 @@
 
 #include <stdio.h>
 #include "nscore.h"
-#include "nsCom.h"
 #include "plhash.h"
 
 /**

xpcom/ds/nsVector.h

@@ -39,7 +39,7 @@
 #define nsVector_h__
 
 #include "plvector.h"
-#include "nsCom.h"
+#include "nscore.h"
 
 class nsVector : public PLVector {
 public:

xpcom/glue/nsTraceRefcnt.h

@@ -38,9 +38,8 @@
 #ifndef nsTraceRefcnt_h___
 #define nsTraceRefcnt_h___
 
-#include "nsCom.h"
-
-#include <stdio.h>
+#include "nscore.h"
+#include <stdio.h> // XXXldb We should remove this and add it where needed.
 
 class nsISupports;
 

xpcom/tests/TestAutoPtr.cpp

@@ -23,7 +23,7 @@
 
 #include "nsAutoPtr.h"
 #include <stdio.h>
-#include "nsCom.h"
+#include "nscore.h"
 
 class TestObjectBaseA {
     public: