diff --git a/mozilla/intl/uconv/tests/nsTestUConv.cpp b/mozilla/intl/uconv/tests/nsTestUConv.cpp
index 59f8b877274..c5266a72aa8 100644
--- a/mozilla/intl/uconv/tests/nsTestUConv.cpp
+++ b/mozilla/intl/uconv/tests/nsTestUConv.cpp
@@ -33,11 +33,6 @@
 #include "nsICharRepresentable.h"
 #include "prmem.h"
 
-// {84B0F181-C6C7-11d2-B3B0-00805F8A6670}
-#undef NS_IMPL_IDS
-NS_DECLARE_ID(kIPlatformCharsetIID, 
- 0x84b0f181, 0xc6c7, 0x11d2, 0xb3, 0xb0, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70 );
-#define NS_IMPL_IDS
 
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID);
@@ -1083,7 +1078,7 @@ nsresult  testPlatformCharset()
 {
   nsIPlatformCharset * cinfo;
   nsresult res = nsServiceManager::GetService(kPlatformCharsetCID,
-      kIPlatformCharsetIID, (nsISupports **)&cinfo);
+      NS_GET_IID(nsIPlatformCharset), (nsISupports **)&cinfo);
   if (NS_FAILED(res)) {
     printf("ERROR at GetService() code=0x%x.\n",res);
     return res;
diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp
index 955d6011256..c044fc470c1 100644
--- a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp
+++ b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp
@@ -56,9 +56,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 //----------------------------------------------------------------------------
 
 
diff --git a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
index 4ca1dbe372f..57fcb198ea6 100644
--- a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
+++ b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp
@@ -71,9 +71,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 NS_IMPL_NSUCONVERTERREGSELF
 
 NS_UCONV_REG_UNREG(nsCP850ToUnicode, "IBM850", "Unicode" , NS_CP850TOUNICODE_CID);
diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp
index 7d0b7b83ee8..6147ffea584 100644
--- a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp
+++ b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp
@@ -50,9 +50,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 PRUint16 g_uf0201Mapping[] = {
 #include "jis0201.uf"
 };
diff --git a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp
index c1a77712e07..14d8fe190f3 100644
--- a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp
+++ b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp
@@ -51,9 +51,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 PRUint16 g_utKSC5601Mapping[] = {
 #include "u20kscgl.ut"
 };
diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp
index d851ca7f3f6..a2705d36cf2 100644
--- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp
+++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp
@@ -162,9 +162,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 NS_IMPL_NSUCONVERTERREGSELF
 
 NS_UCONV_REG_UNREG(nsAsciiToUnicode, "us-ascii", "Unicode" , NS_ASCIITOUNICODE_CID);
diff --git a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp
index f91bbb18a39..2562fe073bc 100644
--- a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp
+++ b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp
@@ -72,9 +72,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 NS_IMPL_NSUCONVERTERREGSELF
 
 #if defined(XP_PC) || defined(XP_MAC)
diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp
index 843ddb8c556..37e0b695457 100644
--- a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp
+++ b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp
@@ -49,9 +49,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 PRUint16 g_ufBig5Mapping[] = {
 #include "big5.uf"
 };
diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp
index 0b89d7b3141..97dc5aea612 100644
--- a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp
+++ b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp
@@ -55,9 +55,6 @@ static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 #define DECODER_NAME_BASE "Unicode Decoder-"
 #define ENCODER_NAME_BASE "Unicode Encoder-"
 
-PRInt32 g_InstanceCount = 0;
-PRInt32 g_LockCount = 0;
-
 PRUint16 g_ufCNS1MappingTable[] = {
 #include "cns_1.uf"
 };