--- a/config/config.mk
+++ b/config/config.mk
@@ -57,20 +57,19 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
 
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).

new file mode 100644
--- /dev/null
+++ b/config/makefiles/functions.mk
@@ -0,0 +1,22 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))

--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -9,17 +9,15 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-include $(topsrcdir)/config/config.mk
-
-INCLUDES += 	\
+LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -2,24 +2,24 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
+include $(DEPTH)/config/autoconf.mk
+
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/dom/webidl/WebIDL.mk
 
 binding_include_path := mozilla/dom
 all_webidl_files = $(webidl_files) $(generated_webidl_files) $(preprocessed_webidl_files)
 # Set exported_binding_headers before adding the test IDL to the mix

--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -10,18 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkpluginandroid_s
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
   -I$(topsrcdir)/widget/xpwidgets \
   -I$(topsrcdir)/dom/plugins/base \
   -I$(topsrcdir)/dom/plugins/base/android/include \
   -I$(topsrcdir)/gfx/gl \
   $(MOZ_CAIRO_CFLAGS) \
   $(MOZ_PIXMAN_CFLAGS) \

--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -18,13 +18,12 @@ DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/bindings \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
+EXPORT_LIBRARY = 1
 
-EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -10,17 +10,15 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemandroid_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
                      $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -10,15 +10,13 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemmac_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -10,18 +10,16 @@ VPATH       = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemunix_s
 
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 ifdef MOZ_MAEMO_LIBLOCATION
         LOCAL_INCLUDES  += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
                            -I$(topsrcdir)/dom/src/geolocation \
                            $(NULL)
 endif
 
 ifdef MOZ_PLATFORM_MAEMO
 LOCAL_INCLUDES  += $(MOZ_DBUS_CFLAGS) \

--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -8,19 +8,16 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = autoconfig
 EXPORT_LIBRARY   = 1
 LIBXUL_LIBRARY   = 1
 
-
-include $(topsrcdir)/config/config.mk
-
 AUTOCFG_JS_EXPORTS = \
 		$(srcdir)/prefcalls.js \
 		$(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), windows)

--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -32,18 +32,16 @@ vpath %.cc \
   $(srcdir)/src/chrome/common \
   $(NULL)
 
 vpath %.mm \
   $(srcdir)/src/base \
   $(srcdir)/src/chrome/common \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 ifneq ($(OS_ARCH),WINNT) # (if OS_POSIX) {
 ifeq ($(OS_TARGET),Android)
 DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
 endif # Android
 endif # } Not WINNT (OS_POSIX)
 
 # libevent
 

--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -144,18 +144,16 @@ VPATH += $(srcdir)/perf
 DASH_R		= -r
 
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 SDK_LIBRARY = $(IMPORT_LIBRARY)
 else
 SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
-include $(topsrcdir)/config/config.mk
-
 ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 # When building standalone, we need to include mfbt sources, and to declare
 # "exported" mfbt symbols on its behalf when we use its headers.
 include $(MFBT_ROOT)/sources.mk
 DEFINES += -DIMPL_MFBT
 endif
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)

--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -57,20 +57,19 @@ CHECK_VARS := \
  $(NULL)
 
 # checks for internal spaces or trailing spaces in the variable
 # named by $x
 check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not allowed in $(x)))
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
-core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
-core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
-
-core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))
+ifndef INCLUDED_FUNCTIONS_MK
+include $(topsrcdir)/config/makefiles/functions.mk
+endif
 
 RM = rm -f
 
 # LIBXUL_DIST is not defined under js/src, thus we make it mean DIST there.
 LIBXUL_DIST ?= $(DIST)
 
 # FINAL_TARGET specifies the location into which we copy end-user-shipped
 # build products (typelibs, components, chrome).

