diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index b490f6229c4..292c71f1889 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -43,6 +43,12 @@
 #include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
+
+// Friggin' X11 has to "#define None". Lame!
+#ifdef None
+#undef None
+#endif
+
 #include "nsIRegistry.h"
 #include "nsEnumeratorUtils.h"
 
@@ -118,6 +124,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 static NS_DEFINE_IID(kIFileUtilitiesIID, NS_IFILEUTILITIES_IID);
 static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
 
+static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
+
 // for the dialog
 static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
@@ -1501,8 +1509,6 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
   return rv;
 }
 
-static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
-
 NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
                                                const char* aPluginName,
                                                const char* aDescription,
@@ -2983,7 +2989,6 @@ nsPluginHostImpl::LoadXPCOMPlugins(nsIComponentManager* aComponentManager, nsIFi
   //
   // Enumerate through that list now, creating an nsPluginTag for
   // each.
-  static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
   nsCOMPtr<nsIRegistry> registry = do_CreateInstance(kRegistryCID);
   if (! registry)
     return NS_ERROR_FAILURE;
diff --git a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
index b490f6229c4..292c71f1889 100644
--- a/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/nglsrc/nsPluginHostImpl.cpp
@@ -43,6 +43,12 @@
 #include "nsNetUtil.h"
 #include "nsIProgressEventSink.h"
 #include "nsIDocument.h"
+
+// Friggin' X11 has to "#define None". Lame!
+#ifdef None
+#undef None
+#endif
+
 #include "nsIRegistry.h"
 #include "nsEnumeratorUtils.h"
 
@@ -118,6 +124,8 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 static NS_DEFINE_IID(kIFileUtilitiesIID, NS_IFILEUTILITIES_IID);
 static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID);
 
+static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
+
 // for the dialog
 static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
@@ -1501,8 +1509,6 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
   return rv;
 }
 
-static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
-
 NS_IMETHODIMP nsPluginHostImpl::RegisterPlugin(REFNSIID aCID,
                                                const char* aPluginName,
                                                const char* aDescription,
@@ -2983,7 +2989,6 @@ nsPluginHostImpl::LoadXPCOMPlugins(nsIComponentManager* aComponentManager, nsIFi
   //
   // Enumerate through that list now, creating an nsPluginTag for
   // each.
-  static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID);
   nsCOMPtr<nsIRegistry> registry = do_CreateInstance(kRegistryCID);
   if (! registry)
     return NS_ERROR_FAILURE;