diff --git a/db/mdb/Makefile.in b/db/mdb/Makefile.in
index 70a0496fdd13..8c295ef810fb 100644
--- a/db/mdb/Makefile.in
+++ b/db/mdb/Makefile.in
@@ -15,7 +15,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
@@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # no src yet, or tests or build
-DIRS = src build tests
+# DIRS = src build tests
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
index 448a9f5535d2..1af50a2052fa 100644
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -27,14 +27,12 @@ LIBRARY_NAME=mailnewsbase
 
 EXPORTS = \
 	nsMsgKeyArray.h\
-	nsMsgPtrArray.h \
 	nsMsgGroupRecord.h \
 	nsMsgRFC822Parser.h \
 	nsNewsSet.h \
 	$(NULL)
 
 CPPSRCS = \
-	nsMsgPtrArray.cpp \
 	nsMsgGroupRecord.cpp \
 	nsMsgRFC822Parser.cpp \
 	nsMsgFolder.cpp \
diff --git a/mailnews/db/Makefile.in b/mailnews/db/Makefile.in
index 581bad73887b..cf73a7b481b9 100644
--- a/mailnews/db/Makefile.in
+++ b/mailnews/db/Makefile.in
@@ -15,7 +15,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ..\..
+DEPTH = ../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
diff --git a/mailnews/db/mdb/Makefile.in b/mailnews/db/mdb/Makefile.in
index 70a0496fdd13..8c295ef810fb 100644
--- a/mailnews/db/mdb/Makefile.in
+++ b/mailnews/db/mdb/Makefile.in
@@ -15,7 +15,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
@@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # no src yet, or tests or build
-DIRS = src build tests
+# DIRS = src build tests
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mailnews/db/msgdb/Makefile.in b/mailnews/db/msgdb/Makefile.in
index ba62a4536be4..0b2bde3598c6 100644
--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/Makefile.in
@@ -15,14 +15,14 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../..
+DEPTH = ../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src tests
+DIRS = public src # tests
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mailnews/db/msgdb/public/Makefile.in b/mailnews/db/msgdb/public/Makefile.in
index af5929fd1e04..ec24fc10832f 100644
--- a/mailnews/db/msgdb/public/Makefile.in
+++ b/mailnews/db/msgdb/public/Makefile.in
@@ -15,7 +15,7 @@
 # Copyright (C) 1999 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../../..
+DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
diff --git a/mailnews/db/msgdb/src/Makefile.in b/mailnews/db/msgdb/src/Makefile.in
index 1ea848b084b2..824ae40f8502 100644
--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -15,7 +15,7 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH = ../..
+DEPTH = ../../../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
@@ -36,7 +36,6 @@ CPPSRCS = \
 	nsMailDatabase.cpp\
 	$(NULL)
 
-DIRS = public src tests
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/mailnews/local/Makefile.in b/mailnews/local/Makefile.in
index ba62a4536be4..f2468e1fbb19 100644
--- a/mailnews/local/Makefile.in
+++ b/mailnews/local/Makefile.in
@@ -22,7 +22,7 @@ srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = public src tests
+DIRS = public src # tests
 
 include $(topsrcdir)/config/config.mk