diff --git a/config/nspr/Makefile.in b/config/nspr/Makefile.in
index f17c12ef10d..bf341af4cb3 100644
--- a/config/nspr/Makefile.in
+++ b/config/nspr/Makefile.in
@@ -32,8 +32,3 @@ ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) # {
 else # } {
 	$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
 endif # }
-
-install::
-	$(MAKE) -C $(DEPTH)/nsprpub install DESTDIR=$(DESTDIR) libdir=$(mozappdir) includedir=$(includedir)/nspr
-	$(RM) -f $(addprefix $(DESTDIR)$(mozappdir)/$(LIB_PREFIX), $(addsuffix .$(LIB_SUFFIX), nspr4 plds4 plc4))
-	$(RM) -f $(addprefix $(DESTDIR)$(bindir)/,nspr-config compile-et.pl prerr.properties)
diff --git a/config/nspr/build.mk b/config/nspr/build.mk
deleted file mode 100644
index 52200790406..00000000000
--- a/config/nspr/build.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/.
-
-TIERS += nspr
-
-ifndef MOZ_NATIVE_NSPR
-tier_nspr_staticdirs += nsprpub
-tier_nspr_dirs += config/nspr
-endif
diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in
index d25d32ba02d..36672e7c651 100644
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -43,12 +43,6 @@ EXPORTS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef CROSS_COMPILE
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS    += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-endif
-
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in
index 57c02bd81a0..4c813bcaeb4 100644
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -39,12 +39,6 @@ EXPORTS		= \
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef CROSS_COMPILE
-ifdef HOST_NSPR_MDCPUCFG
-HOST_CFLAGS     += -DMDCPUCFG=$(HOST_NSPR_MDCPUCFG)
-endif
-endif
-
 # The intermediate (.ii/.s) files for host and target can have the same name...
 # disable parallel builds
 .NOTPARALLEL:
diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
index e5d53e5592c..79f38d8a7b7 100644
--- a/toolkit/toolkit-tiers.mk
+++ b/toolkit/toolkit-tiers.mk
@@ -6,7 +6,13 @@ ifdef LIBXUL_SDK
 $(error toolkit-tiers.mk is not compatible with --enable-libxul-sdk=)
 endif
 
-include $(topsrcdir)/config/nspr/build.mk
+TIERS += nspr
+
+ifndef MOZ_NATIVE_NSPR
+tier_nspr_staticdirs += nsprpub
+tier_nspr_dirs += config/nspr
+endif
+
 include $(topsrcdir)/config/js/build.mk
 
 TIERS += platform
diff --git a/tools/update-packaging/build.mk b/tools/update-packaging/build.mk
index 244cb4462ca..946e27ccdab 100644
--- a/tools/update-packaging/build.mk
+++ b/tools/update-packaging/build.mk
@@ -2,8 +2,6 @@
 # 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/.
 
-include $(topsrcdir)/config/nspr/build.mk
-
 TIERS += app
 
 tier_app_dirs += \