Index: mozilla/mailnews/compose/src/nsMsgSendLater.cpp
===================================================================
RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgSendLater.cpp,v
retrieving revision 1.104
diff -pU0 -r1.104 mozilla/mailnews/compose/src/nsMsgSendLater.cpp
--- mozilla/mailnews/compose/src/nsMsgSendLater.cpp
+++ mozilla/mailnews/compose/src/nsMsgSendLater.cpp
@@ -75,2 +74,0 @@
-static NS_DEFINE_CID(kISupportsArrayCID, NS_SUPPORTSARRAY_CID);
-
@@ -772 +770 @@ nsMsgSendLater::DeleteCurrentMessage()
-  nsCOMPtr<nsISupportsArray> msgArray = do_CreateInstance(kISupportsArrayCID);
+  nsCOMPtr<nsISupportsArray> msgArray = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID);
Index: mozilla/mailnews/import/src/nsImportAddressBooks.cpp
===================================================================
RCS file: /cvsroot/mozilla/mailnews/import/src/nsImportAddressBooks.cpp,v
retrieving revision 1.53
diff -pU0 -r1.53 mozilla/mailnews/import/src/nsImportAddressBooks.cpp
--- mozilla/mailnews/import/src/nsImportAddressBooks.cpp
+++ mozilla/mailnews/import/src/nsImportAddressBooks.cpp
@@ -75,5 +74,0 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_
-static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID);
-
-
-////////////////////////////////////////////////////////////////////////
-
@@ -302 +297 @@ NS_IMETHODIMP nsImportGenericAddressBook
-			nsCOMPtr<nsISupportsString>	data = do_CreateInstance( kSupportsWStringCID, &rv);
+			nsCOMPtr<nsISupportsString>	data = do_CreateInstance( NS_SUPPORTS_STRING_CONTRACTID, &rv);
Index: mozilla/mailnews/import/src/nsImportMail.cpp
===================================================================
RCS file: /cvsroot/mozilla/mailnews/import/src/nsImportMail.cpp,v
retrieving revision 1.63
diff -pU0 -r1.63 mozilla/mailnews/import/src/nsImportMail.cpp
--- mozilla/mailnews/import/src/nsImportMail.cpp
+++ mozilla/mailnews/import/src/nsImportMail.cpp
@@ -81,2 +80,0 @@
-static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID);
-
@@ -286 +284 @@ NS_IMETHODIMP nsImportGenericMail::GetDa
-		nsCOMPtr<nsISupportsString>	data = do_CreateInstance( kSupportsWStringCID, &rv);
+		nsCOMPtr<nsISupportsString>	data = do_CreateInstance( NS_SUPPORTS_STRING_CONTRACTID, &rv);
Index: mozilla/xpinstall/src/nsInstallExecute.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpinstall/src/nsInstallExecute.cpp,v
retrieving revision 1.31
diff -pU0 -r1.31 mozilla/xpinstall/src/nsInstallExecute.cpp
--- mozilla/xpinstall/src/nsInstallExecute.cpp
+++ mozilla/xpinstall/src/nsInstallExecute.cpp
@@ -55,2 +54,0 @@
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); 
-
@@ -203 +201 @@ PRInt32 nsInstallExecute::Complete()
-   nsCOMPtr<nsIProcess> process = do_CreateInstance(kIProcessCID);
+   nsCOMPtr<nsIProcess> process = do_CreateInstance(NS_PROCESS_CONTRACTID);
Index: mozilla/xpinstall/src/nsInstallFileOpItem.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpinstall/src/nsInstallFileOpItem.cpp,v
retrieving revision 1.69
diff -pU0 -r1.69 mozilla/xpinstall/src/nsInstallFileOpItem.cpp
--- mozilla/xpinstall/src/nsInstallFileOpItem.cpp
+++ mozilla/xpinstall/src/nsInstallFileOpItem.cpp
@@ -62,2 +61,0 @@
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); 
-
@@ -970 +968 @@ nsInstallFileOpItem::NativeFileOpFileExe
-  nsCOMPtr<nsIProcess> process = do_CreateInstance(kIProcessCID);
+  nsCOMPtr<nsIProcess> process = do_CreateInstance(NS_PROCESS_CONTRACTID);
Index: mozilla/xpinstall/src/nsSoftwareUpdate.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpinstall/src/nsSoftwareUpdate.cpp,v
retrieving revision 1.110
diff -pU0 -r1.110 mozilla/xpinstall/src/nsSoftwareUpdate.cpp
--- mozilla/xpinstall/src/nsSoftwareUpdate.cpp
+++ mozilla/xpinstall/src/nsSoftwareUpdate.cpp
@@ -91,4 +90,0 @@ extern "C" void RunChromeInstallOnThread
-
-
-static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID);
-
@@ -222 +218 @@ nsSoftwareUpdate::Shutdown()
-        nsCOMPtr<nsIProcess> cleanupProcess = do_CreateInstance(kIProcessCID);
+        nsCOMPtr<nsIProcess> cleanupProcess = do_CreateInstance(NS_PROCESS_CONTRACTID);