--- a/suite/build/nsSuiteModule.cpp
+++ b/suite/build/nsSuiteModule.cpp
@@ -40,34 +40,30 @@
 #include "nsSuiteDirectoryProvider.h"
 #include "nsProfileMigrator.h"
 #include "nsThunderbirdProfileMigrator.h"
 #include "nsNetCID.h"
 #include "nsRDFCID.h"
 #include "nsFeedSniffer.h"
 
 #if defined(XP_WIN)
-#if !defined(BUILD_STATIC_SHELL)
 #include "nsWindowsShellService.h"
-#endif
-#elif defined(XP_MACOSX) && !defined(BUILD_STATIC_SHELL)
+#elif defined(XP_MACOSX)
 #include "nsMacShellService.h"
-#elif defined(MOZ_WIDGET_GTK2) && !defined(BUILD_STATIC_SHELL)
+#elif defined(MOZ_WIDGET_GTK2)
 #include "nsGNOMEShellService.h"
 #endif
 
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(XP_WIN)
-#if !defined(BUILD_STATIC_SHELL)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowsShellService, Init)
-#endif
-#elif defined(XP_MACOSX) && !defined(BUILD_STATIC_SHELL)
+#elif defined(XP_MACOSX)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
-#elif defined(MOZ_WIDGET_GTK2) && !defined(BUILD_STATIC_SHELL)
+#elif defined(MOZ_WIDGET_GTK2)
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
 #endif
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSuiteDirectoryProvider)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsThunderbirdProfileMigrator)
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
 
 #if defined(NS_SUITEWININTEGRATION_CID)

--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -22,21 +22,15 @@ ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 CPPSRCS = nsGNOMEShellService.cpp
 endif
 endif
 endif
 
 # We need to link the windows shell service into seamonkey.exe.
 ifdef CPPSRCS
 LIBRARY_NAME = shellservice_s
-ifdef BUILD_STATIC_SHELL
-MOZILLA_INTERNAL_API = 1
-EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-MODULE_NAME = nsSuiteShellModule
-endif
 endif
 
 DEFINES += \
 	-DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/suite/shell/src/nsGNOMEShellService.cpp
+++ b/suite/shell/src/nsGNOMEShellService.cpp
@@ -36,17 +36,16 @@
 
 #include "nsCOMPtr.h"
 #include "nsComponentManagerUtils.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsGNOMEShellService.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIGConfService.h"
-#include "mozilla/ModuleUtils.h"
 #include "nsIGnomeVFSService.h"
 #include "nsILocalFile.h"
 #include "nsIProcess.h"
 #include "prenv.h"
 
 NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
 
 nsresult
