diff --git a/cmd/crmf-cgi/Makefile b/cmd/crmf-cgi/Makefile
index f8172689f2..00a6b95dca 100644
--- a/cmd/crmf-cgi/Makefile
+++ b/cmd/crmf-cgi/Makefile
@@ -7,11 +7,7 @@
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
-ifeq (,$(filter-out WIN%,$(OS_TARGET)))
-EXTRA_LIBS += $(DIST)/lib/crmf.lib
-else
-EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) 
-endif
+
 include manifest.mn
 
 #######################################################################
@@ -24,7 +20,11 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-
+ifeq (,$(filter-out WIN%,$(OS_TARGET)))
+EXTRA_LIBS += $(DIST)/lib/crmf.lib
+else
+EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX)
+endif
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
diff --git a/cmd/crmf-cgi/config.mk b/cmd/crmf-cgi/config.mk
deleted file mode 100644
index 77fca36960..0000000000
--- a/cmd/crmf-cgi/config.mk
+++ /dev/null
@@ -1,16 +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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(PROGRAM)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-LIBRARY        =
-
diff --git a/cmd/crmftest/Makefile b/cmd/crmftest/Makefile
index 369cdc89f9..715d0b7d18 100644
--- a/cmd/crmftest/Makefile
+++ b/cmd/crmftest/Makefile
@@ -20,13 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-
-
-#######################################################################
-# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
-#######################################################################
-include config.mk
-
 ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 OS_LIBS += -lsvld 
 endif 
@@ -37,6 +30,10 @@ endif
 
 EXTRA_LIBS += $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
 
+#######################################################################
+# (4) Include "local" platform-dependent assignments (OPTIONAL).      #
+#######################################################################
+
 include ../platlibs.mk
 
 #######################################################################
diff --git a/cmd/crmftest/config.mk b/cmd/crmftest/config.mk
deleted file mode 100644
index 9838ef15c3..0000000000
--- a/cmd/crmftest/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(PROGRAM)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-LIBRARY        =
-
diff --git a/cmd/lib/Makefile b/cmd/lib/Makefile
index 94cfb1d7b9..b1f9d1a31e 100644
--- a/cmd/lib/Makefile
+++ b/cmd/lib/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 include ../platlibs.mk
 
 #######################################################################
diff --git a/cmd/lib/config.mk b/cmd/lib/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/cmd/lib/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/cmd/lib/manifest.mn b/cmd/lib/manifest.mn
index b3c36b3a98..86233e63d7 100644
--- a/cmd/lib/manifest.mn
+++ b/cmd/lib/manifest.mn
@@ -5,6 +5,7 @@
 CORE_DEPTH	= ../..
 
 LIBRARY_NAME	= sectool
+SHARED_LIBRARY = $(NULL)
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE		= nss
diff --git a/cmd/libpkix/config.mk b/cmd/libpkix/config.mk
deleted file mode 100644
index 672f6ff872..0000000000
--- a/cmd/libpkix/config.mk
+++ /dev/null
@@ -1,9 +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/.
-
-TARGETS = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
diff --git a/cmd/libpkix/perf/Makefile b/cmd/libpkix/perf/Makefile
index b7241027d0..3181547e2c 100755
--- a/cmd/libpkix/perf/Makefile
+++ b/cmd/libpkix/perf/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/perf/manifest.mn b/cmd/libpkix/perf/manifest.mn
index 005c96caaf..f70040234a 100755
--- a/cmd/libpkix/perf/manifest.mn
+++ b/cmd/libpkix/perf/manifest.mn
@@ -15,6 +15,7 @@ CSRCS = libpkix_buildthreads.c \
 	$(NULL)
 
 LIBRARY_NAME = pkixtoolperf
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/Makefile b/cmd/libpkix/pkix/Makefile
index ab4ffbda5c..1de5ef2694 100755
--- a/cmd/libpkix/pkix/Makefile
+++ b/cmd/libpkix/pkix/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/certsel/Makefile b/cmd/libpkix/pkix/certsel/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/certsel/Makefile
+++ b/cmd/libpkix/pkix/certsel/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/certsel/manifest.mn b/cmd/libpkix/pkix/certsel/manifest.mn
index 2e8198cb34..d9da6e1674 100755
--- a/cmd/libpkix/pkix/certsel/manifest.mn
+++ b/cmd/libpkix/pkix/certsel/manifest.mn
@@ -14,7 +14,8 @@ CSRCS = test_certselector.c \
 	test_comcertselparams.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolcertsel
+LIBRARY_NAME = pkixtoolcertsel
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/checker/Makefile b/cmd/libpkix/pkix/checker/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/checker/Makefile
+++ b/cmd/libpkix/pkix/checker/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/checker/manifest.mn b/cmd/libpkix/pkix/checker/manifest.mn
index 3101e02e24..54e1486e68 100755
--- a/cmd/libpkix/pkix/checker/manifest.mn
+++ b/cmd/libpkix/pkix/checker/manifest.mn
@@ -12,7 +12,8 @@ MODULE = nss
 
 CSRCS = test_certchainchecker.c
 
