diff --git a/mailnews/base/src/Makefile.in b/mailnews/base/src/Makefile.in
index eafab495323f..c40c897a9779 100644
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -27,12 +27,16 @@ LIBRARY_NAME=mailnewsbase
 NO_SHARED_LIB=1
 
 EXPORTS = \
+	nsUInt32Array.h\
+	nsMsgKeyArray.h\
 	nsMsgPtrArray.h \
 	nsMsgGroupRecord.h \
 	nsMsgRFC822Parser.h \
 	$(NULL)
 
 CPPSRCS = \
+	nsUInt32Array.cpp\
+	nsMsgKeyArray.cpp\
 	nsMsgPtrArray.h \
 	nsMsgGroupRecord.cpp \
 	nsMsgRFC822Parser.cpp \
diff --git a/mailnews/base/src/makefile.win b/mailnews/base/src/makefile.win
index 2680a998eced..38fd2ed0a36b 100644
--- a/mailnews/base/src/makefile.win
+++ b/mailnews/base/src/makefile.win
@@ -26,23 +26,30 @@ REQUIRES=xpcom js nspr
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=    nsMsgRFC822Parser.cpp   \
-			nsMsgFolder.cpp			\
+CPPSRCS=    nsMsgRFC822Parser.cpp  \
+			nsUInt32Array.cpp\
+			nsMsgKeyArray.cpp\
+			nsMsgFolder.cpp \
 			nsMsgPtrArray.cpp		\
 			nsMsgGroupRecord.cpp	\
 			$(NULL)
 
-CPP_OBJS=   .\$(OBJDIR)\nsMsgRFC822Parser.obj   \
-			.\$(OBJDIR)\nsMsgFolder.obj			\
+CPP_OBJS=   .\$(OBJDIR)\nsMsgRFC822Parser.obj  \
+			.\$(OBJDIR)\nsUInt32Array.obj\
+			.\$(OBJDIR)\nsMsgKeyArray.obj\
+			.\$(OBJDIR)\nsMsgFolder.obj \
 			.\$(OBJDIR)\nsMsgPtrArray.obj		\
 			.\$(OBJDIR)\nsMsgGroupRecord.obj	\
 			$(NULL)
 
 
-EXPORTS= nsMsgRFC822Parser.h \
-		 nsMsgGroupRecord.h  \
-		 nsMsgPtrArray.h	 \
-		 $(NULL)
+EXPORTS=	nsMsgRFC822Parser.h \
+			nsUInt32Array.h	\
+			nsMsgKeyArray.h	\
+			 nsMsgGroupRecord.h  \
+			 nsMsgPtrArray.h	 \
+			$(NULL)
+
 
 LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\mailnews -I$(PUBLIC)\raptor -I$(PUBLIC)\rdf