diff --git a/mozilla/embedding/browser/build/Makefile.in b/mozilla/embedding/browser/build/Makefile.in
index 69a0003e3f8..10770297d6f 100644
--- a/mozilla/embedding/browser/build/Makefile.in
+++ b/mozilla/embedding/browser/build/Makefile.in
@@ -46,6 +46,7 @@ REQUIRES	= xpcom \
 		  timer \
 		  windowwatcher \
 		  mimetype \
+		  webbrowserpersist \
 		  $(NULL)
 
 CPPSRCS		= \
diff --git a/mozilla/embedding/browser/webBrowser/Makefile.in b/mozilla/embedding/browser/webBrowser/Makefile.in
index 799a59dff29..b604f32ab90 100644
--- a/mozilla/embedding/browser/webBrowser/Makefile.in
+++ b/mozilla/embedding/browser/webBrowser/Makefile.in
@@ -45,6 +45,7 @@ REQUIRES	= xpcom \
 		  windowwatcher \
 		  wallet \
 		  appcomps \
+		  webbrowserpersist \
 		  $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
@@ -64,7 +65,6 @@ XPIDLSRCS	= \
 		nsIEmbeddingSiteWindow.idl  \
 		nsITooltipListener.idl		\
 		nsITooltipTextProvider.idl	\
-		nsIWebBrowserPersist.idl		\
 		nsIWebBrowserFocus.idl		\
 		nsIWebBrowserPrint.idl       \
 		$(NULL)
@@ -73,8 +73,6 @@ CPPSRCS		= \
 		nsDocShellTreeOwner.cpp		\
 		nsWebBrowser.cpp		\
 		nsCommandHandler.cpp		\
-		nsWebBrowserPersist.cpp		\
-		nsDOMWalker.cpp			\
 		nsNonPersistAuthPrompt.cpp      \
                 nsWebBrowserContentPolicy.cpp   \
 		$(NULL)
diff --git a/mozilla/embedding/components/Makefile.in b/mozilla/embedding/components/Makefile.in
index b29487618f7..7c44044c778 100644
--- a/mozilla/embedding/components/Makefile.in
+++ b/mozilla/embedding/components/Makefile.in
@@ -24,6 +24,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = windowwatcher appstartup find ui jsconsole build
+DIRS = windowwatcher appstartup find ui jsconsole webbrowserpersist build
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/embedding/components/build/Makefile.in b/mozilla/embedding/components/build/Makefile.in
index 6ffda5f271c..9174b187434 100644
--- a/mozilla/embedding/components/build/Makefile.in
+++ b/mozilla/embedding/components/build/Makefile.in
@@ -33,11 +33,16 @@ REQUIRES	= js \
 		  xpcom \
 		  string \
 		  windowwatcher \
+		  webbrowserpersist \
 		  jsconsole \
 		  find \
 		  embed_base \
 		  dom \
 		  txtsvc \
+		  mimetype \
+		  content \
+		  uriloader \
+		  necko \
 		  $(NULL)
 
 CPPSRCS		= nsModule.cpp
@@ -47,6 +52,7 @@ SHARED_LIBRARY_LIBS = \
 	$(DIST)/lib/libappstartupnotifier_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libjsconsole_s.$(LIB_SUFFIX) \
 	$(DIST)/lib/libfind_s.$(LIB_SUFFIX) \
+	$(DIST)/lib/libwebbrowserpersist_s.$(LIB_SUFFIX) \
 	$(NULL)
 
 ifdef MOZ_PERF_METRICS
@@ -58,6 +64,7 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../appstartup/src  \
 	-I$(srcdir)/../jsconsole/src  \
 	-I$(srcdir)/../find/src  \
+	-I$(srcdir)/../webbrowserpersist/src  \
 	$(NULL)
 
 EXTRA_DSO_LDOPTS = \