diff --git a/Makefile b/Makefile
index bf5278936c..8d7a5b8f21 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-nss_build_all: build_coreconf build_nspr build_dbm all
+nss_build_all: build_coreconf build_nspr all
 
-nss_clean_all: clobber_coreconf clobber_nspr clobber_dbm clobber
+nss_clean_all: clobber_coreconf clobber_nspr clobber
 
 build_coreconf:
 	$(MAKE) -C $(CORE_DEPTH)/coreconf
@@ -54,8 +54,8 @@ build_coreconf:
 clobber_coreconf:
 	$(MAKE) -C $(CORE_DEPTH)/coreconf clobber
 
-NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)/config.status
-NSPR_CONFIGURE = $(CORE_DEPTH)/../nsprpub/configure
+NSPR_CONFIG_STATUS = $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/config.status
+NSPR_CONFIGURE = $(CORE_DEPTH)/../nspr/configure
 
 #
 # Translate coreconf build options to NSPR configure options.
@@ -96,31 +96,24 @@ USEABSPATH="NO"
 endif
 endif
 ifeq ($(USEABSPATH),"YES")
-NSPR_PREFIX = $(shell pwd)/../../dist/$(OBJDIR_NAME)
+NSPR_PREFIX = $(shell pwd)/../dist/$(OBJDIR_NAME)
 else
 NSPR_PREFIX = $$(topsrcdir)/../dist/$(OBJDIR_NAME)
 endif
 
 $(NSPR_CONFIG_STATUS): $(NSPR_CONFIGURE)
-	$(NSINSTALL) -D $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
-	cd $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) ; \
+	$(NSINSTALL) -D $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
+	cd $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) ; \
 	$(NSPR_COMPILERS) sh ../configure \
 	$(NSPR_CONFIGURE_OPTS) \
 	--with-dist-prefix='$(NSPR_PREFIX)' \
 	--with-dist-includedir='$(NSPR_PREFIX)/include'
 
 build_nspr: $(NSPR_CONFIG_STATUS)
-	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME)
+	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)
 
 clobber_nspr: $(NSPR_CONFIG_STATUS)
-	$(MAKE) -C $(CORE_DEPTH)/../nsprpub/$(OBJDIR_NAME) clobber
-
-build_dbm:
-ifdef NSS_DISABLE_DBM
-	@echo "skipping the build of DBM"
-else
-	$(MAKE) -C $(CORE_DEPTH)/dbm export libs
-endif
+	$(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) clobber
 
 build_docs:
 	$(MAKE) -C $(CORE_DEPTH)/nss/doc
@@ -128,9 +121,6 @@ build_docs:
 clean_docs:
 	$(MAKE) -C $(CORE_DEPTH)/nss/doc clean
 
-clobber_dbm:
-	$(MAKE) -C $(CORE_DEPTH)/dbm clobber
-
 moz_import::
 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
 	$(NSINSTALL) -D $(DIST)/include/nspr
@@ -154,7 +144,7 @@ else
 endif
 endif
 
-nss_RelEng_bld: build_coreconf import build_dbm all
+nss_RelEng_bld: build_coreconf import all
 
 package:
 	$(MAKE) -C pkg publish
diff --git a/cmd/Makefile b/cmd/Makefile
index ac3be75ad8..b982059265 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -4,8 +4,8 @@
 # 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/.
 
-CORE_DEPTH = ../..
-DEPTH = ../..
+CORE_DEPTH = ..
+DEPTH = ..
 
 include manifest.mn
 include $(CORE_DEPTH)/coreconf/config.mk
diff --git a/cmd/addbuiltin/manifest.mn b/cmd/addbuiltin/manifest.mn
index ef120ace51..9c44c089ad 100644
--- a/cmd/addbuiltin/manifest.mn
+++ b/cmd/addbuiltin/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/atob/manifest.mn b/cmd/atob/manifest.mn
index 61ea55e211..5d822b96ec 100644
--- a/cmd/atob/manifest.mn
+++ b/cmd/atob/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/bltest/manifest.mn b/cmd/bltest/manifest.mn
index 66fae919f6..6e9946c343 100644
--- a/cmd/bltest/manifest.mn
+++ b/cmd/bltest/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/btoa/manifest.mn b/cmd/btoa/manifest.mn
index 919bd6adef..52508a59a6 100644
--- a/cmd/btoa/manifest.mn
+++ b/cmd/btoa/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/certcgi/manifest.mn b/cmd/certcgi/manifest.mn
index 6d9ab8cccc..9e17cef9d9 100644
--- a/cmd/certcgi/manifest.mn
+++ b/cmd/certcgi/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header directories are implicitly REQUIREd.
 MODULE = nss 