-LIBRARY_NAME=pkixtoolchecker
+LIBRARY_NAME = pkixtoolchecker
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/crlsel/Makefile b/cmd/libpkix/pkix/crlsel/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/crlsel/Makefile
+++ b/cmd/libpkix/pkix/crlsel/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/crlsel/manifest.mn b/cmd/libpkix/pkix/crlsel/manifest.mn
index dfac43bb52..3b13298aa6 100755
--- a/cmd/libpkix/pkix/crlsel/manifest.mn
+++ b/cmd/libpkix/pkix/crlsel/manifest.mn
@@ -14,7 +14,8 @@ CSRCS = test_crlselector.c \
 	test_comcrlselparams.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolcrlsel
+LIBRARY_NAME = pkixtoolcrlsel
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/params/Makefile b/cmd/libpkix/pkix/params/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/params/Makefile
+++ b/cmd/libpkix/pkix/params/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/params/manifest.mn b/cmd/libpkix/pkix/params/manifest.mn
index a2e7e675be..c7629a6207 100755
--- a/cmd/libpkix/pkix/params/manifest.mn
+++ b/cmd/libpkix/pkix/params/manifest.mn
@@ -16,7 +16,8 @@ CSRCS = test_procparams.c \
 	test_resourcelimits.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolparams
+LIBRARY_NAME = pkixtoolparams
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/results/Makefile b/cmd/libpkix/pkix/results/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/results/Makefile
+++ b/cmd/libpkix/pkix/results/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/results/manifest.mn b/cmd/libpkix/pkix/results/manifest.mn
index 5a8b936924..7e4caeac60 100755
--- a/cmd/libpkix/pkix/results/manifest.mn
+++ b/cmd/libpkix/pkix/results/manifest.mn
@@ -16,7 +16,8 @@ CSRCS = test_buildresult.c \
 	test_valresult.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolresults
+LIBRARY_NAME = pkixtoolresults
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/store/Makefile b/cmd/libpkix/pkix/store/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/store/Makefile
+++ b/cmd/libpkix/pkix/store/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/store/manifest.mn b/cmd/libpkix/pkix/store/manifest.mn
index 566a346848..b939ffdcfd 100755
--- a/cmd/libpkix/pkix/store/manifest.mn
+++ b/cmd/libpkix/pkix/store/manifest.mn
@@ -12,7 +12,8 @@ MODULE = nss
 
 CSRCS = test_store.c
 
-LIBRARY_NAME=pkixtoolstore
+LIBRARY_NAME = pkixtoolstore
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/top/Makefile b/cmd/libpkix/pkix/top/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/top/Makefile
+++ b/cmd/libpkix/pkix/top/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/top/manifest.mn b/cmd/libpkix/pkix/top/manifest.mn
index a7d997dfba..8840204f7f 100755
--- a/cmd/libpkix/pkix/top/manifest.mn
+++ b/cmd/libpkix/pkix/top/manifest.mn
@@ -26,7 +26,8 @@ CSRCS = test_basicchecker.c \
 	test_validatechain_NB.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtooltop
+LIBRARY_NAME = pkixtooltop
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix/util/Makefile b/cmd/libpkix/pkix/util/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix/util/Makefile
+++ b/cmd/libpkix/pkix/util/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix/util/manifest.mn b/cmd/libpkix/pkix/util/manifest.mn
index 7dbeb6d47f..c7790c401b 100755
--- a/cmd/libpkix/pkix/util/manifest.mn
+++ b/cmd/libpkix/pkix/util/manifest.mn
@@ -16,7 +16,8 @@ CSRCS = test_error.c \
 	test_logger.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolutil
+LIBRARY_NAME = pkixtoolutil
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix_pl/Makefile b/cmd/libpkix/pkix_pl/Makefile
index ab4ffbda5c..1de5ef2694 100755
--- a/cmd/libpkix/pkix_pl/Makefile
+++ b/cmd/libpkix/pkix_pl/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix_pl/module/Makefile b/cmd/libpkix/pkix_pl/module/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix_pl/module/Makefile
+++ b/cmd/libpkix/pkix_pl/module/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix_pl/module/manifest.mn b/cmd/libpkix/pkix_pl/module/manifest.mn
index eedc934494..50d20d0bb4 100755
--- a/cmd/libpkix/pkix_pl/module/manifest.mn
+++ b/cmd/libpkix/pkix_pl/module/manifest.mn
@@ -17,7 +17,8 @@ CSRCS = test_colcertstore.c \
 	test_httpcertstore.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolmodule
+LIBRARY_NAME = pkixtoolmodule
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix_pl/pki/Makefile b/cmd/libpkix/pkix_pl/pki/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix_pl/pki/Makefile
+++ b/cmd/libpkix/pkix_pl/pki/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix_pl/pki/manifest.mn b/cmd/libpkix/pkix_pl/pki/manifest.mn
index 7c6e0a76da..15fae7bb5f 100755
--- a/cmd/libpkix/pkix_pl/pki/manifest.mn
+++ b/cmd/libpkix/pkix_pl/pki/manifest.mn
@@ -21,7 +21,8 @@ CSRCS = test_cert.c \
 	test_subjectinfoaccess.c \
 	$(NULL)
 
