diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 10bde0f2844..8ae310274c8 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -2545,10 +2545,6 @@ nsPluginHostImpl::nsPluginHostImpl()
 
     mPrefService->GetBoolPref("plugin.default_plugin_disabled", &tmp);
     mDefaultPluginDisabled = tmp;
-
-#ifdef WINCE
-    mDefaultPluginDisabled = PR_TRUE;
-#endif
   }
 
   nsCOMPtr<nsIObserverService> obsService = do_GetService("@mozilla.org/observer-service;1");
diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
index 773ec307e7c..8b7a34e79f9 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
@@ -129,10 +129,8 @@ public:
   virtual nsresult CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPluginInstance);
 
 private:
-#ifndef WINCE
   nsresult SubclassAndAssociateWindow();
   nsresult UndoSubclassAndAssociateWindow();
-#endif
 
 public:
   // locals
@@ -476,25 +474,17 @@ nsresult nsPluginNativeWindowWin::CallSetWindow(nsCOMPtr<nsIPluginInstance> &aPl
 {
   // check the incoming instance, null indicates that window is going away and we are
   // not interested in subclassing business any more, undo and don't subclass
-
-  // WINCE does not subclass windows.  See bug 300011 for the details.
-#ifndef WINCE
   if (!aPluginInstance)
     UndoSubclassAndAssociateWindow();
-#endif
 
   nsPluginNativeWindow::CallSetWindow(aPluginInstance);
 
-#ifndef WINCE
   if (aPluginInstance)
     SubclassAndAssociateWindow();
-#endif
 
   return NS_OK;
 }
 
-#ifndef WINCE
-
 nsresult nsPluginNativeWindowWin::SubclassAndAssociateWindow()
 {
   if (type != nsPluginWindowType_Window)
@@ -542,7 +532,6 @@ nsresult nsPluginNativeWindowWin::UndoSubclassAndAssociateWindow()
 
   return NS_OK;
 }
-#endif // WINCE
 
 nsresult PLUG_NewPluginNativeWindow(nsPluginNativeWindow ** aPluginNativeWindow)
 {
diff --git a/mozilla/security/manager/boot/src/Makefile.in b/mozilla/security/manager/boot/src/Makefile.in
index 73475624519..8cc6e4f3d3a 100644
--- a/mozilla/security/manager/boot/src/Makefile.in
+++ b/mozilla/security/manager/boot/src/Makefile.in
@@ -55,7 +55,6 @@ MOZILLA_INTERNAL_API = 1
 
 ifdef MINIMO
 FORCE_SHARED_LIB = 1
-FORCE_USE_PIC = 1
 endif
 
 PACKAGE_FILE = pipboot.pkg
diff --git a/mozilla/security/manager/pki/src/Makefile.in b/mozilla/security/manager/pki/src/Makefile.in
index 8f54ca77753..f6c1aff05ac 100644
--- a/mozilla/security/manager/pki/src/Makefile.in
+++ b/mozilla/security/manager/pki/src/Makefile.in
@@ -56,7 +56,6 @@ MOZILLA_INTERNAL_API = 1
 
 ifdef MINIMO
 FORCE_SHARED_LIB = 1
-FORCE_USE_PIC = 1
 endif
 
 PACKAGE_FILE = pippki.pkg
diff --git a/mozilla/security/manager/ssl/src/Makefile.in b/mozilla/security/manager/ssl/src/Makefile.in
index 45ff839cc37..510ff5abddb 100644
--- a/mozilla/security/manager/ssl/src/Makefile.in
+++ b/mozilla/security/manager/ssl/src/Makefile.in
@@ -56,7 +56,6 @@ MOZILLA_INTERNAL_API = 1
 
 ifdef MINIMO
 FORCE_SHARED_LIB = 1
-FORCE_USE_PIC = 1
 endif
 
 PACKAGE_FILE = pipnss.pkg