diff --git a/cmd/certutil/manifest.mn b/cmd/certutil/manifest.mn
index 6f9dc74721..c0bce4c7e6 100644
--- a/cmd/certutil/manifest.mn
+++ b/cmd/certutil/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/checkcert/manifest.mn b/cmd/checkcert/manifest.mn
index 830dd29c4a..d796b64d88 100644
--- a/cmd/checkcert/manifest.mn
+++ b/cmd/checkcert/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/chktest/manifest.mn b/cmd/chktest/manifest.mn
index 3fb2f95613..50b1ca1eb2 100644
--- a/cmd/chktest/manifest.mn
+++ b/cmd/chktest/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/crlutil/manifest.mn b/cmd/crlutil/manifest.mn
index 1dd7c9e40f..cd0549c6d6 100644
--- a/cmd/crlutil/manifest.mn
+++ b/cmd/crlutil/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/crmf-cgi/manifest.mn b/cmd/crmf-cgi/manifest.mn
index 97a0512e76..1212424b6b 100644
--- a/cmd/crmf-cgi/manifest.mn
+++ b/cmd/crmf-cgi/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 MODULE	= sectools
 
 EXPORTS = \
diff --git a/cmd/crmftest/manifest.mn b/cmd/crmftest/manifest.mn
index 210f498f38..578729e62b 100644
--- a/cmd/crmftest/manifest.mn
+++ b/cmd/crmftest/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 DEPTH      = .
 
 # MODULE public and private header  directories are implicitly REQUIRED.
diff --git a/cmd/dbck/manifest.mn b/cmd/dbck/manifest.mn
index 90dbfa2e92..ec8812edb0 100644
--- a/cmd/dbck/manifest.mn
+++ b/cmd/dbck/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20 
 
diff --git a/cmd/dbtest/manifest.mn b/cmd/dbtest/manifest.mn
index d7aa863621..8f9ec1f672 100644
--- a/cmd/dbtest/manifest.mn
+++ b/cmd/dbtest/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/derdump/manifest.mn b/cmd/derdump/manifest.mn
index 95e1a8a20f..0b550377c5 100644
--- a/cmd/derdump/manifest.mn
+++ b/cmd/derdump/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/digest/manifest.mn b/cmd/digest/manifest.mn
index 1445d789c7..3e764063a7 100644
--- a/cmd/digest/manifest.mn
+++ b/cmd/digest/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/ecperf/manifest.mn b/cmd/ecperf/manifest.mn
index f500e85959..61fa8809b1 100755
--- a/cmd/ecperf/manifest.mn
+++ b/cmd/ecperf/manifest.mn
@@ -3,8 +3,8 @@
 # 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	= ../../..
-CORE_DEPTH = ../../..
+DEPTH	= ../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/fipstest/manifest.mn b/cmd/fipstest/manifest.mn
index ef5cef9f87..1cebd7976d 100644
--- a/cmd/fipstest/manifest.mn
+++ b/cmd/fipstest/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/httpserv/manifest.mn b/cmd/httpserv/manifest.mn
index 79d7dc1dfd..e969661103 100644
--- a/cmd/httpserv/manifest.mn
+++ b/cmd/httpserv/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/lib/manifest.mn b/cmd/lib/manifest.mn
index 1cd18a79de..87440c0526 100644
--- a/cmd/lib/manifest.mn
+++ b/cmd/lib/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 LIBRARY_NAME	= sectool
 
diff --git a/cmd/libpkix/manifest.mn b/cmd/libpkix/manifest.mn
index 6d9399a74d..4f232a5100 100755
--- a/cmd/libpkix/manifest.mn
+++ b/cmd/libpkix/manifest.mn
@@ -5,7 +5,7 @@
 
 PKIX_DEPTH = .
 PLAT_DEPTH = $(PKIX_DEPTH)/..
-CORE_DEPTH = $(PKIX_DEPTH)/../../..
+CORE_DEPTH = $(PKIX_DEPTH)/../..
 
 DIRS =  testutil  pkix_pl  pkix  sample_apps  perf  pkixutil \
 	$(NULL)