-LIBRARY_NAME=pkixtoolpki
+LIBRARY_NAME = pkixtoolpki
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cmd/libpkix/pkix_pl/system/Makefile b/cmd/libpkix/pkix_pl/system/Makefile
index 09ca5f1c6e..802e7729d9 100755
--- a/cmd/libpkix/pkix_pl/system/Makefile
+++ b/cmd/libpkix/pkix_pl/system/Makefile
@@ -20,8 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(PKIX_DEPTH)/config.mk
-
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
diff --git a/cmd/libpkix/pkix_pl/system/manifest.mn b/cmd/libpkix/pkix_pl/system/manifest.mn
index edbf0cda88..52bb34ece0 100755
--- a/cmd/libpkix/pkix_pl/system/manifest.mn
+++ b/cmd/libpkix/pkix_pl/system/manifest.mn
@@ -30,8 +30,8 @@ CSRCS = test_bigint.c \
 	test_string2.c \
 	$(NULL)
 
-
-LIBRARY_NAME=pkixtoolsys
+LIBRARY_NAME = pkixtoolsys
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR=$(PKIX_DEPTH)/$(OBJDIR)
  
diff --git a/cmd/libpkix/testutil/manifest.mn b/cmd/libpkix/testutil/manifest.mn
index 2f831fcd62..184085b1b1 100755
--- a/cmd/libpkix/testutil/manifest.mn
+++ b/cmd/libpkix/testutil/manifest.mn
@@ -20,6 +20,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixtooltestutil
+SHARED_LIBRARY = $(NULL)
 
 SOURCE_LIB_DIR = $(PKIX_DEPTH)/$(OBJDIR)
 
diff --git a/cpputil/Makefile b/cpputil/Makefile
index 7adfc61179..28e0f61605 100644
--- a/cpputil/Makefile
+++ b/cpputil/Makefile
@@ -30,8 +30,6 @@ endif
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/cpputil/config.mk b/cpputil/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/cpputil/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/cpputil/manifest.mn b/cpputil/manifest.mn
index caa859bf73..9bd68e0d88 100644
--- a/cpputil/manifest.mn
+++ b/cpputil/manifest.mn
@@ -6,7 +6,9 @@ CORE_DEPTH = ..
 DEPTH      = ..
 
 MODULE = nss
+
 LIBRARY_NAME = cpputil
+SHARED_LIBRARY = $(NULL)
 
 ifeq ($(NSS_BUILD_UTIL_ONLY),1)
 CPPSRCS = \
diff --git a/lib/base/Makefile b/lib/base/Makefile
index ca709f6c0d..3f49eaa45d 100644
--- a/lib/base/Makefile
+++ b/lib/base/Makefile
@@ -4,7 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
 
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+include $(CORE_DEPTH)/coreconf/rules.mk
diff --git a/lib/base/config.mk b/lib/base/config.mk
deleted file mode 100644
index 2676cd5370..0000000000
--- a/lib/base/config.mk
+++ /dev/null
@@ -1,19 +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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/base/manifest.mn b/lib/base/manifest.mn
index da3a0f3364..6c4b2db98a 100644
--- a/lib/base/manifest.mn
+++ b/lib/base/manifest.mn
@@ -33,6 +33,7 @@ CSRCS =		   \
 REQUIRES = nspr
 
 LIBRARY_NAME = nssb
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/certdb/Makefile b/lib/certdb/Makefile
index c3cb5ef8be..bb88772853 100644
--- a/lib/certdb/Makefile
+++ b/lib/certdb/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/certdb/config.mk b/lib/certdb/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/lib/certdb/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/certdb/manifest.mn b/lib/certdb/manifest.mn
index 28548f4671..4a8c5c40ad 100644
--- a/lib/certdb/manifest.mn
+++ b/lib/certdb/manifest.mn
@@ -35,6 +35,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = certdb
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/certhigh/Makefile b/lib/certhigh/Makefile
index 0f71b1a4b6..bb88772853 100644
--- a/lib/certhigh/Makefile
+++ b/lib/certhigh/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/certhigh/config.mk b/lib/certhigh/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/lib/certhigh/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/certhigh/manifest.mn b/lib/certhigh/manifest.mn
index ed9b9108a4..b843e06869 100644
--- a/lib/certhigh/manifest.mn
+++ b/lib/certhigh/manifest.mn
@@ -29,6 +29,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = certhi
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/ckfw/Makefile b/lib/ckfw/Makefile
index 82c9b8bd20..effa9abceb 100644
--- a/lib/ckfw/Makefile
+++ b/lib/ckfw/Makefile
@@ -4,8 +4,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
 
 ifdef NOTDEF # was ifdef MOZILLA_CLIENT
 NSS_BUILD_CAPI = 1
diff --git a/lib/ckfw/builtins/Makefile b/lib/ckfw/builtins/Makefile
index 22726e286e..cb235e990d 100644
--- a/lib/ckfw/builtins/Makefile
+++ b/lib/ckfw/builtins/Makefile
@@ -5,7 +5,24 @@
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+# Needed for compilation of $(OBJDIR)/certdata.c
+INCLUDES += -I.
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
+
+ifdef USE_GCOV
+DSO_LDOPTS += --coverage
+endif
 
 EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
