diff --git a/mozilla/webshell/embed/gtk/lib/GtkMozillaInputStream.cpp b/mozilla/webshell/embed/gtk/lib/GtkMozillaInputStream.cpp
index 3f4552d7b0c..1e5cbe51651 100644
--- a/mozilla/webshell/embed/gtk/lib/GtkMozillaInputStream.cpp
+++ b/mozilla/webshell/embed/gtk/lib/GtkMozillaInputStream.cpp
@@ -14,6 +14,7 @@
  * created by Alexander Larsson are Copyright (C) 1999
  * Alexander Larsson. All Rights Reserved. 
  */
+#include "nscore.h"
 #include "GtkMozillaInputStream.h"
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIInputStreamIID, NS_IINPUTSTREAM_IID);
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.am b/mozilla/webshell/embed/gtk/lib/Makefile.am
index fb2b3bd540a..ce0edd619b9 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.am
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.am
@@ -94,7 +94,7 @@ MOZILLA_LIBS=-L$(MOZILLA_DIR)/dist/lib  \
 
 INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@
 
-CPPFLAGS = -DXP_UNIX
+CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\"
 
 libgtkmozilla_la_LIBADD = $(MOZILLA_LIBS) @GTK_LIBS@
 
diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in
index abbda17f931..6dbe06500f2 100644
--- a/mozilla/webshell/embed/gtk/lib/Makefile.in
+++ b/mozilla/webshell/embed/gtk/lib/Makefile.in
@@ -126,7 +126,7 @@ MOZILLA_LIBS = -L$(MOZILLA_DIR)/dist/lib          $(ALL_MOZ_LIBS)
 
 INCLUDES = $(MOZILLA_INCLUDES) @GTK_CFLAGS@ @DEBUG_FLAGS@
 
-CPPFLAGS = -DXP_UNIX
+CPPFLAGS = -DXP_UNIX -DMOZ_DLL_SUFFIX=\".so\"
 
 libgtkmozilla_la_LIBADD = $(MOZILLA_LIBS) @GTK_LIBS@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/mozilla/webshell/embed/gtk/lib/nsSetupRegistry.cpp b/mozilla/webshell/embed/gtk/lib/nsSetupRegistry.cpp
index 09789536468..b54653d5be4 100644
--- a/mozilla/webshell/embed/gtk/lib/nsSetupRegistry.cpp
+++ b/mozilla/webshell/embed/gtk/lib/nsSetupRegistry.cpp
@@ -234,7 +234,7 @@ NS_SetupRegistry()
   nsComponentManager::RegisterComponent(kWebShellCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponent(kCDocLoaderServiceCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponent(kThrobberCID, NULL, NULL, WEB_DLL, PR_FALSE, PR_FALSE);
-  nsComponentManager::RegisterComponent(kPrefCID, NULL, NULL, PREF_DLL, PR_FALSE, PR_FALSE);
+  nsComponentManager::RegisterComponent(kPrefCID, "Preferences Services", "component://netscape/preferences", PREF_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponent(kCPluginHostCID, NULL, NULL, PLUGIN_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponent(kCParserCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);
   nsComponentManager::RegisterComponent(kWellFormedDTDCID, NULL, NULL, PARSER_DLL, PR_FALSE, PR_FALSE);