@@ -144,32 +143,8 @@ nsGNOMEShellService::OpenApplicationWith
   return process->Run(false, &specStr, 1);
 }
 
 NS_IMETHODIMP
 nsGNOMEShellService::GetDefaultFeedReader(nsILocalFile** _retval)
 {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
-
-#ifdef BUILD_STATIC_SHELL
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
-NS_DEFINE_NAMED_CID(NS_SUITEGNOMEINTEGRATION_CID);
-
-static const mozilla::Module::CIDEntry kSuiteShellCIDs[] = {
-  { &kNS_SUITEGNOMEINTEGRATION_CID, false, NULL, nsGNOMEShellServiceConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kSuiteShellContracts[] = {
-  { NS_SUITEFEEDSERVICE_CONTRACTID, &kNS_SUITEGNOMEINTEGRATION_CID },
-  { NULL }
-};
-
-static const mozilla::Module kSuiteShellModule = {
-  mozilla::Module::kVersion,
-  kSuiteShellCIDs,
-  kSuiteShellContracts
-};
-
-NSMODULE_DEFN(nsSuiteShellModule) = &kSuiteShellModule;
-#endif
-

--- a/suite/shell/src/nsMacShellService.cpp
+++ b/suite/shell/src/nsMacShellService.cpp
@@ -39,17 +39,16 @@
 
 #include "nsCOMPtr.h"
 #include "nsServiceManagerUtils.h"
 #include "nsComponentManagerUtils.h"
 #include "nsMacShellService.h"
 #include "nsStringGlue.h"
 #include "nsIDOMElement.h"
 #include "nsILocalFileMac.h"
-#include "mozilla/ModuleUtils.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <Carbon/Carbon.h>
 
 #define SAFARI_BUNDLE_IDENTIFIER "com.apple.Safari"
 
 NS_IMPL_ISUPPORTS1(nsMacShellService, nsIShellService)
 
@@ -184,32 +183,8 @@ nsMacShellService::GetDefaultFeedReader(
 
     ::CFRelease(defaultHandlerURL);
   }
 
   ::CFRelease(defaultHandlerID);
 
   return rv;
 }
-
-#ifdef BUILD_STATIC_SHELL
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
-NS_DEFINE_NAMED_CID(NS_SUITEMACINTEGRATION_CID);
-
-static const mozilla::Module::CIDEntry kSuiteShellCIDs[] = {
-  { &kNS_SUITEMACINTEGRATION_CID, false, NULL, nsMacShellServiceConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kSuiteShellContracts[] = {
-  { NS_SUITEFEEDSERVICE_CONTRACTID, &kNS_SUITEMACINTEGRATION_CID },
-  { NULL }
-};
-
-static const mozilla::Module kSuiteShellModule = {
-  mozilla::Module::kVersion,
-  kSuiteShellCIDs,
-  kSuiteShellContracts
-};
-
-NSMODULE_DEFN(nsSuiteShellModule) = &kSuiteShellModule;
-#endif
-

--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -59,23 +59,18 @@
 #include "nsIServiceManager.h"
 #include "nsServiceManagerUtils.h"
 #include "nsAppDirectoryServiceDefs.h"
 #include "nsDirectoryServiceDefs.h"
 #include "nsDirectoryServiceUtils.h"
 #include "nsIWinTaskbar.h"
 #include "nsISupportsPrimitives.h"
 #include <mbstring.h>
-#include "mozilla/ModuleUtils.h"
 #include "mozilla/Services.h"
 
-#ifdef MOZILLA_INTERNAL_API
-#define CaseInsensitiveCompare nsCaseInsensitiveStringComparator()
-#endif
-
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
 #endif
 #define _WIN32_WINNT 0x0600
 #define INITGUID
 #include <shlobj.h>
 
 #ifndef MAX_BUF
@@ -976,32 +971,8 @@ nsWindowsShellService::GetDefaultFeedRea
   rv = defaultReader->Exists(&exists);
   NS_ENSURE_SUCCESS(rv, rv);
   if (!exists)
     return NS_ERROR_FAILURE;
 
   NS_ADDREF(*_retval = defaultReader);
   return NS_OK;
 }
-
-#ifdef BUILD_STATIC_SHELL
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsWindowsShellService, Init)
-NS_DEFINE_NAMED_CID(NS_SUITEWININTEGRATION_CID);
-
-static const mozilla::Module::CIDEntry kSuiteShellCIDs[] = {
-  { &kNS_SUITEWININTEGRATION_CID, false, NULL, nsWindowsShellServiceConstructor },
-  { NULL }
-};
-
-static const mozilla::Module::ContractIDEntry kSuiteShellContracts[] = {
-  { NS_SUITESHELLSERVICE_CONTRACTID, &kNS_SUITEWININTEGRATION_CID },
-  { NS_SUITEFEEDSERVICE_CONTRACTID, &kNS_SUITEWININTEGRATION_CID },
-  { NULL }
-};
-
-static const mozilla::Module kSuiteShellModule = {
-  mozilla::Module::kVersion,
-  kSuiteShellCIDs,
-  kSuiteShellContracts
-};
-
-NSMODULE_DEFN(nsSuiteShellModule) = &kSuiteShellModule;
-#endif