diff --git a/lib/ckfw/builtins/config.mk b/lib/ckfw/builtins/config.mk
deleted file mode 100644
index b94d413336..0000000000
--- a/lib/ckfw/builtins/config.mk
+++ /dev/null
@@ -1,32 +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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-    DEFINES += -DNSSDEBUG
-endif
-
-# Needed for compilation of $(OBJDIR)/certdata.c
-INCLUDES += -I.
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-ifdef USE_GCOV
-DSO_LDOPTS += --coverage
-endif
diff --git a/lib/ckfw/builtins/manifest.mn b/lib/ckfw/builtins/manifest.mn
index 3ec01f2029..88e5237ce8 100644
--- a/lib/ckfw/builtins/manifest.mn
+++ b/lib/ckfw/builtins/manifest.mn
@@ -30,3 +30,5 @@ REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+LIBRARY = $(NULL)
+IMPORT_LIBRARY = $(NULL)
diff --git a/lib/ckfw/builtins/testlib/Makefile b/lib/ckfw/builtins/testlib/Makefile
index 0f3d6c4498..5f49b37a26 100644
--- a/lib/ckfw/builtins/testlib/Makefile
+++ b/lib/ckfw/builtins/testlib/Makefile
@@ -4,8 +4,26 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+# Needed for compilation of $(OBJDIR)/certdata.c
+INCLUDES += -I.
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
+
+ifdef USE_GCOV
+DSO_LDOPTS += --coverage
+endif
 
 EXTRA_LIBS =                                       \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
diff --git a/lib/ckfw/builtins/testlib/config.mk b/lib/ckfw/builtins/testlib/config.mk
deleted file mode 100644
index cdd49c2417..0000000000
--- a/lib/ckfw/builtins/testlib/config.mk
+++ /dev/null
@@ -1,32 +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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-	DEFINES += -DNSSDEBUG
-endif
-
-# Needed for compilation of $(OBJDIR)/certdata.c
-INCLUDES += -I.
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
-
-ifdef USE_GCOV
-DSO_LDOPTS += --coverage
-endif
diff --git a/lib/ckfw/builtins/testlib/manifest.mn b/lib/ckfw/builtins/testlib/manifest.mn
index 4500a903eb..e840a88699 100644
--- a/lib/ckfw/builtins/testlib/manifest.mn
+++ b/lib/ckfw/builtins/testlib/manifest.mn
@@ -23,3 +23,4 @@ CSRCS =			\
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckbi-testlib
+LIBRARY = $(NULL)
diff --git a/lib/ckfw/capi/Makefile b/lib/ckfw/capi/Makefile
index 81780d2f37..474d8adf4f 100644
--- a/lib/ckfw/capi/Makefile
+++ b/lib/ckfw/capi/Makefile
@@ -5,7 +5,17 @@
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+#
+# To create a loadable module on Darwin, we must use -bundle.
+#
+ifeq ($(OS_TARGET),Darwin)
+DSO_LDOPTS = -bundle
+endif
 
 EXTRA_LIBS = \
 	$(DIST)/lib/$(LIB_PREFIX)nssckfw.$(LIB_SUFFIX) \
@@ -71,5 +81,3 @@ endif
 ifeq ($(OS_TARGET)$(OS_RELEASE), AIX4.2)
 LD      += -G
 endif 
-
-
diff --git a/lib/ckfw/capi/config.mk b/lib/ckfw/capi/config.mk
deleted file mode 100644
index 3442f8ccbb..0000000000
--- a/lib/ckfw/capi/config.mk
+++ /dev/null
@@ -1,25 +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/.
-
-#
-#  Override TARGETS variable so that only shared libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(SHARED_LIBRARY)
-LIBRARY        =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef BUILD_IDG
-    DEFINES += -DNSSDEBUG
-endif
-
-#
-# To create a loadable module on Darwin, we must use -bundle.
-#
-ifeq ($(OS_TARGET),Darwin)
-DSO_LDOPTS = -bundle
-endif
diff --git a/lib/ckfw/capi/manifest.mn b/lib/ckfw/capi/manifest.mn
index c28e691ecd..c1003d00e0 100644
--- a/lib/ckfw/capi/manifest.mn
+++ b/lib/ckfw/capi/manifest.mn
@@ -29,5 +29,7 @@ REQUIRES = nspr
 
 LIBRARY_NAME = nsscapi
 MAPFILE = $(OBJDIR)/$(LIBRARY_NAME).def
+LIBRARY = $(NULL)
+IMPORT_LIBRARY = $(NULL)
 
 #EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -lplc4 -lplds4
diff --git a/lib/ckfw/config.mk b/lib/ckfw/config.mk
deleted file mode 100644
index a3ed5aed21..0000000000
--- a/lib/ckfw/config.mk
+++ /dev/null
@@ -1,25 +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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-# Hack to see if everything still builds
-#
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-
diff --git a/lib/ckfw/dbm/Makefile b/lib/ckfw/dbm/Makefile
index 07ae9676aa..3c4ab7e7a7 100644
--- a/lib/ckfw/dbm/Makefile
+++ b/lib/ckfw/dbm/Makefile
@@ -4,6 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
diff --git a/lib/ckfw/dbm/config.mk b/lib/ckfw/dbm/config.mk
deleted file mode 100644
index a1991e5f4d..0000000000
--- a/lib/ckfw/dbm/config.mk
+++ /dev/null
@@ -1,8 +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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
diff --git a/lib/ckfw/dbm/manifest.mn b/lib/ckfw/dbm/manifest.mn
index 1f87f4353c..ec773755dd 100644
--- a/lib/ckfw/dbm/manifest.mn
+++ b/lib/ckfw/dbm/manifest.mn
@@ -21,5 +21,6 @@ CSRCS =		   \
 REQUIRES = dbm nspr
 
 LIBRARY_NAME = nssckdbm
