diff --git a/mozilla/security/coreconf/rules.mk b/mozilla/security/coreconf/rules.mk
index eb9d0e89d00..e8258f0af80 100644
--- a/mozilla/security/coreconf/rules.mk
+++ b/mozilla/security/coreconf/rules.mk
@@ -41,7 +41,7 @@
 # Double-Colon rules for utilizing the binary release model.          #
 #######################################################################
 
-all:: export libs program install
+all:: export libs 
 
 ifeq ($(AUTOCLEAN),1)
 autobuild:: clean export private_export libs program install
@@ -745,8 +745,12 @@ $(PUBLIC_EXPORT_DIR)::
 		$(NSINSTALL) -D $@; \
 	fi
 
-export:: $(EXPORTS) $(PUBLIC_EXPORT_DIR) $(BUILT_SRCS)
-	$(INSTALL) -m 444 $(EXPORTS) $(PUBLIC_EXPORT_DIR)
+export:: $(PUBLIC_EXPORT_DIR) 
+
+export:: $(EXPORTS) 
+	$(INSTALL) -m 444 $^ $(PUBLIC_EXPORT_DIR)
+
+export:: $(BUILT_SRCS)
 endif
 
 # Duplicate export rule for private exports, with different directories
@@ -760,8 +764,10 @@ $(PRIVATE_EXPORT_DIR)::
 		$(NSINSTALL) -D $@; \
 	fi
 
-private_export:: $(PRIVATE_EXPORTS) $(PRIVATE_EXPORT_DIR)
-	$(INSTALL) -m 444 $(PRIVATE_EXPORTS) $(PRIVATE_EXPORT_DIR)
+private_export:: $(PRIVATE_EXPORT_DIR)
+
+private_export:: $(PRIVATE_EXPORTS) 
+	$(INSTALL) -m 444 $^ $(PRIVATE_EXPORT_DIR)
 else
 private_export:: 
 	@echo There are no private exports.;
diff --git a/mozilla/security/dbm/include/Makefile b/mozilla/security/dbm/include/Makefile
index 51b7b62d773..4d34d883291 100644
--- a/mozilla/security/dbm/include/Makefile
+++ b/mozilla/security/dbm/include/Makefile
@@ -72,18 +72,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-CPORLN = ln -s
-ifeq ($(OS_ARCH),WINNT)
-CPORLN = cp
-endif
-
 DBM_SRCS = $(EXPORTS) $(PRIVATE_EXPORTS) watcomfx.h
 
-ALL_TRASH += $(DBM_SRCS)
-
-$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/include/%
-	-$(CPORLN) $< .
-
 export:: $(DBM_SRCS)
 
 libs:: $(DBM_SRCS)
diff --git a/mozilla/security/dbm/include/manifest.mn b/mozilla/security/dbm/include/manifest.mn
index e0f50f6f110..886fedd9886 100644
--- a/mozilla/security/dbm/include/manifest.mn
+++ b/mozilla/security/dbm/include/manifest.mn
@@ -34,6 +34,8 @@
 
 CORE_DEPTH = ../..
 
+VPATH  = $(CORE_DEPTH)/../dbm/include
+
 MODULE = dbm
 
 EXPORTS =	nsres.h   \
diff --git a/mozilla/security/dbm/src/Makefile b/mozilla/security/dbm/src/Makefile
index 997edacc902..10838a723b5 100644
--- a/mozilla/security/dbm/src/Makefile
+++ b/mozilla/security/dbm/src/Makefile
@@ -75,18 +75,8 @@ endif
 #######################################################################
 
 
-CPORLN = ln -s
-ifeq ($(OS_ARCH),WINNT)
-CPORLN = cp
-endif
-
 DBM_SRCS = $(CSRCS)
 
-ALL_TRASH += $(DBM_SRCS)
-
-$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/src/%
-	-$(CPORLN) $< .
-
 export:: $(DBM_SRCS)
 
 libs:: $(DBM_SRCS)
diff --git a/mozilla/security/dbm/src/config.mk b/mozilla/security/dbm/src/config.mk
index 40d862aab84..f6863d966d4 100644
--- a/mozilla/security/dbm/src/config.mk
+++ b/mozilla/security/dbm/src/config.mk
@@ -35,6 +35,7 @@
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) -DNSPR20=1
 
 INCLUDES += -I../include
+INCLUDES += -I$(CORE_DEPTH)/../dbm/include
 
 #
 #  Currently, override TARGETS variable so that only static libraries
diff --git a/mozilla/security/dbm/src/manifest.mn b/mozilla/security/dbm/src/manifest.mn
index 1c2bef2d39d..4b64ffb4b20 100644
--- a/mozilla/security/dbm/src/manifest.mn
+++ b/mozilla/security/dbm/src/manifest.mn
@@ -34,6 +34,8 @@
 
 CORE_DEPTH = ../..
 
+VPATH  = $(CORE_DEPTH)/../dbm/src
+
 MODULE = dbm
 
 CSRCS = db.c	   \
diff --git a/mozilla/security/dbm/tests/Makefile b/mozilla/security/dbm/tests/Makefile
index 3bdb3134b9a..c095d87c72f 100644
--- a/mozilla/security/dbm/tests/Makefile
+++ b/mozilla/security/dbm/tests/Makefile
@@ -34,6 +34,8 @@
 DEPTH		= ../..
 CORE_DEPTH	= ../..
 
+VPATH		= $(CORE_DEPTH)/../dbm/tests
+
 MODULE		= dbm
 
 CSRCS		= lots.c
@@ -43,7 +45,7 @@ PROGRAM		= lots
 include $(DEPTH)/coreconf/config.mk
 
 ifeq ($(OS_ARCH),WINNT)
-DEFINES		+= -DSTDARG
+DEFINES		+= -DSTDARG -DSTDC_HEADERS
 LIBDBM		= ../src/$(PLATFORM)/dbm$(STATIC_LIB_SUFFIX)
 else
 LIBDBM		= ../src/$(PLATFORM)/libdbm$(STATIC_LIB_SUFFIX)
@@ -94,6 +96,7 @@ CFLAGS		+= -DSTDARG
 endif
 
 INCLUDES	+= -I../include
+INCLUDES	+= -I$(CORE_DEPTH)/../dbm/include
 
 LDFLAGS		= $(LDOPTS) $(LIBDBM)
 
@@ -103,24 +106,15 @@ lots.pure: lots
 	purify $(CC) -o lots.pure $(CFLAGS) $(OBJS) $(MYLIBS)
 
 crash: crash.o $(MYLIBS)
-	$(CC) -o crash $(CFLAGS) crash.o $(MYLIBS)
+	$(CC) -o crash $(CFLAGS) $^
 
 crash.pure: crash.o $(MYLIBS)
-	purify $(CC) -o crash.pure $(CFLAGS) crash.o $(MYLIBS)
+	purify $(CC) -o crash.pure $(CFLAGS) $^
 
 
-CPORLN = ln -s
-ifeq ($(OS_ARCH),WINNT)
-CPORLN = cp
-endif
 
 DBM_SRCS = $(CSRCS)
 
-ALL_TRASH += $(DBM_SRCS)
-
-$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/tests/%
-	-$(CPORLN) $< .
-
 export:: $(DBM_SRCS)
 
 libs:: $(DBM_SRCS)