diff --git a/cmd/listsuites/manifest.mn b/cmd/listsuites/manifest.mn
index 1231f9d61e..3e78daceea 100644
--- a/cmd/listsuites/manifest.mn
+++ b/cmd/listsuites/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/lowhashtest/manifest.mn b/cmd/lowhashtest/manifest.mn
index d67e75127e..f493571e50 100644
--- a/cmd/lowhashtest/manifest.mn
+++ b/cmd/lowhashtest/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/makepqg/manifest.mn b/cmd/makepqg/manifest.mn
index f5132c8d52..f424410bfb 100644
--- a/cmd/makepqg/manifest.mn
+++ b/cmd/makepqg/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/manifest.mn b/cmd/manifest.mn
index 3c5b132e70..235fce9d2f 100644
--- a/cmd/manifest.mn
+++ b/cmd/manifest.mn
@@ -3,7 +3,7 @@
 # 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	= ..
 # MODULE	= seccmd
 
 REQUIRES = nss nspr libdbm
diff --git a/cmd/modutil/manifest.mn b/cmd/modutil/manifest.mn
index 628bac40c7..9929a80592 100644
--- a/cmd/modutil/manifest.mn
+++ b/cmd/modutil/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = sectools
 
diff --git a/cmd/multinit/manifest.mn b/cmd/multinit/manifest.mn
index c7d0a6e61a..a86adc8c8a 100644
--- a/cmd/multinit/manifest.mn
+++ b/cmd/multinit/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/ocspclnt/manifest.mn b/cmd/ocspclnt/manifest.mn
index 4a3850f5fd..a2794a3831 100644
--- a/cmd/ocspclnt/manifest.mn
+++ b/cmd/ocspclnt/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/ocspresp/manifest.mn b/cmd/ocspresp/manifest.mn
index 8d3cd02320..3608623b8a 100644
--- a/cmd/ocspresp/manifest.mn
+++ b/cmd/ocspresp/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/oidcalc/manifest.mn b/cmd/oidcalc/manifest.mn
index c453080817..e7976c6616 100644
--- a/cmd/oidcalc/manifest.mn
+++ b/cmd/oidcalc/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/p7content/manifest.mn b/cmd/p7content/manifest.mn
index dae43f756b..6fa632f551 100644
--- a/cmd/p7content/manifest.mn
+++ b/cmd/p7content/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 MODULE = nss
 
diff --git a/cmd/p7env/manifest.mn b/cmd/p7env/manifest.mn
index 7bc4f5a226..db385b2082 100644
--- a/cmd/p7env/manifest.mn
+++ b/cmd/p7env/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/p7sign/manifest.mn b/cmd/p7sign/manifest.mn
index abff5edc5d..1f32e3954b 100644
--- a/cmd/p7sign/manifest.mn
+++ b/cmd/p7sign/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/p7verify/manifest.mn b/cmd/p7verify/manifest.mn
index 97c328e102..565c74bc29 100644
--- a/cmd/p7verify/manifest.mn
+++ b/cmd/p7verify/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/pk11mode/manifest.mn b/cmd/pk11mode/manifest.mn
index 75a37074ee..ed205cdedf 100644
--- a/cmd/pk11mode/manifest.mn
+++ b/cmd/pk11mode/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/pk11util/manifest.mn b/cmd/pk11util/manifest.mn
index 656b09eb00..ca818aad4b 100644
--- a/cmd/pk11util/manifest.mn
+++ b/cmd/pk11util/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/pk12util/manifest.mn b/cmd/pk12util/manifest.mn
index b38fc82f75..5f7e0ab49f 100644
--- a/cmd/pk12util/manifest.mn
+++ b/cmd/pk12util/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/pk1sign/manifest.mn b/cmd/pk1sign/manifest.mn
index b4d9006508..0094611668 100644
--- a/cmd/pk1sign/manifest.mn
+++ b/cmd/pk1sign/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/pkix-errcodes/manifest.mn b/cmd/pkix-errcodes/manifest.mn
index 4677bf8197..bef0636921 100644
--- a/cmd/pkix-errcodes/manifest.mn
+++ b/cmd/pkix-errcodes/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/pp/manifest.mn b/cmd/pp/manifest.mn
index be8c792f2f..de6126ae4a 100644
--- a/cmd/pp/manifest.mn
+++ b/cmd/pp/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/ppcertdata/manifest.mn b/cmd/ppcertdata/manifest.mn
index 30a47aa5be..142a773caa 100644
--- a/cmd/ppcertdata/manifest.mn
+++ b/cmd/ppcertdata/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/cmd/pwdecrypt/manifest.mn b/cmd/pwdecrypt/manifest.mn
index 2f8aa1d69c..51cb8c8f3c 100644
--- a/cmd/pwdecrypt/manifest.mn
+++ b/cmd/pwdecrypt/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/rsaperf/manifest.mn b/cmd/rsaperf/manifest.mn
index 6de267d180..14fce7271b 100644
--- a/cmd/rsaperf/manifest.mn
+++ b/cmd/rsaperf/manifest.mn
@@ -3,8 +3,8 @@
 # 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	= ../../..