+LIBRARY = $(NULL)
 
 EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -ldbm -lnspr4 -lplc4 -lplds4
diff --git a/lib/ckfw/manifest.mn b/lib/ckfw/manifest.mn
index 4f798ad61b..8991495e4a 100644
--- a/lib/ckfw/manifest.mn
+++ b/lib/ckfw/manifest.mn
@@ -48,6 +48,7 @@ CSRCS =		   \
 REQUIRES = nspr
 
 LIBRARY_NAME = nssckfw
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/crmf/Makefile b/lib/crmf/Makefile
index 142bacf822..609d4adefe 100644
--- a/lib/crmf/Makefile
+++ b/lib/crmf/Makefile
@@ -27,8 +27,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/crmf/config.mk b/lib/crmf/config.mk
deleted file mode 100644
index dc39ee4d6a..0000000000
--- a/lib/crmf/config.mk
+++ /dev/null
@@ -1,16 +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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/crmf/manifest.mn b/lib/crmf/manifest.mn
index 9f177b9ca0..8c687ea243 100644
--- a/lib/crmf/manifest.mn
+++ b/lib/crmf/manifest.mn
@@ -41,6 +41,7 @@ CSRCS = crmfenc.c	\
 	$(NULL)
 
 LIBRARY_NAME = crmf
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/cryptohi/Makefile b/lib/cryptohi/Makefile
index c3bb95f00d..aae54b1e0f 100644
--- a/lib/cryptohi/Makefile
+++ b/lib/cryptohi/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/cryptohi/config.mk b/lib/cryptohi/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/lib/cryptohi/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/cryptohi/manifest.mn b/lib/cryptohi/manifest.mn
index 896c7ad125..6b1a546dd3 100644
--- a/lib/cryptohi/manifest.mn
+++ b/lib/cryptohi/manifest.mn
@@ -9,6 +9,7 @@ MODULE = nss
 REQUIRES = nssutil
 
 LIBRARY_NAME = cryptohi
+SHARED_LIBRARY = $(NULL)
 
 EXPORTS = \
 	cryptohi.h \
diff --git a/lib/dbm/src/config.mk b/lib/dbm/src/config.mk
index eab1805408..7ce86f8c57 100644
--- a/lib/dbm/src/config.mk
+++ b/lib/dbm/src/config.mk
@@ -11,12 +11,6 @@ DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE
 #  are specifed as dependencies within rules.mk.
 #
 
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PURE_LIBRARY   =
-PROGRAM        =
-
 ifdef SHARED_LIBRARY
 	ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 		DLLBASE=/BASE:0x30000000
diff --git a/lib/dbm/src/manifest.mn b/lib/dbm/src/manifest.mn
index 119044407e..8b1ad694a5 100644
--- a/lib/dbm/src/manifest.mn
+++ b/lib/dbm/src/manifest.mn
@@ -26,3 +26,4 @@ CSRCS = db.c	   \
 	$(NULL)
 
 LIBRARY_NAME = dbm
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/dev/Makefile b/lib/dev/Makefile
index b5951dc1d4..dfc8e1d319 100644
--- a/lib/dev/Makefile
+++ b/lib/dev/Makefile
@@ -4,8 +4,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk
 
 # On AIX 4.3, IBM xlC_r compiler (version 3.6.6) cannot compile
diff --git a/lib/dev/config.mk b/lib/dev/config.mk
deleted file mode 100644
index 2676cd5370..0000000000
--- a/lib/dev/config.mk
+++ /dev/null
@@ -1,19 +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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/dev/manifest.mn b/lib/dev/manifest.mn
index 4a5b812dc8..449ae58e3c 100644
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -27,6 +27,7 @@ CSRCS =		        \
 REQUIRES = nspr
 
 LIBRARY_NAME = nssdev
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/jar/Makefile b/lib/jar/Makefile
index 245c127a47..650c2ae861 100644
--- a/lib/jar/Makefile
+++ b/lib/jar/Makefile
@@ -5,7 +5,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
 