new file mode 100644
--- /dev/null
+++ b/js/src/config/makefiles/functions.mk
@@ -0,0 +1,22 @@
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#
+# functions.mk
+#
+# Defines functions that are needed by various Makefiles throughout the build
+# system, which are needed before config.mk can be included.
+#
+
+# Define an include-at-most-once flag
+ifdef INCLUDED_FUNCTIONS_MK
+$(error Do not include functions.mk twice!)
+endif
+INCLUDED_FUNCTIONS_MK = 1
+
+core_abspath = $(if $(findstring :,$(1)),$(1),$(if $(filter /%,$(1)),$(1),$(CURDIR)/$(1)))
+core_realpath = $(if $(realpath $(1)),$(realpath $(1)),$(call core_abspath,$(1)))
+
+core_winabspath = $(firstword $(subst /, ,$(call core_abspath,$(1)))):$(subst $(space),,$(patsubst %,\\%,$(wordlist 2,$(words $(subst /, ,$(call core_abspath,$(1)))), $(strip $(subst /, ,$(call core_abspath,$(1)))))))

--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -10,18 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = xpconnect_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
 		-I$(topsrcdir)/caps/include \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/base/public \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/content/html/content/src \

--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -16,18 +16,16 @@ MODULE_NAME = xpconnect_test
 
 JS_FILES = \
   xpctest_attributes.js \
   xpctest_bug809674.js \
   xpctest_interfaces.js \
   xpctest_params.js \
   $(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest
 
 include $(topsrcdir)/config/rules.mk
 
 componentdir = js/xpconnect/tests/components/js
 
 libs:: $(JS_FILES)
 	$(INSTALL) $^ $(testxpcobjdir)/$(componentdir)

--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -10,18 +10,16 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = xpctest
 IS_COMPONENT = 1
 MODULE_NAME = xpconnect_test
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = xpctest.manifest
 
 EXTRA_DSO_LDOPTS += \
   $(XPCOM_GLUE_LDOPTS) \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 

--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -15,17 +15,17 @@ CXX_WRAPPER =
 ifdef MOZ_FOLD_LIBS
 # TODO: The library name can be changed when bug 845217 is fixed.
 LIBRARY_NAME = nss3
 FORCE_SHARED_LIB = 1
 endif
 
 default::
 
-include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/makefiles/functions.mk
 
 NSS_LIBS = \
   nss3 \
   nssutil3 \
   smime3 \
   ssl3 \
   $(NULL)
 
@@ -389,25 +389,26 @@ DEFFILE = nss3.def
 
 nss3.def: $(NSS_STATIC_LIBS_DEFS) $(DEPTH)/db/sqlite3/src/sqlite-processed.def
 	echo LIBRARY nss3$(DLL_SUFFIX) > $@.tmp
 	echo EXPORTS >> $@.tmp
 	grep -v -h -e ^LIBRARY -e ^EXPORTS -e ^\; $^ >> $@.tmp
 	mv $@.tmp $@
 endif
 
-# Force the linker to include everything from the static libraries.
-EXPAND_LIBS_EXEC += --extract
 else
 $(NSS_DIST_DLL_FILES) $(NSS_SDK_LIB_FILES): libs-nss/lib
 endif # MOZ_FOLD_LIBS
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_FOLD_LIBS
+# Force the linker to include everything from the static libraries.
+EXPAND_LIBS_EXEC += --extract
+
 $(SHARED_LIBRARY): $(SHARED_LIBRARY_LIBS)
 
 EXTRA_DSO_LDOPTS += $(REALTIME_LIBS)
 
 ifdef IMPORT_LIB_SUFFIX
 IMPORT_PREFIX = $(LIB_PREFIX)
 IMPORT_SUFFIX = .$(IMPORT_LIB_SUFFIX)
 else

--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -9,18 +9,16 @@ srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = toolkitcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-include $(topsrcdir)/config/config.mk
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../alerts \
   -I$(srcdir)/../downloads \
   -I$(srcdir)/../feeds \
   -I$(srcdir)/../find \
   -I$(srcdir)/../intl \
   -I$(srcdir)/../protobuf \
   -I$(srcdir)/../startup \

--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -30,18 +30,16 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../ \
 		-I$(topsrcdir)/layout/generic \
 		-I$(topsrcdir)/layout/xul/base/src \
 		-I$(topsrcdir)/toolkit/xre \
 		-I$(topsrcdir)/xpcom/base \
 		$(NULL)
 
-include $(topsrcdir)/config/config.mk
-
 MIDL_GENERATED_FILES = \
 	UIABridge_i.c \
 	UIABridge_p.c \
 	dlldata.c \
 	$(NULL)
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen
 

--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -16,18 +16,16 @@ MOZILLA_INTERNAL_API = 1
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../unix \
 		-I$(srcdir)/../../../../xptinfo/src \
 		$(NULL)
 DEFINES		+= -DMOZ_NEED_LEADING_UNDERSCORE
 
 
-include $(topsrcdir)/config/config.mk
-
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -DIMPL_LIBXUL
 
 LOCAL_INCLUDES	+= -I$(srcdir)/../..

--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -21,18 +21,16 @@ MOZILLA_INTERNAL_API = 1
 ifeq ($(OS_ARCH),SunOS)
 ifneq (86,$(findstring 86,$(OS_TEST)))
 # disable PGO for this directory with Sun Studio on SPARC because
 # compiling with xprofile=collect will insert code into nsXPTCStubBase::Stub##n
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 endif
 endif
 
-include $(topsrcdir)/config/config.mk
-
 ######################################################################
 # i386 and beyond
 ######################################################################
 #
 # Lots of Unixish x86 flavors
 #
 
 ifeq (Darwin,$(OS_ARCH))

--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -12,18 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= xptcmd
 EXPORT_LIBRARY	= ../..
 MOZILLA_INTERNAL_API = 1
 
 LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
 
 
-include $(topsrcdir)/config/config.mk
-
 ifneq ($(TARGET_CPU),x86_64)
 ifndef GNU_CXX
 # FIXME: bug 413019
 OS_COMPILE_CXXFLAGS += -GL-
 endif #!GNU_CXX
 endif #!x86_64
 
 # we don't want the shared lib, but we want to force the creation of a static lib.

--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -20,17 +20,16 @@ SHORT_LIBNAME	= xpcomsmp
 
 # IS_COMPONENT indicates that this makefile builds a component shared library.
 IS_COMPONENT	= 1
 
 # If this is Makefile builds a component, MODULE_NAME must match the module
 # name specified in NS_IMPL_NSGETMODULE
 MODULE_NAME	= nsSampleModule
 
-include $(topsrcdir)/config/config.mk
 
 # EXTRA_DSO_LDOPTS specifies linker flags when building a shared library
 # from this Makefile. We link against the "dependent glue" and against the
 # frozen XPCOM shared library.
 EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_FROZEN_LDOPTS) \
 		$(NSPR_LIBS) \

--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@@ -11,18 +11,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= test656331
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = bug656331.manifest
 
 EXTRA_DSO_LDOPTS = \
   $(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
   $(XPCOM_FROZEN_LDOPTS) \
   $(NSPR_LIBS) \
   $(NULL)
 

--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@@ -9,18 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= testcomponent
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcomponent.manifest
 
 EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_FROZEN_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 

--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@@ -9,18 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= testcompnoaslr
 IS_COMPONENT	= 1
 FORCE_SHARED_LIB = 1
 
-include $(topsrcdir)/config/config.mk
-
 MANIFEST_FILE = testcompnoaslr.manifest
 
 EXTRA_DSO_LDOPTS = \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
 		$(XPCOM_FROZEN_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 

--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -9,16 +9,13 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= appcomps
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
-
-include $(topsrcdir)/config/config.mk
-
 # General includes
 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
 LOCAL_INCLUDES += -I$(srcdir)/../directory
 
 include $(topsrcdir)/config/rules.mk