-CORE_DEPTH = ../../..
+DEPTH	= ../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/rsapoptst/manifest.mn b/cmd/rsapoptst/manifest.mn
index d48f21fa1a..18126cffc0 100644
--- a/cmd/rsapoptst/manifest.mn
+++ b/cmd/rsapoptst/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/sdrtest/manifest.mn b/cmd/sdrtest/manifest.mn
index ee10754ddf..d0c67450f8 100644
--- a/cmd/sdrtest/manifest.mn
+++ b/cmd/sdrtest/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/selfserv/manifest.mn b/cmd/selfserv/manifest.mn
index 4da3544b57..a170169c8b 100644
--- a/cmd/selfserv/manifest.mn
+++ b/cmd/selfserv/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/shlibsign/mangle/manifest.mn b/cmd/shlibsign/mangle/manifest.mn
index b08a73ed03..40b4841cb1 100644
--- a/cmd/shlibsign/mangle/manifest.mn
+++ b/cmd/shlibsign/mangle/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/shlibsign/manifest.mn b/cmd/shlibsign/manifest.mn
index 82110dacef..95f8765b36 100644
--- a/cmd/shlibsign/manifest.mn
+++ b/cmd/shlibsign/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/signtool/manifest.mn b/cmd/signtool/manifest.mn
index dd0be72169..40be262dba 100644
--- a/cmd/signtool/manifest.mn
+++ b/cmd/signtool/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/signver/manifest.mn b/cmd/signver/manifest.mn
index 789915ea5f..7a1de149f9 100644
--- a/cmd/signver/manifest.mn
+++ b/cmd/signver/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/smimetools/manifest.mn b/cmd/smimetools/manifest.mn
index eeb43a186d..0e20ed77cf 100644
--- a/cmd/smimetools/manifest.mn
+++ b/cmd/smimetools/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/cmd/ssltap/manifest.mn b/cmd/ssltap/manifest.mn
index 49865374f2..0c09c17a3e 100644
--- a/cmd/ssltap/manifest.mn
+++ b/cmd/ssltap/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/strsclnt/manifest.mn b/cmd/strsclnt/manifest.mn
index 573a31c9be..fc00b69224 100644
--- a/cmd/strsclnt/manifest.mn
+++ b/cmd/strsclnt/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/symkeyutil/manifest.mn b/cmd/symkeyutil/manifest.mn
index 365e25f852..f87480e44d 100644
--- a/cmd/symkeyutil/manifest.mn
+++ b/cmd/symkeyutil/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DEFINES += -DNSPR20
 
diff --git a/cmd/tests/manifest.mn b/cmd/tests/manifest.mn
index b72a8db80d..88b8347365 100644
--- a/cmd/tests/manifest.mn
+++ b/cmd/tests/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/tstclnt/manifest.mn b/cmd/tstclnt/manifest.mn
index 793d578b97..5a4fec8c1f 100644
--- a/cmd/tstclnt/manifest.mn
+++ b/cmd/tstclnt/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/vfychain/manifest.mn b/cmd/vfychain/manifest.mn
index e85c01d22b..5b2ae25e7b 100644
--- a/cmd/vfychain/manifest.mn
+++ b/cmd/vfychain/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/cmd/vfyserv/manifest.mn b/cmd/vfyserv/manifest.mn
index dd3d03f73a..c925be9660 100644
--- a/cmd/vfyserv/manifest.mn
+++ b/cmd/vfyserv/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss
diff --git a/lib/Makefile b/lib/Makefile
index 364c442226..669b41bb0c 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -42,6 +42,10 @@ SYSINIT_SRCDIR = sysinit  # Add the sysinit directory to DIRS.
 endif
 endif
 