+# NSS_X86 means the target is a 32-bits x86 CPU architecture
+# NSS_X64 means the target is a 64-bits x64 CPU architecture
+# NSS_X86_OR_X64 means the target is either x86 or x64
+ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
+        DEFINES += -DNSS_X86_OR_X64
+ifdef USE_64
+        DEFINES += -DNSS_X64
+else
+        DEFINES += -DNSS_X86
+endif
+endif
+
+include $(CORE_DEPTH)/coreconf/rules.mk
diff --git a/lib/jar/config.mk b/lib/jar/config.mk
deleted file mode 100644
index 1412dcc594..0000000000
--- a/lib/jar/config.mk
+++ /dev/null
@@ -1,26 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-# NSS_X86 means the target is a 32-bits x86 CPU architecture
-# NSS_X64 means the target is a 64-bits x64 CPU architecture
-# NSS_X86_OR_X64 means the target is either x86 or x64
-ifeq (,$(filter-out i386 x386 x86 x86_64,$(CPU_ARCH)))
-        DEFINES += -DNSS_X86_OR_X64
-ifdef USE_64
-        DEFINES += -DNSS_X64
-else
-        DEFINES += -DNSS_X86
-endif
-endif
diff --git a/lib/jar/manifest.mn b/lib/jar/manifest.mn
index 5b516886a9..bcfff578dc 100644
--- a/lib/jar/manifest.mn
+++ b/lib/jar/manifest.mn
@@ -5,6 +5,7 @@
 MODULE = nss
 
 LIBRARY_NAME = jar
+SHARED_LIBRARY = $(NULL)
 
 CORE_DEPTH = ../..
 
