diff --git a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
index 0076fb4be1c..1f8d7d24f61 100644
--- a/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLAppletElement.cpp
@@ -30,7 +30,7 @@
 #include "nsIPresShell.h"
 #include "nsIFrame.h"
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 #include "nsIServiceManager.h"
 #include "nsIJVMManager.h"
 #include "nsILiveConnectManager.h"
@@ -251,7 +251,7 @@ nsHTMLAppletElement::GetStyleHintForAttributeChange(
   return NS_OK;
 }
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance);
 #endif
 
@@ -266,7 +266,7 @@ NS_IMETHODIMP
 nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
                                      void** aScriptObject)
 {
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 	nsresult rv = NS_OK;
 	if (!mReflectedApplet) {
 		// 1. get the script object corresponding to the <APPLET> element itself.
diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index 3df8e138884..c712c8ea7a2 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -34,7 +34,7 @@
 #include "nsDOMCID.h"
 #include "nsIServiceManager.h"
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 #include "nsIJVMManager.h"
 #include "nsILiveConnectManager.h"
 #endif
@@ -210,7 +210,7 @@ nsJSContext::InitializeLiveConnectClasses()
 {
 	nsresult result = NS_OK;
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 	nsILiveConnectManager* manager = NULL;
 	result = nsServiceManager::GetService(nsIJVMManager::GetCID(),
 	                                  nsILiveConnectManager::GetIID(),
@@ -374,7 +374,7 @@ nsJSEnvironment::nsJSEnvironment()
 {
   mRuntime = JS_Init(gGCSize);
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
   // Initialize LiveConnect.
   nsILiveConnectManager* manager = NULL;
   nsresult result = nsServiceManager::GetService(nsIJVMManager::GetCID(),
diff --git a/mozilla/layout/html/content/src/nsHTMLAppletElement.cpp b/mozilla/layout/html/content/src/nsHTMLAppletElement.cpp
index 0076fb4be1c..1f8d7d24f61 100644
--- a/mozilla/layout/html/content/src/nsHTMLAppletElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLAppletElement.cpp
@@ -30,7 +30,7 @@
 #include "nsIPresShell.h"
 #include "nsIFrame.h"
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 #include "nsIServiceManager.h"
 #include "nsIJVMManager.h"
 #include "nsILiveConnectManager.h"
@@ -251,7 +251,7 @@ nsHTMLAppletElement::GetStyleHintForAttributeChange(
   return NS_OK;
 }
 
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance);
 #endif
 
@@ -266,7 +266,7 @@ NS_IMETHODIMP
 nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
                                      void** aScriptObject)
 {
-#if defined(OJI) && !defined(XP_UNIX)
+#if defined(OJI)
 	nsresult rv = NS_OK;
 	if (!mReflectedApplet) {
 		// 1. get the script object corresponding to the <APPLET> element itself.