+ifndef NSS_DISABLE_DBM
+DBM_SRCDIR = dbm  # Add the dbm directory to DIRS.
+endif
+
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
 #######################################################################
diff --git a/lib/base/manifest.mn b/lib/base/manifest.mn
index 01eb39cd04..158f232041 100644
--- a/lib/base/manifest.mn
+++ b/lib/base/manifest.mn
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	baset.h		  \
diff --git a/lib/certdb/manifest.mn b/lib/certdb/manifest.mn
index 181da5fbac..28548f4671 100644
--- a/lib/certdb/manifest.mn
+++ b/lib/certdb/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	cert.h \
diff --git a/lib/certhigh/manifest.mn b/lib/certhigh/manifest.mn
index fe2ab1d46e..c025d7be94 100644
--- a/lib/certhigh/manifest.mn
+++ b/lib/certhigh/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	ocsp.h \
diff --git a/lib/ckfw/builtins/manifest.mn b/lib/ckfw/builtins/manifest.mn
index 161b20b1d7..ecc022dd84 100644
--- a/lib/ckfw/builtins/manifest.mn
+++ b/lib/ckfw/builtins/manifest.mn
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 MODULE = nss
 MAPFILE = $(OBJDIR)/nssckbi.def
diff --git a/lib/ckfw/manifest.mn b/lib/ckfw/manifest.mn
index dcb79cb842..87d2f01195 100644
--- a/lib/ckfw/manifest.mn
+++ b/lib/ckfw/manifest.mn
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 DIRS = builtins 
 
diff --git a/lib/crmf/manifest.mn b/lib/crmf/manifest.mn
index 182291a3a4..9f177b9ca0 100644
--- a/lib/crmf/manifest.mn
+++ b/lib/crmf/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/lib/cryptohi/manifest.mn b/lib/cryptohi/manifest.mn
index a3955924a1..2050b15178 100644
--- a/lib/cryptohi/manifest.mn
+++ b/lib/cryptohi/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/lib/dbm/Makefile b/lib/dbm/Makefile
index 73c7faefa4..a4df914b2b 100644
--- a/lib/dbm/Makefile
+++ b/lib/dbm/Makefile
@@ -10,10 +10,6 @@
 
 include manifest.mn
 
-ifdef NSS_DISABLE_DBM
-DIRS =
-endif
-
 #######################################################################
 # (2) Include "global" configuration information. (OPTIONAL)          #
 #######################################################################
diff --git a/lib/dbm/include/Makefile b/lib/dbm/include/Makefile
index 3af3581bf3..4c9e4e9392 100644
--- a/lib/dbm/include/Makefile
+++ b/lib/dbm/include/Makefile
@@ -44,5 +44,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-
-
+export:: private_export
diff --git a/lib/dbm/include/manifest.mn b/lib/dbm/include/manifest.mn
index 56cc6069b6..da971b3c24 100644
--- a/lib/dbm/include/manifest.mn
+++ b/lib/dbm/include/manifest.mn
@@ -4,9 +4,7 @@
 # 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/.
 
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/include
+CORE_DEPTH = ../../..
 
 MODULE = dbm
 
diff --git a/lib/dbm/manifest.mn b/lib/dbm/manifest.mn
index a4cff53f4d..7a3bcf4c1f 100644
--- a/lib/dbm/manifest.mn
+++ b/lib/dbm/manifest.mn
@@ -4,7 +4,7 @@
 # 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/.
 
-CORE_DEPTH = ..
+CORE_DEPTH = ../..
 
 MODULE = dbm
 
diff --git a/lib/dbm/src/Makefile b/lib/dbm/src/Makefile
index 0fb17f0a17..862544362b 100644
--- a/lib/dbm/src/Makefile
+++ b/lib/dbm/src/Makefile
@@ -20,7 +20,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (3) Include "component" configuration information. (OPTIONAL)       #
 #######################################################################
 
-include $(CORE_DEPTH)/dbm/config/config.mk
+include $(CORE_DEPTH)/lib/dbm/config/config.mk
 
 #######################################################################
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
diff --git a/lib/dbm/src/config.mk b/lib/dbm/src/config.mk
index b05da9fc02..05ed3c049d 100644
--- a/lib/dbm/src/config.mk
+++ b/lib/dbm/src/config.mk
@@ -6,8 +6,6 @@
 
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
 
