diff --git a/toolkit/components/startup/tests/browser/Makefile.in b/toolkit/components/startup/tests/browser/Makefile.in
deleted file mode 100644
index 6863182354d232e39160ae6f82a38a75669185d0..0000000000000000000000000000000000000000
--- a/toolkit/components/startup/tests/browser/Makefile.in
+++ /dev/null
@@ -1,55 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Mozilla Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2010
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Dave Townsend <dtownsend@oxymoronical.com> (Original Author)
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH = ../../../../..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-relativesrcdir = toolkit/components/startup/tests/browser
-
-include $(DEPTH)/config/autoconf.mk
-include $(topsrcdir)/config/rules.mk
-
-_BROWSER_FILES = \
- browser_bug511456.js \
- browser_bug537449.js \
- browser_crash_detection.js \
- beforeunload.html \
- $(NULL)
-
-libs:: $(_BROWSER_FILES)
- $(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/browser/$(relativesrcdir)
diff --git a/toolkit/components/startup/tests/browser/beforeunload.html b/toolkit/components/startup/tests/browser/beforeunload.html
deleted file mode 100644
index 886681c110df2e550dad4730d417a9a76a74b434..0000000000000000000000000000000000000000
--- a/toolkit/components/startup/tests/browser/beforeunload.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
- <script>
- window.onbeforeunload = function(event){
- event.returnValue = 'Test beforeunload handler';
- }
- </script>
- <body>
- Test page
- </body>
-</html>
diff --git a/xpcom/stub/Makefile.in b/xpcom/stub/Makefile.in
index 8a5675aa37da44c3588233045933f860a120372c..dd5b679885d5d1979f1cf7dd3e33877fe05bee08 100644
--- a/xpcom/stub/Makefile.in
+++ b/xpcom/stub/Makefile.in
@@ -117,6 +117,9 @@ EXTRA_DSO_LDOPTS += \
$(MOZALLOC_LIB) \
$(NULL)
+# It is ok for this file not to exist
+-include $(topsrcdir)/$(MOZ_BUILD_APP)/extradependlibs.mk
+
include $(topsrcdir)/config/rules.mk
libs:: $(FINAL_TARGET)/dependentlibs.list