diff --git a/lib/libpkix/Makefile b/lib/libpkix/Makefile
index c3cb5ef8be..bb88772853 100755
--- a/lib/libpkix/Makefile
+++ b/lib/libpkix/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/libpkix/config.mk b/lib/libpkix/config.mk
deleted file mode 100755
index 5d75e1c043..0000000000
--- a/lib/libpkix/config.mk
+++ /dev/null
@@ -1,16 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-#  DEFINES+=-DPKIX_LISTDEBUG Can be used to turn on debug compilation
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/include/Makefile b/lib/libpkix/include/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/include/Makefile
+++ b/lib/libpkix/include/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/include/config.mk b/lib/libpkix/include/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/include/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/Makefile b/lib/libpkix/pkix/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/Makefile
+++ b/lib/libpkix/pkix/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/certsel/Makefile b/lib/libpkix/pkix/certsel/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/certsel/Makefile
+++ b/lib/libpkix/pkix/certsel/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/certsel/config.mk b/lib/libpkix/pkix/certsel/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/certsel/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/certsel/manifest.mn b/lib/libpkix/pkix/certsel/manifest.mn
index 8e28df5857..eb434bd531 100755
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -17,4 +17,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixcertsel
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/checker/Makefile b/lib/libpkix/pkix/checker/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/checker/Makefile
+++ b/lib/libpkix/pkix/checker/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/checker/config.mk b/lib/libpkix/pkix/checker/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/checker/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/checker/manifest.mn b/lib/libpkix/pkix/checker/manifest.mn
index da99416fa3..84a372cea9 100755
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -39,4 +39,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixchecker
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/config.mk b/lib/libpkix/pkix/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/crlsel/Makefile b/lib/libpkix/pkix/crlsel/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/crlsel/Makefile
+++ b/lib/libpkix/pkix/crlsel/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/crlsel/config.mk b/lib/libpkix/pkix/crlsel/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/crlsel/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/crlsel/manifest.mn b/lib/libpkix/pkix/crlsel/manifest.mn
index 0ad81055e6..fe84a2d62f 100755
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -17,4 +17,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixcrlsel
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/params/Makefile b/lib/libpkix/pkix/params/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/params/Makefile
+++ b/lib/libpkix/pkix/params/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/params/config.mk b/lib/libpkix/pkix/params/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/params/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/params/manifest.mn b/lib/libpkix/pkix/params/manifest.mn
index 604f21f542..2a77bf0eea 100755
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -21,4 +21,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixparams
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/results/Makefile b/lib/libpkix/pkix/results/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/results/Makefile
+++ b/lib/libpkix/pkix/results/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/results/config.mk b/lib/libpkix/pkix/results/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/results/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/results/manifest.mn b/lib/libpkix/pkix/results/manifest.mn
index 07bb22e5de..bec0270fb6 100755
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -21,4 +21,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixresults
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/store/Makefile b/lib/libpkix/pkix/store/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/store/Makefile
+++ b/lib/libpkix/pkix/store/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/store/config.mk b/lib/libpkix/pkix/store/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/store/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/store/manifest.mn b/lib/libpkix/pkix/store/manifest.mn
index cb64455f8b..53a54d6cc6 100755
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -15,4 +15,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixstore
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/top/Makefile b/lib/libpkix/pkix/top/Makefile
index c3cb5ef8be..d714361be7 100755
--- a/lib/libpkix/pkix/top/Makefile
+++ b/lib/libpkix/pkix/top/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/top/config.mk b/lib/libpkix/pkix/top/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/top/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/top/manifest.mn b/lib/libpkix/pkix/top/manifest.mn
index 8ba169d69f..5bdd3f300d 100755
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -19,4 +19,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixtop
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix/util/Makefile b/lib/libpkix/pkix/util/Makefile
index 1b75ee75a2..2b5492506c 100755
--- a/lib/libpkix/pkix/util/Makefile
+++ b/lib/libpkix/pkix/util/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix/util/config.mk b/lib/libpkix/pkix/util/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix/util/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix/util/manifest.mn b/lib/libpkix/pkix/util/manifest.mn
index f18d94beea..e7d9f973c7 100755
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -22,4 +22,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixutil
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/Makefile b/lib/libpkix/pkix_pl_nss/Makefile
index 1b75ee75a2..2b5492506c 100755
--- a/lib/libpkix/pkix_pl_nss/Makefile
+++ b/lib/libpkix/pkix_pl_nss/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix_pl_nss/config.mk b/lib/libpkix/pkix_pl_nss/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix_pl_nss/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix_pl_nss/module/Makefile b/lib/libpkix/pkix_pl_nss/module/Makefile
index c3cb5ef8be..e97ad8e4de 100755
--- a/lib/libpkix/pkix_pl_nss/module/Makefile
+++ b/lib/libpkix/pkix_pl_nss/module/Makefile
@@ -26,7 +26,26 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
+ifdef NSS_PKIX_NO_LDAP
+LDAP_HEADERS =
+LDAP_CSRCS =
+else
+LDAP_HEADERS = \
+	pkix_pl_ldapt.h \
+	pkix_pl_ldapcertstore.h \
+	pkix_pl_ldapresponse.h \
+	pkix_pl_ldaprequest.h \
+	pkix_pl_ldapdefaultclient.h \
+ 	$(NULL)
+ 
+LDAP_CSRCS = \
+	pkix_pl_ldaptemplates.c \
+	pkix_pl_ldapcertstore.c \
+	pkix_pl_ldapresponse.c \
+	pkix_pl_ldaprequest.c \
+	pkix_pl_ldapdefaultclient.c \
+ 	$(NULL)
+endif
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix_pl_nss/module/config.mk b/lib/libpkix/pkix_pl_nss/module/config.mk
deleted file mode 100755
index 2926747a2f..0000000000
--- a/lib/libpkix/pkix_pl_nss/module/config.mk
+++ /dev/null
@@ -1,35 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-ifdef NSS_PKIX_NO_LDAP
-LDAP_HEADERS =
-LDAP_CSRCS =
-else
-LDAP_HEADERS = \
-	pkix_pl_ldapt.h \
-	pkix_pl_ldapcertstore.h \
-	pkix_pl_ldapresponse.h \
-	pkix_pl_ldaprequest.h \
-	pkix_pl_ldapdefaultclient.h \
- 	$(NULL)
- 
-LDAP_CSRCS = \
-	pkix_pl_ldaptemplates.c \
-	pkix_pl_ldapcertstore.c \
-	pkix_pl_ldapresponse.c \
-	pkix_pl_ldaprequest.c \
-	pkix_pl_ldapdefaultclient.c \
- 	$(NULL)
-endif
diff --git a/lib/libpkix/pkix_pl_nss/module/manifest.mn b/lib/libpkix/pkix_pl_nss/module/manifest.mn
index 9ae4d915cc..31231e4edf 100755
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -31,4 +31,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixmodule
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/pki/Makefile b/lib/libpkix/pkix_pl_nss/pki/Makefile
index a9cebcfecf..2b4b1574ab 100755
--- a/lib/libpkix/pkix_pl_nss/pki/Makefile
+++ b/lib/libpkix/pkix_pl_nss/pki/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix_pl_nss/pki/config.mk b/lib/libpkix/pkix_pl_nss/pki/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix_pl_nss/pki/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix_pl_nss/pki/manifest.mn b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
index 7e105e7b92..aba1367e56 100755
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -47,4 +47,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixpki
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/system/Makefile b/lib/libpkix/pkix_pl_nss/system/Makefile
index a9cebcfecf..2b4b1574ab 100755
--- a/lib/libpkix/pkix_pl_nss/system/Makefile
+++ b/lib/libpkix/pkix_pl_nss/system/Makefile
@@ -26,7 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/libpkix/pkix_pl_nss/system/config.mk b/lib/libpkix/pkix_pl_nss/system/config.mk
deleted file mode 100755
index b8c03de796..0000000000
--- a/lib/libpkix/pkix_pl_nss/system/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/libpkix/pkix_pl_nss/system/manifest.mn b/lib/libpkix/pkix_pl_nss/system/manifest.mn
index 16cb6d0eb7..a143a03eed 100755
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -40,4 +40,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixsystem
-
+SHARED_LIBRARY = $(NULL)
diff --git a/lib/pk11wrap/Makefile b/lib/pk11wrap/Makefile
index 4f0c5cde18..67b7a37e8c 100644
--- a/lib/pk11wrap/Makefile
+++ b/lib/pk11wrap/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/pk11wrap/config.mk b/lib/pk11wrap/config.mk
deleted file mode 100644
index b8c03de796..0000000000
--- a/lib/pk11wrap/config.mk
+++ /dev/null
@@ -1,15 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/pk11wrap/manifest.mn b/lib/pk11wrap/manifest.mn
index 64ec3083ca..385fa5e7b5 100644
--- a/lib/pk11wrap/manifest.mn
+++ b/lib/pk11wrap/manifest.mn
@@ -48,6 +48,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pk11wrap
+SHARED_LIBRARY = $(NULL)
 
 NSS_LIBRARY_VERSION = 3
 SOFTOKEN_LIBRARY_VERSION = 3