-INCLUDES += -I$(CORE_DEPTH)/../dbm/include
-
 #
 #  Currently, override TARGETS variable so that only static libraries
 #  are specifed as dependencies within rules.mk.
diff --git a/lib/dbm/src/manifest.mn b/lib/dbm/src/manifest.mn
index 14e2d27d68..119044407e 100644
--- a/lib/dbm/src/manifest.mn
+++ b/lib/dbm/src/manifest.mn
@@ -4,9 +4,7 @@
 # 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/.
 
-CORE_DEPTH = ../..
-
-VPATH  = $(CORE_DEPTH)/../dbm/src
+CORE_DEPTH = ../../..
 
 MODULE = dbm
 
diff --git a/lib/dbm/tests/Makefile b/lib/dbm/tests/Makefile
index 08381fde8f..3ecabe27cb 100644
--- a/lib/dbm/tests/Makefile
+++ b/lib/dbm/tests/Makefile
@@ -3,8 +3,8 @@
 # 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/.
-DEPTH		= ../..
-CORE_DEPTH	= ../..
+DEPTH		= ../../..
+CORE_DEPTH	= ../../..
 
 VPATH		= $(CORE_DEPTH)/../dbm/tests
 
diff --git a/lib/dev/manifest.mn b/lib/dev/manifest.mn
index 651eabd186..88a044f890 100644
--- a/lib/dev/manifest.mn
+++ b/lib/dev/manifest.mn
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	ckhelper.h \
diff --git a/lib/freebl/manifest.mn b/lib/freebl/manifest.mn
index f7f98c15bc..55b4aaaded 100644
--- a/lib/freebl/manifest.mn
+++ b/lib/freebl/manifest.mn
@@ -6,7 +6,7 @@
 # NOTE: any ifdefs in this file must be defined on the gmake command line
 # (if anywhere).  They cannot come from Makefile or config.mk 
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/lib/jar/manifest.mn b/lib/jar/manifest.mn
index 3368387f96..5b516886a9 100644
--- a/lib/jar/manifest.mn
+++ b/lib/jar/manifest.mn
@@ -6,7 +6,7 @@ MODULE = nss
 
 LIBRARY_NAME = jar
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 CSRCS =	\
 	jarver.c \
diff --git a/lib/libpkix/include/manifest.mn b/lib/libpkix/include/manifest.mn
index 9dc7a67819..cc74890cf5 100755
--- a/lib/libpkix/include/manifest.mn
+++ b/lib/libpkix/include/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/manifest.mn b/lib/libpkix/manifest.mn
index ebf01f259a..31990da63d 100755
--- a/lib/libpkix/manifest.mn
+++ b/lib/libpkix/manifest.mn
@@ -2,8 +2,8 @@
 # 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/.
-CORE_DEPTH = ../../..
-DEPTH      = ../../..
+CORE_DEPTH = ../..
+DEPTH      = ../..
 
 #
 DIRS =  include pkix pkix_pl_nss \
diff --git a/lib/libpkix/pkix/certsel/manifest.mn b/lib/libpkix/pkix/certsel/manifest.mn
index d90f1a2749..525ee09ca7 100755
--- a/lib/libpkix/pkix/certsel/manifest.mn
+++ b/lib/libpkix/pkix/certsel/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/checker/manifest.mn b/lib/libpkix/pkix/checker/manifest.mn
index f9566dde29..eba69d0ce6 100755
--- a/lib/libpkix/pkix/checker/manifest.mn
+++ b/lib/libpkix/pkix/checker/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/crlsel/manifest.mn b/lib/libpkix/pkix/crlsel/manifest.mn
index 6086f0f9a4..8ea0f59c67 100755
--- a/lib/libpkix/pkix/crlsel/manifest.mn
+++ b/lib/libpkix/pkix/crlsel/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/manifest.mn b/lib/libpkix/pkix/manifest.mn
index 24e639c38a..dcb6f0ce61 100755
--- a/lib/libpkix/pkix/manifest.mn
+++ b/lib/libpkix/pkix/manifest.mn
@@ -2,8 +2,8 @@
 # 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/.
