diff --git a/config/baseconfig.mk b/config/baseconfig.mk
index 04fdf53c2ff4..50f4cd4a7dd1 100644
--- a/config/baseconfig.mk
+++ b/config/baseconfig.mk
@@ -2,12 +2,7 @@ includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
-DIST := $(call core_realpath,$(DEPTH)/dist)
+DIST = $(DEPTH)/dist
 
 # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
 # manually use it before config.mk inclusion
diff --git a/config/config.mk b/config/config.mk
index 9f287384095e..e72058d238ad 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -64,6 +64,10 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
+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.
diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
index 9d33116a8947..107c5e06e9b3 100644
--- a/js/src/config/baseconfig.mk
+++ b/js/src/config/baseconfig.mk
@@ -1,17 +1,13 @@
 installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
 sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
 
-ifndef INCLUDED_FUNCTIONS_MK
-include $(topsrcdir)/config/makefiles/functions.mk
-endif
-
 ifneq (,$(filter /%,$(TOP_DIST)))
-DIST := $(call core_realpath,$(TOP_DIST))
+DIST = $(TOP_DIST)
 else
 ifeq (.,$(DEPTH))
-DIST := $(call core_realpath,$(TOP_DIST))
+DIST = $(TOP_DIST)
 else
-DIST := $(call core_realpath,$(DEPTH)/$(TOP_DIST))
+DIST = $(DEPTH)/$(TOP_DIST)
 endif
 endif
 
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 9f287384095e..e72058d238ad 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -64,6 +64,10 @@ check-variable = $(if $(filter-out 0 1,$(words $($(x))z)),$(error Spaces are not
 
 $(foreach x,$(CHECK_VARS),$(check-variable))
 
+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.
diff --git a/security/build/Makefile.in b/security/build/Makefile.in
index 362800f6c7be..4874f7146836 100644
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -12,6 +12,8 @@ endif
 
 default::
 
+include $(topsrcdir)/config/makefiles/functions.mk
+
 NSS_LIBS = \
   nss3 \
   nssutil3 \