diff --git a/mozilla/docshell/shistory/public/nsISHistoryInternal.idl b/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
index ae7af1354bb..5959d779806 100644
--- a/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
+++ b/mozilla/docshell/shistory/public/nsISHistoryInternal.idl
@@ -40,9 +40,9 @@
 #include "nsIFactory.idl"
 #include "nsISHEntry.idl"
 #include "nsISHTransaction.idl"
-#include "nsIDocShell.idl"
 
 interface nsISHistoryListener;
+interface nsIDocShell;
 
 %{C++
 #define NS_SHISTORY_INTERNAL_CID \
diff --git a/mozilla/docshell/shistory/src/Makefile.in b/mozilla/docshell/shistory/src/Makefile.in
index 8137f54a56b..3ae97ccb550 100644
--- a/mozilla/docshell/shistory/src/Makefile.in
+++ b/mozilla/docshell/shistory/src/Makefile.in
@@ -27,11 +27,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= shistory
-LIBRARY_NAME	= shistory
+LIBRARY_NAME	= shistory_s
 EXPORT_LIBRARY = 1
-IS_COMPONENT	= 1
-MODULE_NAME	= Session_History_Module
-GRE_MODULE	= 1
+FORCE_STATIC_LIB = 1
 
 REQUIRES	= xpcom \
 		  string \
@@ -44,7 +42,6 @@ REQUIRES	= xpcom \
 
 CPPSRCS		= nsSHEntry.cpp        \
             nsSHTransaction.cpp   \
-            nsSHistoryModule.cpp \
             nsSHistory.cpp \
             $(NULL)
 
diff --git a/mozilla/docshell/shistory/src/nsSHistory.cpp b/mozilla/docshell/shistory/src/nsSHistory.cpp
index 36b0d77f9b9..836959ba8bd 100644
--- a/mozilla/docshell/shistory/src/nsSHistory.cpp
+++ b/mozilla/docshell/shistory/src/nsSHistory.cpp
@@ -29,6 +29,7 @@
 
 // Interfaces Needed
 #include "nsILayoutHistoryState.h"
+#include "nsIDocShell.h"
 #include "nsIDocShellLoadInfo.h"
 #include "nsISHContainer.h"
 #include "nsIDocShellTreeItem.h"