-CORE_DEPTH = ../../../..
-DEPTH      = ../../../..
+CORE_DEPTH = ../../..
+DEPTH      = ../../..
 
 #
 DIRS =  certsel crlsel checker params results store top util \
diff --git a/lib/libpkix/pkix/params/manifest.mn b/lib/libpkix/pkix/params/manifest.mn
index ff40ffac6f..f26e588f55 100755
--- a/lib/libpkix/pkix/params/manifest.mn
+++ b/lib/libpkix/pkix/params/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/results/manifest.mn b/lib/libpkix/pkix/results/manifest.mn
index a91f2efccf..c082ada1fd 100755
--- a/lib/libpkix/pkix/results/manifest.mn
+++ b/lib/libpkix/pkix/results/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/store/manifest.mn b/lib/libpkix/pkix/store/manifest.mn
index 37b5dcdce3..4df8eb64ba 100755
--- a/lib/libpkix/pkix/store/manifest.mn
+++ b/lib/libpkix/pkix/store/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/top/manifest.mn b/lib/libpkix/pkix/top/manifest.mn
index bb7a600b3b..c49941034e 100755
--- a/lib/libpkix/pkix/top/manifest.mn
+++ b/lib/libpkix/pkix/top/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix/util/manifest.mn b/lib/libpkix/pkix/util/manifest.mn
index 5609ca26c3..9c068ae730 100755
--- a/lib/libpkix/pkix/util/manifest.mn
+++ b/lib/libpkix/pkix/util/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/manifest.mn b/lib/libpkix/pkix_pl_nss/manifest.mn
index f8d71ed777..f3c83511a9 100755
--- a/lib/libpkix/pkix_pl_nss/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/manifest.mn
@@ -2,8 +2,8 @@
 # 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/.
-CORE_DEPTH = ../../../..
-DEPTH      = ../../../..
+CORE_DEPTH = ../../..
+DEPTH      = ../../..
 
 #
 DIRS =  pki system module \
diff --git a/lib/libpkix/pkix_pl_nss/module/manifest.mn b/lib/libpkix/pkix_pl_nss/module/manifest.mn
index 7b9860135b..12d3ceeaf1 100755
--- a/lib/libpkix/pkix_pl_nss/module/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/module/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/pki/manifest.mn b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
index e49d218066..f8d4571e1e 100755
--- a/lib/libpkix/pkix_pl_nss/pki/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/pki/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/libpkix/pkix_pl_nss/system/manifest.mn b/lib/libpkix/pkix_pl_nss/system/manifest.mn
index bae5a4a5f7..82d2979924 100755
--- a/lib/libpkix/pkix_pl_nss/system/manifest.mn
+++ b/lib/libpkix/pkix_pl_nss/system/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../../..
+CORE_DEPTH = ../../../..
 
 EXPORTS = \
 	$(NULL)
diff --git a/lib/manifest.mn b/lib/manifest.mn
index 6ef8fb9984..4c27f931ab 100644
--- a/lib/manifest.mn
+++ b/lib/manifest.mn
@@ -2,8 +2,8 @@
 # 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/.
-CORE_DEPTH = ../..
-DEPTH      = ../..
+CORE_DEPTH = ..
+DEPTH      = ..
 
 #
 # organized by DLL
@@ -16,7 +16,7 @@ DEPTH      = ../..
 #  smime
 #  ckfw (builtins module)
 #  crmf jar (not dll's)
-DIRS =  util freebl $(SQLITE_SRCDIR) softoken \
+DIRS =  util freebl $(SQLITE_SRCDIR) $(DBM_SRCDIR) softoken \
 	base dev pki \
 	libpkix \
 	certdb certhigh pk11wrap cryptohi nss \
diff --git a/lib/nss/manifest.mn b/lib/nss/manifest.mn
index 005be6dd61..9e812e52ce 100644
--- a/lib/nss/manifest.mn
+++ b/lib/nss/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	nssrenam.h \
diff --git a/lib/pk11wrap/manifest.mn b/lib/pk11wrap/manifest.mn
index 8c43c7e883..1a2d2446d2 100644
--- a/lib/pk11wrap/manifest.mn
+++ b/lib/pk11wrap/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	secmod.h \
diff --git a/lib/pkcs12/manifest.mn b/lib/pkcs12/manifest.mn
index 1bf9720385..26166ec32c 100644
--- a/lib/pkcs12/manifest.mn
+++ b/lib/pkcs12/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	pkcs12t.h \
diff --git a/lib/pkcs7/manifest.mn b/lib/pkcs7/manifest.mn
index 59bb0519c6..1a6cad0f7f 100644
--- a/lib/pkcs7/manifest.mn
+++ b/lib/pkcs7/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	secmime.h \
diff --git a/lib/pki/manifest.mn b/lib/pki/manifest.mn
index 7c0f274bbd..a3739784ad 100644
--- a/lib/pki/manifest.mn
+++ b/lib/pki/manifest.mn
@@ -4,7 +4,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$"
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 PRIVATE_EXPORTS = \
 	pki.h      \
