diff --git a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
index 3939dc9c285..dc174f6825d 100644
--- a/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
+++ b/mozilla/webshell/tests/viewer/nsSetupRegistry.cpp
@@ -35,10 +35,13 @@
 #include "nsDOMCID.h"
 #include "nsLayoutCID.h"
 #include "nsINetService.h"
+#ifdef XP_PC
 #include "nsICapsManager.h"
 #include "nsILiveconnect.h"
-#include "nsIPluginManager.h"
 #include "nsIJVMManager.h"
+#endif
+#include "nsIPluginManager.h"
+
 
 #include "nsIEditor.h"
 
@@ -168,9 +171,11 @@ static NS_DEFINE_CID(kRangeListCID,				NS_RANGELIST_CID);
 static NS_DEFINE_CID(kFrameUtilCID,             NS_FRAME_UTIL_CID);
 
 static NS_DEFINE_CID(kCPluginManagerCID,          NS_PLUGINMANAGER_CID);
+#ifdef XP_PC
 static NS_DEFINE_CID(kCapsManagerCID,             NS_CCAPSMANAGER_CID);
 static NS_DEFINE_CID(kLiveconnectCID,             NS_CLIVECONNECT_CID);
 static NS_DEFINE_CID(kJVMManagerCID,              NS_JVMMANAGER_CID);
+#endif
 
 extern "C" void
 NS_SetupRegistry()
@@ -243,8 +248,10 @@ NS_SetupRegistry()
   nsRepository::RegisterFactory(kFrameUtilCID,      LAYOUT_DLL, PR_FALSE, PR_FALSE);
 
   nsRepository::RegisterFactory(kCPluginManagerCID, PLUGIN_DLL,      PR_FALSE, PR_FALSE);
+#ifdef XP_PC
   nsRepository::RegisterFactory(kCapsManagerCID, CAPS_DLL,          PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kLiveconnectCID, LIVECONNECT_DLL,   PR_FALSE, PR_FALSE);
   nsRepository::RegisterFactory(kJVMManagerCID,  OJI_DLL,           PR_FALSE, PR_FALSE);
+#endif
 
 }