diff --git a/lib/pkcs12/Makefile b/lib/pkcs12/Makefile
index 8149184b44..3fd2f50b12 100644
--- a/lib/pkcs12/Makefile
+++ b/lib/pkcs12/Makefile
@@ -27,8 +27,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/pkcs12/config.mk b/lib/pkcs12/config.mk
deleted file mode 100644
index dc39ee4d6a..0000000000
--- a/lib/pkcs12/config.mk
+++ /dev/null
@@ -1,16 +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/.
-
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/pkcs12/manifest.mn b/lib/pkcs12/manifest.mn
index 26166ec32c..ab54bec43a 100644
--- a/lib/pkcs12/manifest.mn
+++ b/lib/pkcs12/manifest.mn
@@ -26,6 +26,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkcs12
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/pkcs7/Makefile b/lib/pkcs7/Makefile
index a9cebcfecf..aae54b1e0f 100644
--- a/lib/pkcs7/Makefile
+++ b/lib/pkcs7/Makefile
@@ -26,8 +26,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
-
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/pkcs7/config.mk b/lib/pkcs7/config.mk
deleted file mode 100644
index 36f063f1dd..0000000000
--- a/lib/pkcs7/config.mk
+++ /dev/null
@@ -1,14 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
diff --git a/lib/pkcs7/manifest.mn b/lib/pkcs7/manifest.mn
index 1a6cad0f7f..9ca2d4de5e 100644
--- a/lib/pkcs7/manifest.mn
+++ b/lib/pkcs7/manifest.mn
@@ -28,6 +28,7 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkcs7
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/pki/Makefile b/lib/pki/Makefile
index ca709f6c0d..3f49eaa45d 100644
--- a/lib/pki/Makefile
+++ b/lib/pki/Makefile
@@ -4,7 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
+
 include $(CORE_DEPTH)/coreconf/config.mk
-include config.mk
-include $(CORE_DEPTH)/coreconf/rules.mk
 
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
+include $(CORE_DEPTH)/coreconf/rules.mk
diff --git a/lib/pki/config.mk b/lib/pki/config.mk
deleted file mode 100644
index 2676cd5370..0000000000
--- a/lib/pki/config.mk
+++ /dev/null
@@ -1,19 +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/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
diff --git a/lib/pki/manifest.mn b/lib/pki/manifest.mn
index 77226b179b..98af6b8a7d 100644
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -36,7 +36,7 @@ CSRCS =		        \
 REQUIRES = nspr
 
 LIBRARY_NAME = nsspki
-LIBRARY_VERSION = 3
+SHARED_LIBRARY = $(NULL)
 
 # This part of the code, including all sub-dirs, can be optimized for size
 export ALLOW_OPT_CODE_SIZE = 1
diff --git a/lib/sqlite/Makefile b/lib/sqlite/Makefile
index 592adb648f..960482d3f6 100644
--- a/lib/sqlite/Makefile
+++ b/lib/sqlite/Makefile
@@ -27,7 +27,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
--include config.mk
+include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/sysinit/Makefile b/lib/sysinit/Makefile
index fe59954dff..3803142fd6 100644
--- a/lib/sysinit/Makefile
+++ b/lib/sysinit/Makefile
@@ -24,7 +24,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-#include ../platlibs.mk
 include config.mk
 
 #######################################################################
@@ -43,6 +42,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-
-#include ../platrules.mk
-
diff --git a/lib/util/Makefile b/lib/util/Makefile
index 9b51d18cdf..c3cb5ef8be 100644
--- a/lib/util/Makefile
+++ b/lib/util/Makefile
@@ -14,8 +14,6 @@ include manifest.mn
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
 
-# include $(CORE_DEPTH)/coreconf/arch.mk
-
 include $(CORE_DEPTH)/coreconf/config.mk
 
 #######################################################################
diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile
index 812c38fce2..0aa8a85aa3 100644
--- a/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
@@ -25,7 +25,12 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
-include config.mk
+EXTRA_LIBS = $(LIBRARY)
+
+ifneq ($(OS_ARCH),WINNT)
+DEFINES += -DHAVE_UNISTD_H
+endif
+DEFINES += -DHAVE_STDARG_H
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
diff --git a/lib/zlib/config.mk b/lib/zlib/config.mk
deleted file mode 100644
index 9e9fb31794..0000000000
--- a/lib/zlib/config.mk
+++ /dev/null
@@ -1,21 +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/.
-
-#
-#  Override TARGETS variable so that only static libraries
-#  are specifed as dependencies within rules.mk.
-#
-
-TARGETS        = $(LIBRARY)
-SHARED_LIBRARY =
-IMPORT_LIBRARY =
-PROGRAM        =
-
-EXTRA_LIBS     = $(LIBRARY)
-
-ifneq ($(OS_ARCH),WINNT)
-DEFINES += -DHAVE_UNISTD_H
-endif
-DEFINES += -DHAVE_STDARG_H
diff --git a/lib/zlib/manifest.mn b/lib/zlib/manifest.mn
index 879c9fb241..fa7cfd1204 100644
--- a/lib/zlib/manifest.mn
+++ b/lib/zlib/manifest.mn
@@ -27,8 +27,7 @@ CSRCS =	adler32.c 	\
 	$(NULL)
 
 LIBRARY_NAME = zlib
-
-# REQUIRES = nss
+SHARED_LIBRARY = $(NULL)
 
 # Define verbose as -1 to turn off all zlib trace messages in
 # debug builds.