diff --git a/lib/smime/manifest.mn b/lib/smime/manifest.mn
index d8658268ad..e049d8873a 100644
--- a/lib/smime/manifest.mn
+++ b/lib/smime/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	cms.h \
diff --git a/lib/softoken/legacydb/manifest.mn b/lib/softoken/legacydb/manifest.mn
index 1024769de7..b0d3eef927 100644
--- a/lib/softoken/legacydb/manifest.mn
+++ b/lib/softoken/legacydb/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../../..
+CORE_DEPTH = ../../..
 
 MODULE = nss
 
diff --git a/lib/softoken/manifest.mn b/lib/softoken/manifest.mn
index e36bf60759..8bb8b5cf03 100644
--- a/lib/softoken/manifest.mn
+++ b/lib/softoken/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 DIRS = legacydb
diff --git a/lib/sqlite/manifest.mn b/lib/sqlite/manifest.mn
index 149170b5be..022749b6e8 100644
--- a/lib/sqlite/manifest.mn
+++ b/lib/sqlite/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/lib/ssl/manifest.mn b/lib/ssl/manifest.mn
index 3bb28a2f08..4d46d46b86 100644
--- a/lib/ssl/manifest.mn
+++ b/lib/ssl/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 # DEFINES = -DTRACE
 
diff --git a/lib/sysinit/manifest.mn b/lib/sysinit/manifest.mn
index bb413beef8..822f4fcbdc 100644
--- a/lib/sysinit/manifest.mn
+++ b/lib/sysinit/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 # MODULE public and private header  directories are implicitly REQUIRED.
 MODULE = nss 
diff --git a/lib/util/manifest.mn b/lib/util/manifest.mn
index 60ccaff084..ed54a1623c 100644
--- a/lib/util/manifest.mn
+++ b/lib/util/manifest.mn
@@ -2,7 +2,7 @@
 # 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/.
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 EXPORTS = \
 	base64.h \
diff --git a/lib/zlib/manifest.mn b/lib/zlib/manifest.mn
index 5e75ac0f8c..2118f8d4f6 100644
--- a/lib/zlib/manifest.mn
+++ b/lib/zlib/manifest.mn
@@ -3,7 +3,7 @@
 # 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/.
 
-CORE_DEPTH = ../../..
+CORE_DEPTH = ../..
 
 MODULE = nss
 
diff --git a/manifest.mn b/manifest.mn
index 361ce1cf44..ee70b12513 100644
--- a/manifest.mn
+++ b/manifest.mn
@@ -2,8 +2,8 @@
 # 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/.
-CORE_DEPTH = ..
-DEPTH      = ..
+CORE_DEPTH = .
+DEPTH      = .
 
 IMPORTS =	nspr20/v4.8 \
 		$(NULL)
diff --git a/tests/common/Makefile b/tests/common/Makefile
index 023fcbe7a3..5356356a6f 100644
--- a/tests/common/Makefile
+++ b/tests/common/Makefile
@@ -4,7 +4,7 @@
 # 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/.
 
-CORE_DEPTH	= ../../..
+CORE_DEPTH	= ../..
 
 include $(CORE_DEPTH)/coreconf/config.mk
 
diff --git a/tests/common/init.sh b/tests/common/init.sh
index 07a7e7c14a..b2c87c6d56 100644
--- a/tests/common/init.sh
+++ b/tests/common/init.sh
@@ -241,7 +241,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then
 #directory name init
     SCRIPTNAME=init.sh
 
-    mozilla_root=`(cd ../../../..; pwd)`
+    mozilla_root=`(cd ../../..; pwd)`
     MOZILLA_ROOT=${MOZILLA_ROOT-$mozilla_root}
 
     qadir=`(cd ..; pwd)`