diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index d884c321781..2cd97e70660 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -902,9 +902,9 @@ nsPluginTag::nsPluginTag(const char* aName,
     mMimeDescriptionArray(nsnull),
     mExtensionsArray(nsnull),
     mLibrary(nsnull),
-    mCanUnloadLibrary(aCanUnload),
     mEntryPoint(nsnull),
     mFlags(0),
+    mCanUnloadLibrary(aCanUnload),
     mXPConnected(PR_FALSE),
     mLastModifiedTime(aLastModifiedTime)
 {
@@ -2868,16 +2868,10 @@ NS_IMETHODIMP nsPluginHostImpl::GetURLWithHeaders(nsISupports* pluginInst,
 
   nsCOMPtr<nsIPluginInstance> instance = do_QueryInterface(pluginInst, &rv);
 
-#ifdef OJI
   if (NS_SUCCEEDED(rv))
   {
-    // if this is a Java plugin calling, we need to do a security check
-    nsCOMPtr<nsIJVMPluginInstance> javaInstance(do_QueryInterface(instance));
-
-    if (javaInstance)
-        rv = DoURLLoadSecurityCheck(instance, url);
+    rv = DoURLLoadSecurityCheck(instance, url);
   }
-#endif
 
   if (NS_SUCCEEDED(rv))
   {
@@ -2937,16 +2931,10 @@ NS_IMETHODIMP nsPluginHostImpl::PostURL(nsISupports* pluginInst,
 
   nsCOMPtr<nsIPluginInstance> instance = do_QueryInterface(pluginInst, &rv);
 
-#ifdef OJI
   if (NS_SUCCEEDED(rv))
   {
-    // if this is a Java plugin calling, we need to do a security check
-    nsCOMPtr<nsIJVMPluginInstance> javaInstance(do_QueryInterface(instance));
-
-    if (javaInstance)
-        rv = DoURLLoadSecurityCheck(instance, url);
+    rv = DoURLLoadSecurityCheck(instance, url);
   }
-#endif
 
   if (NS_SUCCEEDED(rv))
   {