diff --git a/db/mork/src/makefile.win b/db/mork/src/makefile.win
index e0dde4d1ae7..7aaedc169b5 100644
--- a/db/mork/src/makefile.win
+++ b/db/mork/src/makefile.win
@@ -15,130 +15,81 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..\..
+MODULE= msgmork
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=mork
-MODULE= mailnews
-REQUIRES=rdf
+################################################################################
+## exports
 
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
-
-CPPSRCS=    orkinCell.cpp\
-			orkinEnv.cpp\
-			orkinFactory.cpp\
-			orkinHeap.cpp\
-			orkinPortTableCursor.cpp\
-			orkinRow.cpp\
-			orkinRowCellCursor.cpp\
-			orkinStore.cpp\
-			orkinTable.cpp\
-			orkinTableRowCursor.cpp\
-			orkinThumb.cpp\
-			morkArray.cpp\
-			morkAtom.cpp\
-			morkAtomMap.cpp\
-			morkAtomSpace.cpp\
-			morkBlob.cpp\
-			morkBuilder.cpp\
-			morkCell.cpp\
-			morkCellObject.cpp\
-			morkCh.cpp\
-			morkConfig.cpp\
-			morkCursor.cpp \
-			morkDeque.cpp\
-			morkEnv.cpp\
-			morkFactory.cpp\
-			morkFile.cpp\
-			morkHandle.cpp\
-			morkIntMap.cpp\
-			morkMap.cpp\
-			morkNode.cpp\
-			morkNodeMap.cpp\
-			morkObject.cpp\
-			morkParser.cpp\
-			morkPool.cpp\
-			morkRow.cpp\
-			morkRowCellCursor.cpp\
-			morkRowMap.cpp\
-			morkRowObject.cpp\
-			morkRowSpace.cpp\
-			morkSink.cpp\
-			morkSpace.cpp\
-			morkStore.cpp\
-			morkStream.cpp\
-			morkTable.cpp\
-			morkPortTableCursor.cpp\
-			morkTableRowCursor.cpp\
-			morkThumb.cpp\
-			morkWriter.cpp\
-			morkYarn.cpp\
+EXPORTS=			\
 			$(NULL)
 
-CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj\
-			.\$(OBJDIR)\orkinEnv.obj\
-			.\$(OBJDIR)\orkinFactory.obj\
-			.\$(OBJDIR)\orkinHeap.obj\
-			.\$(OBJDIR)\orkinPortTableCursor.obj\
-			.\$(OBJDIR)\orkinRow.obj\
-			.\$(OBJDIR)\orkinRowCellCursor.obj\
-			.\$(OBJDIR)\orkinStore.obj\
-			.\$(OBJDIR)\orkinTable.obj\
-			.\$(OBJDIR)\orkinTableRowCursor.obj\
-			.\$(OBJDIR)\orkinThumb.obj\
-			.\$(OBJDIR)\morkArray.obj  \
-			.\$(OBJDIR)\morkAtom.obj  \
-			.\$(OBJDIR)\morkAtomMap.obj  \
-			.\$(OBJDIR)\morkAtomSpace.obj  \
-			.\$(OBJDIR)\morkBlob.obj\
-			.\$(OBJDIR)\morkBuilder.obj\
-			.\$(OBJDIR)\morkCell.obj\
-			.\$(OBJDIR)\morkCellObject.obj\
-			.\$(OBJDIR)\morkCh.obj\
-			.\$(OBJDIR)\morkConfig.obj\
-			.\$(OBJDIR)\morkCursor.obj\
-			.\$(OBJDIR)\morkDeque.obj\
-			.\$(OBJDIR)\morkEnv.obj\
-			.\$(OBJDIR)\morkFactory.obj\
-			.\$(OBJDIR)\morkFile.obj\
-			.\$(OBJDIR)\morkHandle.obj\
-			.\$(OBJDIR)\morkIntMap.obj\
-			.\$(OBJDIR)\morkMap.obj\
-			.\$(OBJDIR)\morkNode.obj\
-			.\$(OBJDIR)\morkNodeMap.obj\
-			.\$(OBJDIR)\morkObject.obj\
-			.\$(OBJDIR)\morkParser.obj\
-			.\$(OBJDIR)\morkPool.obj\
-			.\$(OBJDIR)\morkPortTableCursor.obj\
-			.\$(OBJDIR)\morkRow.obj\
-			.\$(OBJDIR)\morkRowCellCursor.obj\
-			.\$(OBJDIR)\morkRowMap.obj\
-			.\$(OBJDIR)\morkRowObject.obj\
-			.\$(OBJDIR)\morkRowSpace.obj\
-			.\$(OBJDIR)\morkSink.obj\
-			.\$(OBJDIR)\morkSpace.obj\
-			.\$(OBJDIR)\morkStore.obj\
-			.\$(OBJDIR)\morkStream.obj\
-			.\$(OBJDIR)\morkTable.obj\
-			.\$(OBJDIR)\morkTableRowCursor.obj\
-			.\$(OBJDIR)\morkThumb.obj\
-			.\$(OBJDIR)\morkWriter.obj\
-			.\$(OBJDIR)\morkYarn.obj\
-			$(NULL)
+################################################################################
+## library
 
+LIBRARY_NAME=msgmork_s
 
-EXPORTS=	\
-			$(NULL)
-
-
-
-LCFLAGS = \
+LCFLAGS =		   \
         $(LCFLAGS) \
         $(DEFINES) \
         $(NULL)
 
+CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
+			.\$(OBJDIR)\orkinEnv.obj				\
+			.\$(OBJDIR)\orkinFactory.obj			\
+			.\$(OBJDIR)\orkinHeap.obj				\
+			.\$(OBJDIR)\orkinPortTableCursor.obj	\
+			.\$(OBJDIR)\orkinRow.obj				\
+			.\$(OBJDIR)\orkinRowCellCursor.obj		\
+			.\$(OBJDIR)\orkinStore.obj				\
+			.\$(OBJDIR)\orkinTable.obj				\
+			.\$(OBJDIR)\orkinTableRowCursor.obj		\
+			.\$(OBJDIR)\orkinThumb.obj				\
+			.\$(OBJDIR)\morkArray.obj				\
+			.\$(OBJDIR)\morkAtom.obj				\
+			.\$(OBJDIR)\morkAtomMap.obj				\
+			.\$(OBJDIR)\morkAtomSpace.obj			\
+			.\$(OBJDIR)\morkBlob.obj				\
+			.\$(OBJDIR)\morkBuilder.obj				\
+			.\$(OBJDIR)\morkCell.obj				\
+			.\$(OBJDIR)\morkCellObject.obj			\
+			.\$(OBJDIR)\morkCh.obj					\
+			.\$(OBJDIR)\morkConfig.obj				\
+			.\$(OBJDIR)\morkCursor.obj				\
+			.\$(OBJDIR)\morkDeque.obj				\
+			.\$(OBJDIR)\morkEnv.obj					\
+			.\$(OBJDIR)\morkFactory.obj				\
+			.\$(OBJDIR)\morkFile.obj				\
+			.\$(OBJDIR)\morkHandle.obj				\
+			.\$(OBJDIR)\morkIntMap.obj				\
+			.\$(OBJDIR)\morkMap.obj					\
+			.\$(OBJDIR)\morkNode.obj				\
+			.\$(OBJDIR)\morkNodeMap.obj				\
+			.\$(OBJDIR)\morkObject.obj				\
+			.\$(OBJDIR)\morkParser.obj				\
+			.\$(OBJDIR)\morkPool.obj				\
+			.\$(OBJDIR)\morkPortTableCursor.obj		\
+			.\$(OBJDIR)\morkRow.obj					\
+			.\$(OBJDIR)\morkRowCellCursor.obj		\
+			.\$(OBJDIR)\morkRowMap.obj				\
+			.\$(OBJDIR)\morkRowObject.obj			\
+			.\$(OBJDIR)\morkRowSpace.obj			\
+			.\$(OBJDIR)\morkSink.obj				\
+			.\$(OBJDIR)\morkSpace.obj				\
+			.\$(OBJDIR)\morkStore.obj				\
+			.\$(OBJDIR)\morkStream.obj				\
+			.\$(OBJDIR)\morkTable.obj				\
+			.\$(OBJDIR)\morkTableRowCursor.obj		\
+			.\$(OBJDIR)\morkThumb.obj				\
+			.\$(OBJDIR)\morkWriter.obj				\
+			.\$(OBJDIR)\morkYarn.obj				\
+			$(NULL)
+
+
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/addrbook/build/makefile.win b/mailnews/addrbook/build/makefile.win
index 33231882db9..9d8611f4817 100644
--- a/mailnews/addrbook/build/makefile.win
+++ b/mailnews/addrbook/build/makefile.win
@@ -15,30 +15,33 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
+
+IGNORE_MANIFEST=1
+
 DEPTH=..\..\..
 MODULE=addressbook 
 
-MAKE_OBJ_TYPE=DLL
-DLLNAME=addrbook
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
+################################################################################
+## exports
+
 EXPORTS=								\
 			nsAbBaseCID.h				\
 			$(NULL)
 
-CPPSRCS=							\
-			nsAbFactory.cpp		\
+################################################################################
+## library
 
-CPP_OBJS=\
-	.\$(OBJDIR)\nsAbFactory.obj	\
-	$(NULL)
-# XXX linking in raptor is a heinous crime that will go away once we
-# have a more DOM-based mechanism for constructing elements and
-# hooking in to their changes.
+LIBNAME = .\$(OBJDIR)\addrbook
+DLL = $(LIBNAME).dll
 
-LLIBS=\
+CPP_OBJS=								\
+			.\$(OBJDIR)\nsAbFactory.obj	\
+			$(NULL)
+
+LLIBS=								\
 	$(DIST)\lib\xpcom.lib			\
-	$(DIST)\lib\msgcoreutil.lib		\
-	$(DIST)\lib\addrbook.lib		\
+	$(DIST)\lib\msgbaseutil.lib		\
+	$(DIST)\lib\addrbook_s.lib		\
     $(LIBNSPR)						\
     $(DIST)\lib\plc3.lib			\
     $(DIST)\lib\rdfutil_s.lib		\
@@ -48,8 +51,6 @@ MISCDEP=$(LLIBS)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\components\$(DLLNAME)
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
diff --git a/mailnews/addrbook/public/makefile.win b/mailnews/addrbook/public/makefile.win
index 20e6c1c7ae9..5c7e6440cb0 100644
--- a/mailnews/addrbook/public/makefile.win
+++ b/mailnews/addrbook/public/makefile.win
@@ -16,16 +16,15 @@
 # Reserved.
 
 DEPTH=..\..\..
+MODULE=addressbook
 
-
-XPIDLSRCS =						\
-			.\nsIAbBase.idl		\
-			.\nsIAbListener.idl	\
-			.\nsIAbDirectory.idl	\
-			.\nsIAbCard.idl		\
+XPIDLSRCS =						 \
+			.\nsIAbBase.idl		 \
+			.\nsIAbListener.idl	 \
+			.\nsIAbDirectory.idl \
+			.\nsIAbCard.idl		 \
 			$(NULL)
 
-MODULE=addressbook
 
 include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\config\config.mak>
diff --git a/mailnews/addrbook/src/makefile.win b/mailnews/addrbook/src/makefile.win
index 23a60ffd14d..279e95f4dc2 100644
--- a/mailnews/addrbook/src/makefile.win
+++ b/mailnews/addrbook/src/makefile.win
@@ -15,49 +15,42 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= addressbook
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=addrbook
-MODULE= addressbook
-REQUIRES=xpcom nspr rdf
+################################################################################
+## exports
 
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
+EXPORTS=								\
+			nsDirectoryDataSource.h		\
+			nsAbDirectory.h				\
+			nsCardDataSource.h			\
+			nsAbCard.h					\
+			nsDirPrefs.h				\
+			$(NULL)
 
-CPPSRCS=                     \
-	nsDirectoryDataSource.cpp		\
-	nsAbDirectory.cpp		\
-	nsCardDataSource.cpp	\
-	nsAbCard.cpp	\
-	nsDirPrefs.cpp	\
-	$(NULL)
+################################################################################
+## library
 
+LIBRARY_NAME=addrbook_s
 
-
-CPP_OBJS=                               \
-    .\$(OBJDIR)\nsDirectoryDataSource.obj		\
-    .\$(OBJDIR)\nsAbDirectory.obj		\
-    .\$(OBJDIR)\nsCardDataSource.obj		\
-    .\$(OBJDIR)\nsAbCard.obj		\
-    .\$(OBJDIR)\nsDirPrefs.obj		\
-	$(NULL)
-
-
-EXPORTS=                \
-	nsDirectoryDataSource.h		\
-	nsAbDirectory.h		\
-	nsCardDataSource.h		\
-	nsAbCard.h		\
-	nsDirPrefs.h		\
-	$(NULL)
-
-LCFLAGS = \
+LCFLAGS =		   \
         $(LCFLAGS) \
         $(DEFINES) \
         $(NULL)
 
+CPP_OBJS=										\
+    .\$(OBJDIR)\nsDirectoryDataSource.obj		\
+    .\$(OBJDIR)\nsAbDirectory.obj				\
+    .\$(OBJDIR)\nsCardDataSource.obj			\
+    .\$(OBJDIR)\nsAbCard.obj					\
+    .\$(OBJDIR)\nsDirPrefs.obj					\
+	$(NULL)
+
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/base/build/makefile.win b/mailnews/base/build/makefile.win
index b8829e7251c..8cefe4f2ed9 100644
--- a/mailnews/base/build/makefile.win
+++ b/mailnews/base/build/makefile.win
@@ -13,77 +13,36 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
+IGNORE_MANIFEST=1
+
 DEPTH=..\..\..
+MODULE=msgbase 
 
-#//------------------------------------------------------------------------
-#//
-# New build system where zip dll is build indepenant of java stubs.
-#//
-#//------------------------------------------------------------------------
-MODULE  =mailnews
-REQUIRES=xpcom js
-EXPORTS =               	\
-			  nsMsgBaseCID.h    \
-	          $(NULL)
+LIBNAME = .\$(OBJDIR)\msgbase
+DLL = $(LIBNAME).dll
 
+################################################################################
+## exports
 
-#//------------------------------------------------------------------------
-#// 
-#// Define the files necessary to build the target (ie. OBJS)
-#//
-#//------------------------------------------------------------------------
+EXPORTS =              		\
+			nsMsgBaseCID.h  \
+	        $(NULL)
 
-CPPSRCS=									\
-			nsMsgFactory.cpp				\
-			$(NULL)
-OBJS=										\
+################################################################################
+## library
+
+CPP_OBJS=									\
 			.\$(OBJDIR)\nsMsgFactory.obj    \
 			$(NULL)
 
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
-#//
-#//------------------------------------------------------------------------
-DLLNAME=mailnews
-MAPFILE=mailnews.map
-# DEFFILE=msg.def
-
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
-#// (these must be defined before the common makefiles are included)
-#//
-#//------------------------------------------------------------------------
-
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-#//------------------------------------------------------------------------
-#//
-#// Define any local options for the make tools 
-#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
-#//
-#//------------------------------------------------------------------------
 LCFLAGS=-DNETSCAPE
 
-MSGLIBS=				\
-		$(NULL)
-
 # These are the libraries we need to link with to create the dll
-LLIBS=												\
-			$(MSGLIBS)								\
-			$(DIST)\lib\xpcom.lib					\
-			$(DIST)\lib\plc3.lib					\
-			$(DIST)\lib\msgcoreutil.lib		\
-			$(DIST)\lib\msgcore.lib			\
+LLIBS=										\
+			$(DIST)\lib\xpcom.lib			\
+			$(DIST)\lib\plc3.lib			\
+			$(DIST)\lib\msgbaseutil.lib		\
+			$(DIST)\lib\msgbase_s.lib		\
 			$(DIST)\lib\netlib.lib			\
 			$(DIST)\lib\raptorgfxwin.lib    \
 			$(LIBNSPR)						\
@@ -91,17 +50,9 @@ LLIBS=												\
 
 MISCDEP=$(LLIBS)
 
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
-
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
diff --git a/mailnews/base/public/makefile.win b/mailnews/base/public/makefile.win
index 7502313b18a..4387d9d6968 100644
--- a/mailnews/base/public/makefile.win
+++ b/mailnews/base/public/makefile.win
@@ -16,28 +16,33 @@
 # Reserved.
 
 DEPTH=..\..\..
-XPIDLSRCS =                                       \
-		.\nsIMessenger.idl		\
+MODULE=msgbase
+
+XPIDLSRCS =								\
+		.\nsIMessenger.idl				\
 		.\nsICopyMessageListener.idl	\
-		.\nsIFolder.idl		\
-		.\nsIFolderListener.idl	\
-		.\nsIMessage.idl			\
-		.\nsIMessageView.idl		\
-		.\nsIMsgAccount.idl			\
-		.\nsIMsgAccountManager.idl	\
-		.\nsIMsgFolder.idl	  \
-		.\nsIMsgGroupRecord.idl   \
-		.\nsIMsgHost.idl		  \
+		.\nsIFolder.idl					\
+		.\nsIFolderListener.idl			\
+		.\nsIMessage.idl				\
+		.\nsIMessageView.idl			\
+		.\nsIMsgAccount.idl				\
+		.\nsIMsgAccountManager.idl		\
+		.\nsIMsgFolder.idl				\
+		.\nsIMsgGroupRecord.idl			\
+		.\nsIMsgHost.idl				\
 		.\nsIMsgIdentity.idl			\
-		.\nsIMsgIncomingServer.idl	\
-		.\nsIMsgMailSession.idl	\
-		.\nsIMsgMessageService.idl \
-		.\nsIMsgSignature.idl		\
-		.\nsIMsgThread.idl	\
-		.\nsIMsgVCard.idl			\
-		.\nsIUrlListener.idl	\
-		.\nsIMsgBiffManager.idl	\
-			$(NULL)
+		.\nsIMsgIncomingServer.idl		\
+		.\nsIMsgMailSession.idl			\
+		.\nsIMsgMessageService.idl		\
+		.\nsIMsgSignature.idl			\
+		.\nsIMsgThread.idl				\
+		.\nsIMsgVCard.idl				\
+		.\nsIUrlListener.idl			\
+		.\nsIMsgBiffManager.idl			\
+		$(NULL)
+
+################################################################################
+## exports
 
 EXPORTS =                           \
 			msgCore.h               \
@@ -69,8 +74,6 @@ EXPORTS =                           \
 			nsIMsgBiffManager.idl	\
 			$(NULL)
 
-MODULE=mailnews
-
 include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\config\config.mak>
 
diff --git a/mailnews/base/src/makefile.win b/mailnews/base/src/makefile.win
index 11c5f67208e..daf46e2bb07 100644
--- a/mailnews/base/src/makefile.win
+++ b/mailnews/base/src/makefile.win
@@ -15,86 +15,70 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msgbase
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msgcore
-MODULE= mailnews
-REQUIRES=xpcom js nspr dom
+################################################################################
+## exports
 
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=                     \
-	nsMessenger.cpp			 \
-	nsMessengerBootstrap.cpp	\
-	nsMsgKeyArray.cpp        \
-	nsUrlListenerManager.cpp \
-	nsMsgMailSession.cpp	 \
-	nsCopyMessageStreamListener.cpp \
-	nsMessageViewDataSource.cpp \
-	nsMsgAccountManager.cpp	\
-	nsMsgAccount.cpp		\
-	nsMsgFolderDataSource.cpp \
-	nsMsgMessageDataSource.cpp \
-	nsMsgRDFUtils.cpp \
-	nsMsgRDFDataSource.cpp	\
-	nsMsgAccountDataSource.cpp	\
-	nsMsgAccountManagerDS.cpp	\
-	nsMsgIdentityDataSource.cpp	\
-	nsMsgServerDataSource.cpp	\
-	nsMsgBiffManager.cpp			\
+EXPORTS=						\
+	nsMessenger.h				\
+	nsMessengerBootstrap.h		\
+	nsMsgKeyArray.h				\
+	nsUrlListenerManager.h		\
+	nsMsgMailSession.h			\
+	nsMsgFolderDataSource.h		\
+	nsMsgMessageDataSource.h	\
+	nsMessageViewDataSource.h	\
+    nsMsgAccount.h				\
+    nsMsgAccountManager.h		\
+	nsMsgRDFDataSource.h		\
+	nsMsgAccountDataSource.h	\
+	nsMsgAccountManagerDS.h		\
+	nsMsgIdentityDataSource.h	\
+	nsMsgServerDataSource.h		\
+	nsMsgBiffManager.h			\
 	$(NULL)
 
 
+################################################################################
+## library
 
-CPP_OBJS=                               \
-    .\$(OBJDIR)\nsMessenger.obj			\
+LIBRARY_NAME=msgbase_s
+
+LCFLAGS =		   \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+
+CPP_OBJS=									\
+    .\$(OBJDIR)\nsMessenger.obj				\
     .\$(OBJDIR)\nsMessengerBootstrap.obj	\
-	.\$(OBJDIR)\nsMsgKeyArray.obj       \
-	.\$(OBJDIR)\nsUrlListenerManager.obj \
-	.\$(OBJDIR)\nsMsgMailSession.obj	\
+	.\$(OBJDIR)\nsMsgKeyArray.obj			\
+	.\$(OBJDIR)\nsUrlListenerManager.obj	\
+	.\$(OBJDIR)\nsMsgMailSession.obj		\
 	.\$(OBJDIR)\nsCopyMessageStreamListener.obj	\
 	.\$(OBJDIR)\nsMessageViewDataSource.obj \
-	.\$(OBJDIR)\nsMsgAccountManager.obj	\
-	.\$(OBJDIR)\nsMsgAccount.obj		\
-	.\$(OBJDIR)\nsMsgFolderDataSource.obj \
-	.\$(OBJDIR)\nsMsgMessageDataSource.obj \
-	.\$(OBJDIR)\nsMsgRDFUtils.obj \
-	.\$(OBJDIR)\nsMsgRDFDataSource.obj	\
+	.\$(OBJDIR)\nsMsgAccountManager.obj		\
+	.\$(OBJDIR)\nsMsgAccount.obj			\
+	.\$(OBJDIR)\nsMsgFolderDataSource.obj	\
+	.\$(OBJDIR)\nsMsgMessageDataSource.obj	\
+	.\$(OBJDIR)\nsMsgRDFUtils.obj			\
+	.\$(OBJDIR)\nsMsgRDFDataSource.obj		\
 	.\$(OBJDIR)\nsMsgAccountDataSource.obj	\
 	.\$(OBJDIR)\nsMsgAccountManagerDS.obj	\
 	.\$(OBJDIR)\nsMsgIdentityDataSource.obj	\
 	.\$(OBJDIR)\nsMsgServerDataSource.obj	\
-	.\$(OBJDIR)\nsMsgBiffManager.obj \
+	.\$(OBJDIR)\nsMsgBiffManager.obj		\
 	$(NULL)
 
 
-EXPORTS=                \
-	nsMessenger.h		\
-	nsMessengerBootstrap.h	\
-	nsMsgKeyArray.h     \
-	nsUrlListenerManager.h \
-	nsMsgMailSession.h  \
-	nsMsgFolderDataSource.h \
-	nsMsgMessageDataSource.h \
-	nsMessageViewDataSource.h \
-    nsMsgAccount.h      \
-    nsMsgAccountManager.h   \
-	nsMsgRDFDataSource.h	\
-	nsMsgAccountDataSource.h	\
-	nsMsgAccountManagerDS.h	\
-	nsMsgIdentityDataSource.h	\
-	nsMsgServerDataSource.h	\
-	nsMsgBiffManager.h \
-	$(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
@@ -102,3 +86,4 @@ libs:: $(LIBRARY)
 
 clobber::
 	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+
diff --git a/mailnews/compose/build/makefile.win b/mailnews/compose/build/makefile.win
index f9758bc4879..6ce21fb7503 100644
--- a/mailnews/compose/build/makefile.win
+++ b/mailnews/compose/build/makefile.win
@@ -13,96 +13,45 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
+IGNORE_MANIFEST=1
 
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
 DEPTH=..\..\..
+MODULE=msgcompose 
 
-#//------------------------------------------------------------------------
-#//
-# New build system where zip dll is build indepenant of java stubs.
-#//
-#//------------------------------------------------------------------------
-MODULE  =mailnews
-REQUIRES=xpcom js
-EXPORTS =               	\
+################################################################################
+## exports
+
+EXPORTS =               		\
 			  nsMsgCompCID.h    \
 	          $(NULL)
 
+################################################################################
+## library
 
-DEFINES=-D_IMPL_NS_HTML 
+LIBNAME = .\$(OBJDIR)\msgcompose
+DLL = $(LIBNAME).dll
 
-#//------------------------------------------------------------------------
-#// 
-#// Define the files necessary to build the target (ie. OBJS)
-#//
-#//------------------------------------------------------------------------
-
-CPPSRCS=									\
-			nsMsgCompFactory.cpp			\
-			$(NULL)
-OBJS=										\
-			.\$(OBJDIR)\nsMsgCompFactory.obj\
+OBJS=										 \
+			.\$(OBJDIR)\nsMsgCompFactory.obj \
 			$(NULL)
 
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
-#//
-#//------------------------------------------------------------------------
-DLLNAME=msgcompose
-MAPFILE=msgcompose.map
-# DEFFILE=msg.def
-
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
-#// (these must be defined before the common makefiles are included)
-#//
-#//------------------------------------------------------------------------
-
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-#//------------------------------------------------------------------------
-#//
-#// Define any local options for the make tools 
-#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
-#//
-#//------------------------------------------------------------------------
-LCFLAGS=-DNETSCAPE
-
-# These are the libraries we need to link with to create the dll
-LLIBS=										\
-			$(LLIBS)						\
-			$(DIST)\lib\xpcom.lib			\
-			$(DIST)\lib\plc3.lib			\
+LLIBS=											\
+			$(LLIBS)							\
+			$(DIST)\lib\xpcom.lib				\
+			$(DIST)\lib\plc3.lib				\
 			$(DIST)\lib\js32$(VERSION_NUMBER).lib	\
-			$(DIST)\lib\msgcompose.lib		\
-			$(DIST)\lib\appcores.lib		\
-			$(DIST)\lib\netlib.lib			\
-			$(DIST)\lib\msgcoreutil.lib		\
-			$(LIBNSPR)						\
+			$(DIST)\lib\msgcompose_s.lib		\
+			$(DIST)\lib\appcores.lib			\
+			$(DIST)\lib\netlib.lib				\
+			$(DIST)\lib\msgbaseutil.lib			\
+			$(LIBNSPR)							\
 			$(NULL)
 
 MISCDEP=$(LLIBS)
 
-
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
diff --git a/mailnews/compose/public/makefile.win b/mailnews/compose/public/makefile.win
index 33ff653a9b3..58ba1ae27be 100644
--- a/mailnews/compose/public/makefile.win
+++ b/mailnews/compose/public/makefile.win
@@ -15,13 +15,18 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE=msgcompose
+
 IDLSRCS =							\
 			nsIMsgCompose.idl		\
 			$(NULL)
 
+################################################################################
+## exports
+
 EXPORTS =	 						\
 			nsIMsgCompose.h			\
 			nsMsgComposeFact.h		\
@@ -36,7 +41,5 @@ EXPORTS =	 						\
 			nsIComposer.h			\
 			$(NULL)
 
-MODULE=mailnews
-
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mailnews/compose/src/makefile.win b/mailnews/compose/src/makefile.win
index 3d5bc3078fe..5d71970590a 100644
--- a/mailnews/compose/src/makefile.win
+++ b/mailnews/compose/src/makefile.win
@@ -15,47 +15,15 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msgcompose
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msgcompose
-MODULE= mailnews
-REQUIRES=xpcom js nspr netlib mailnews
-
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
-
-CPPSRCS=    nsMsgCompFields.cpp \
-            nsMsgCompose.cpp    \
-            nsSmtpUrl.cpp		\
-			nsSmtpProtocol.cpp	\
-            MsgCompGlue.cpp     \
-			nsMsgSend.cpp		\
-			nsMsgSendPart.cpp	\
-			nsSmtpService.cpp	\
-			nsJSComposeAppCore.cpp	\
-			nsComposeAppCore.cpp	\
-			nsComposer.cpp \
-			nsComposerNameSet.cpp \
-			nsMsgCompPrefs.cpp \
-            $(NULL)
-
-CPP_OBJS=   .\$(OBJDIR)\nsMsgCompFields.obj \
-            .\$(OBJDIR)\nsMsgCompose.obj    \
-            .\$(OBJDIR)\nsSmtpUrl.obj		\
-            .\$(OBJDIR)\MsgCompGlue.obj     \
-			.\$(OBJDIR)\nsSmtpProtocol.obj	\
-			.\$(OBJDIR)\nsMsgSend.obj		\
-			.\$(OBJDIR)\nsMsgSendPart.obj	\
-			.\$(OBJDIR)\nsSmtpService.obj	\
-			.\$(OBJDIR)\nsJSComposeAppCore.obj	\
-			.\$(OBJDIR)\nsComposeAppCore.obj	\
-			.\$(OBJDIR)\nsComposer.obj	\
-			.\$(OBJDIR)\nsComposerNameSet.obj	\
-			.\$(OBJDIR)\nsMsgCompPrefs.obj \
-            $(NULL)
-
+################################################################################
+## exports
 
 EXPORTS=    nsSmtpUrl.h             \
             nsSmtpProtocol.h        \
@@ -65,16 +33,36 @@ EXPORTS=    nsSmtpUrl.h             \
 			nsMsgCompPrefs.h		\
             $(NULL)
 
+################################################################################
+## library
 
-LCFLAGS = \
+LIBRARY_NAME=msgcompose_s
+
+LCFLAGS =		   \
         $(LCFLAGS) \
         $(DEFINES) \
         $(NULL)
 
+CPP_OBJS=   .\$(OBJDIR)\nsMsgCompFields.obj		\
+            .\$(OBJDIR)\nsMsgCompose.obj		\
+            .\$(OBJDIR)\nsSmtpUrl.obj			\
+            .\$(OBJDIR)\MsgCompGlue.obj			\
+			.\$(OBJDIR)\nsSmtpProtocol.obj		\
+			.\$(OBJDIR)\nsMsgSend.obj			\
+			.\$(OBJDIR)\nsMsgSendPart.obj		\
+			.\$(OBJDIR)\nsSmtpService.obj		\
+			.\$(OBJDIR)\nsJSComposeAppCore.obj	\
+			.\$(OBJDIR)\nsComposeAppCore.obj	\
+			.\$(OBJDIR)\nsComposer.obj			\
+			.\$(OBJDIR)\nsComposerNameSet.obj	\
+			.\$(OBJDIR)\nsMsgCompPrefs.obj		\
+            $(NULL)
+
+
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
-    $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
 clobber::
-    rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
diff --git a/mailnews/db/mork/src/makefile.win b/mailnews/db/mork/src/makefile.win
index e0dde4d1ae7..7aaedc169b5 100644
--- a/mailnews/db/mork/src/makefile.win
+++ b/mailnews/db/mork/src/makefile.win
@@ -15,130 +15,81 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..\..
+MODULE= msgmork
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=mork
-MODULE= mailnews
-REQUIRES=rdf
+################################################################################
+## exports
 
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
-
-CPPSRCS=    orkinCell.cpp\
-			orkinEnv.cpp\
-			orkinFactory.cpp\
-			orkinHeap.cpp\
-			orkinPortTableCursor.cpp\
-			orkinRow.cpp\
-			orkinRowCellCursor.cpp\
-			orkinStore.cpp\
-			orkinTable.cpp\
-			orkinTableRowCursor.cpp\
-			orkinThumb.cpp\
-			morkArray.cpp\
-			morkAtom.cpp\
-			morkAtomMap.cpp\
-			morkAtomSpace.cpp\
-			morkBlob.cpp\
-			morkBuilder.cpp\
-			morkCell.cpp\
-			morkCellObject.cpp\
-			morkCh.cpp\
-			morkConfig.cpp\
-			morkCursor.cpp \
-			morkDeque.cpp\
-			morkEnv.cpp\
-			morkFactory.cpp\
-			morkFile.cpp\
-			morkHandle.cpp\
-			morkIntMap.cpp\
-			morkMap.cpp\
-			morkNode.cpp\
-			morkNodeMap.cpp\
-			morkObject.cpp\
-			morkParser.cpp\
-			morkPool.cpp\
-			morkRow.cpp\
-			morkRowCellCursor.cpp\
-			morkRowMap.cpp\
-			morkRowObject.cpp\
-			morkRowSpace.cpp\
-			morkSink.cpp\
-			morkSpace.cpp\
-			morkStore.cpp\
-			morkStream.cpp\
-			morkTable.cpp\
-			morkPortTableCursor.cpp\
-			morkTableRowCursor.cpp\
-			morkThumb.cpp\
-			morkWriter.cpp\
-			morkYarn.cpp\
+EXPORTS=			\
 			$(NULL)
 
-CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj\
-			.\$(OBJDIR)\orkinEnv.obj\
-			.\$(OBJDIR)\orkinFactory.obj\
-			.\$(OBJDIR)\orkinHeap.obj\
-			.\$(OBJDIR)\orkinPortTableCursor.obj\
-			.\$(OBJDIR)\orkinRow.obj\
-			.\$(OBJDIR)\orkinRowCellCursor.obj\
-			.\$(OBJDIR)\orkinStore.obj\
-			.\$(OBJDIR)\orkinTable.obj\
-			.\$(OBJDIR)\orkinTableRowCursor.obj\
-			.\$(OBJDIR)\orkinThumb.obj\
-			.\$(OBJDIR)\morkArray.obj  \
-			.\$(OBJDIR)\morkAtom.obj  \
-			.\$(OBJDIR)\morkAtomMap.obj  \
-			.\$(OBJDIR)\morkAtomSpace.obj  \
-			.\$(OBJDIR)\morkBlob.obj\
-			.\$(OBJDIR)\morkBuilder.obj\
-			.\$(OBJDIR)\morkCell.obj\
-			.\$(OBJDIR)\morkCellObject.obj\
-			.\$(OBJDIR)\morkCh.obj\
-			.\$(OBJDIR)\morkConfig.obj\
-			.\$(OBJDIR)\morkCursor.obj\
-			.\$(OBJDIR)\morkDeque.obj\
-			.\$(OBJDIR)\morkEnv.obj\
-			.\$(OBJDIR)\morkFactory.obj\
-			.\$(OBJDIR)\morkFile.obj\
-			.\$(OBJDIR)\morkHandle.obj\
-			.\$(OBJDIR)\morkIntMap.obj\
-			.\$(OBJDIR)\morkMap.obj\
-			.\$(OBJDIR)\morkNode.obj\
-			.\$(OBJDIR)\morkNodeMap.obj\
-			.\$(OBJDIR)\morkObject.obj\
-			.\$(OBJDIR)\morkParser.obj\
-			.\$(OBJDIR)\morkPool.obj\
-			.\$(OBJDIR)\morkPortTableCursor.obj\
-			.\$(OBJDIR)\morkRow.obj\
-			.\$(OBJDIR)\morkRowCellCursor.obj\
-			.\$(OBJDIR)\morkRowMap.obj\
-			.\$(OBJDIR)\morkRowObject.obj\
-			.\$(OBJDIR)\morkRowSpace.obj\
-			.\$(OBJDIR)\morkSink.obj\
-			.\$(OBJDIR)\morkSpace.obj\
-			.\$(OBJDIR)\morkStore.obj\
-			.\$(OBJDIR)\morkStream.obj\
-			.\$(OBJDIR)\morkTable.obj\
-			.\$(OBJDIR)\morkTableRowCursor.obj\
-			.\$(OBJDIR)\morkThumb.obj\
-			.\$(OBJDIR)\morkWriter.obj\
-			.\$(OBJDIR)\morkYarn.obj\
-			$(NULL)
+################################################################################
+## library
 
+LIBRARY_NAME=msgmork_s
 
-EXPORTS=	\
-			$(NULL)
-
-
-
-LCFLAGS = \
+LCFLAGS =		   \
         $(LCFLAGS) \
         $(DEFINES) \
         $(NULL)
 
+CPP_OBJS=   .\$(OBJDIR)\orkinCell.obj				\
+			.\$(OBJDIR)\orkinEnv.obj				\
+			.\$(OBJDIR)\orkinFactory.obj			\
+			.\$(OBJDIR)\orkinHeap.obj				\
+			.\$(OBJDIR)\orkinPortTableCursor.obj	\
+			.\$(OBJDIR)\orkinRow.obj				\
+			.\$(OBJDIR)\orkinRowCellCursor.obj		\
+			.\$(OBJDIR)\orkinStore.obj				\
+			.\$(OBJDIR)\orkinTable.obj				\
+			.\$(OBJDIR)\orkinTableRowCursor.obj		\
+			.\$(OBJDIR)\orkinThumb.obj				\
+			.\$(OBJDIR)\morkArray.obj				\
+			.\$(OBJDIR)\morkAtom.obj				\
+			.\$(OBJDIR)\morkAtomMap.obj				\
+			.\$(OBJDIR)\morkAtomSpace.obj			\
+			.\$(OBJDIR)\morkBlob.obj				\
+			.\$(OBJDIR)\morkBuilder.obj				\
+			.\$(OBJDIR)\morkCell.obj				\
+			.\$(OBJDIR)\morkCellObject.obj			\
+			.\$(OBJDIR)\morkCh.obj					\
+			.\$(OBJDIR)\morkConfig.obj				\
+			.\$(OBJDIR)\morkCursor.obj				\
+			.\$(OBJDIR)\morkDeque.obj				\
+			.\$(OBJDIR)\morkEnv.obj					\
+			.\$(OBJDIR)\morkFactory.obj				\
+			.\$(OBJDIR)\morkFile.obj				\
+			.\$(OBJDIR)\morkHandle.obj				\
+			.\$(OBJDIR)\morkIntMap.obj				\
+			.\$(OBJDIR)\morkMap.obj					\
+			.\$(OBJDIR)\morkNode.obj				\
+			.\$(OBJDIR)\morkNodeMap.obj				\
+			.\$(OBJDIR)\morkObject.obj				\
+			.\$(OBJDIR)\morkParser.obj				\
+			.\$(OBJDIR)\morkPool.obj				\
+			.\$(OBJDIR)\morkPortTableCursor.obj		\
+			.\$(OBJDIR)\morkRow.obj					\
+			.\$(OBJDIR)\morkRowCellCursor.obj		\
+			.\$(OBJDIR)\morkRowMap.obj				\
+			.\$(OBJDIR)\morkRowObject.obj			\
+			.\$(OBJDIR)\morkRowSpace.obj			\
+			.\$(OBJDIR)\morkSink.obj				\
+			.\$(OBJDIR)\morkSpace.obj				\
+			.\$(OBJDIR)\morkStore.obj				\
+			.\$(OBJDIR)\morkStream.obj				\
+			.\$(OBJDIR)\morkTable.obj				\
+			.\$(OBJDIR)\morkTableRowCursor.obj		\
+			.\$(OBJDIR)\morkThumb.obj				\
+			.\$(OBJDIR)\morkWriter.obj				\
+			.\$(OBJDIR)\morkYarn.obj				\
+			$(NULL)
+
+
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/db/msgdb/build/makefile.win b/mailnews/db/msgdb/build/makefile.win
index d83560ff750..a21f42f99f2 100644
--- a/mailnews/db/msgdb/build/makefile.win
+++ b/mailnews/db/msgdb/build/makefile.win
@@ -15,47 +15,42 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
+IGNORE_MANIFEST=1
+
 DEPTH=..\..\..\..
-MODULE=mailnews 
+MODULE=msgdb 
 
-MAKE_OBJ_TYPE=DLL
-DLLNAME=msgdb
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
+################################################################################
+## exports
 
-EXPORTS=								\
-			nsMsgDBCID.h				\
+EXPORTS=					\
+			nsMsgDBCID.h	\
 			$(NULL)
 
-CPPSRCS=								\
-			nsMsgDBFactory.cpp		\
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\msgdb
+DLL = $(LIBNAME).dll
+
+CPP_OBJS=									\
+			.\$(OBJDIR)\nsMsgDBFactory.obj	\
 			$(NULL)
 
-CPP_OBJS=\
-	.\$(OBJDIR)\nsMsgDBFactory.obj	\
-	$(NULL)
-
-# XXX linking in raptor is a heinous crime that will go away once we
-# have a more DOM-based mechanism for constructing elements and
-# hooking in to their changes.
-
-LLIBS=\
-	$(DIST)\lib\xpcom.lib     \
-	$(DIST)\lib\msgcoreutil.lib    \
-	$(DIST)\lib\msgdb.lib    \
-	$(DIST)\lib\mork.lib    \
-    $(LIBNSPR)		            \
-    $(DIST)\lib\plc3.lib    \
+LLIBS=								\
+	$(DIST)\lib\xpcom.lib			\
+	$(DIST)\lib\msgbaseutil.lib		\
+	$(DIST)\lib\msgdb_s.lib			\
+	$(DIST)\lib\msgmork_s.lib		\
+    $(LIBNSPR)						\
+    $(DIST)\lib\plc3.lib			\
 	$(NULL)
 
 MISCDEP=$(LLIBS)
 
-# XXX Note dependencies on implementation dirs for factory methods.
-
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
diff --git a/mailnews/db/msgdb/public/makefile.win b/mailnews/db/msgdb/public/makefile.win
index b45bc4325d7..4b3a98197b7 100644
--- a/mailnews/db/msgdb/public/makefile.win
+++ b/mailnews/db/msgdb/public/makefile.win
@@ -15,28 +15,30 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..\..
-
 IGNORE_MANIFEST=1
 
-IDLSRCS =							\
+DEPTH=..\..\..\..
+MODULE=msgdb
+
+IDLSRCS =				\
 			$(NULL)
 
+################################################################################
+## exports
+
 EXPORTS =	 						\
-			nsIMsgDatabase.h    \
-			nsMsgDatabase.h    \
-			nsMailDatabase.h				\
-			nsImapMailDatabase.h				\
-			nsNewsDatabase.h				\
+			nsIMsgDatabase.h		\
+			nsMsgDatabase.h			\
+			nsMailDatabase.h		\
+			nsImapMailDatabase.h	\
+			nsNewsDatabase.h		\
 			nsDBFolderInfo.h	    \
-			nsMsgHdr.h	    \
-			nsIDBChangeListener.h	    \
-			nsIDBFolderInfo.h \
-			nsIMsgHdr.h	    \
-			nsMsgThread.h \
+			nsMsgHdr.h				\
+			nsIDBChangeListener.h	\
+			nsIDBFolderInfo.h		\
+			nsIMsgHdr.h				\
+			nsMsgThread.h			\
 			$(NULL)
 
-MODULE=mailnews
-
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/db/msgdb/src/makefile.win b/mailnews/db/msgdb/src/makefile.win
index 5b77f305d7c..9aaab8bafe8 100644
--- a/mailnews/db/msgdb/src/makefile.win
+++ b/mailnews/db/msgdb/src/makefile.win
@@ -15,44 +15,38 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..\..
+MODULE= msgdb
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msgdb
-MODULE= mailnews
-REQUIRES=rdf mime
+################################################################################
+## exports
 
-DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
-
-CPPSRCS=    nsMsgDatabase.cpp\
-			nsDBFolderInfo.cpp\
-			nsMailDatabase.cpp\
-			nsImapMailDatabase.cpp\
-			nsNewsDatabase.cpp\
-			nsMsgHdr.cpp\
-			nsMsgThread.cpp\
+EXPORTS=				\
 			$(NULL)
 
-CPP_OBJS=   .\$(OBJDIR)\nsMsgDatabase.obj  \
-			.\$(OBJDIR)\nsDBFolderInfo.obj\
-			.\$(OBJDIR)\nsMailDatabase.obj\
-			.\$(OBJDIR)\nsImapMailDatabase.obj\
-			.\$(OBJDIR)\nsNewsDatabase.obj\
-			.\$(OBJDIR)\nsMsgHdr.obj\
-			.\$(OBJDIR)\nsMsgThread.obj\
-			$(NULL)
+################################################################################
+## library
 
+LIBRARY_NAME=msgdb_s
 
-EXPORTS=	\
-			$(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
+LCFLAGS =			\
+        $(LCFLAGS)	\
+        $(DEFINES)	\
         $(NULL)
 
+CPP_OBJS=   .\$(OBJDIR)\nsMsgDatabase.obj		\
+			.\$(OBJDIR)\nsDBFolderInfo.obj		\
+			.\$(OBJDIR)\nsMailDatabase.obj		\
+			.\$(OBJDIR)\nsImapMailDatabase.obj	\
+			.\$(OBJDIR)\nsNewsDatabase.obj		\
+			.\$(OBJDIR)\nsMsgHdr.obj			\
+			.\$(OBJDIR)\nsMsgThread.obj			\
+			$(NULL)
+
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/imap/build/makefile.win b/mailnews/imap/build/makefile.win
index ebde2faf675..edb3d04532d 100644
--- a/mailnews/imap/build/makefile.win
+++ b/mailnews/imap/build/makefile.win
@@ -15,31 +15,31 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
-MODULE=mailnews 
+IGNORE_MANIFEST=1
 
-MAKE_OBJ_TYPE=DLL
-DLLNAME=msgimap
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
+DEPTH=..\..\..
+MODULE=msgimap 
+
+################################################################################
+## exports
 
 EXPORTS=							\
 			$(NULL)
 
-CPPSRCS=							\
-			nsImapFactory.cpp		\
+################################################################################
+## library
 
-CPP_OBJS=\
-	.\$(OBJDIR)\nsImapFactory.obj	\
-	$(NULL)
+LIBNAME = .\$(OBJDIR)\msgimap
+DLL = $(LIBNAME).dll
 
-# XXX linking in raptor is a heinous crime that will go away once we
-# have a more DOM-based mechanism for constructing elements and
-# hooking in to their changes.
+CPP_OBJS=									\
+			.\$(OBJDIR)\nsImapFactory.obj	\
+			$(NULL)
 
-LLIBS=\
+LLIBS=								\
 	$(DIST)\lib\xpcom.lib			\
-	$(DIST)\lib\msgcoreutil.lib		\
-	$(DIST)\lib\msgimap.lib			\
+	$(DIST)\lib\msgbaseutil.lib		\
+	$(DIST)\lib\msgimap_s.lib		\
     $(DIST)\lib\plc3.lib			\
     $(DIST)\lib\rdfutil_s.lib		\
     $(LIBNSPR)						\
@@ -49,9 +49,8 @@ MISCDEP=$(LLIBS)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
 
diff --git a/mailnews/imap/public/makefile.win b/mailnews/imap/public/makefile.win
index c4f5893339b..5d5db7d7721 100644
--- a/mailnews/imap/public/makefile.win
+++ b/mailnews/imap/public/makefile.win
@@ -15,24 +15,29 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msgimap
+
+################################################################################
+## exports
+
 EXPORTS =								\
 			nsIImapUrl.h				\
 			nsIImapProtocol.h			\
 			nsIImapLog.h				\
 			nsIIMAPHostSessionList.h	\
-			nsIImapMailfolderSink.h			\
-			nsIImapMessageSink.h			\
-			nsIImapExtensionSink.h			\
-			nsIImapMiscellaneousSink.h		\
+			nsIImapMailfolderSink.h		\
+			nsIImapMessageSink.h		\
+			nsIImapExtensionSink.h		\
+			nsIImapMiscellaneousSink.h	\
 			nsIImapService.h			\
 			nsIImapIncomingServer.h		\
 			nsIImapFlagAndUidState.h	\
 			$(NULL)
 
-MODULE= mailnews
+
 
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/imap/src/makefile.win b/mailnews/imap/src/makefile.win
index 2062011455a..c83649f993f 100644
--- a/mailnews/imap/src/makefile.win
+++ b/mailnews/imap/src/makefile.win
@@ -15,31 +15,41 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msgimap
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msgimap
-MODULE= mailnews
-REQUIRES=xpcom js nspr netlib
+################################################################################
+## exports
 
-CPPSRCS=    nsImapUrl.cpp								\
-			nsImapProtocol.cpp							\
-			nsImapProxyEvent.cpp						\
-			nsIMAPHostSessionList.cpp					\
-			nsIMAPGenericParser.cpp						\
-			nsIMAPBodyShell.cpp							\
-			nsIMAPNamespace.cpp							\
-			nsImapSearchResults.cpp						\
-			nsImapFlagAndUidState.cpp					\
-			nsImapServerResponseParser.cpp				\
-			nsImapService.cpp							\
-			nsImapIncomingServer.cpp					\
-			nsImapMailFolder.cpp						\
-			nsImapMessage.cpp							\
-			nsImapUtils.cpp								\
-			$(NULL)
+EXPORTS=	nsImapUrl.h									\
+			nsImapProtocol.h							\
+			nsImapCore.h								\
+			nsImapFlagAndUidState.h						\
+			nsImapProxyEvent.h							\
+			nsImapHostSessionList.h						\
+			nsImapService.h								\
+			nsImapServerResponseParser.h				\
+			nsIMAPGenericParser.h						\
+			nsImapSearchResults.h						\
+			nsImapIncomingServer.h						\
+			nsIMAPNamespace.h							\
+			nsImapMailFolder.h							\
+			nsImapMessage.h								\
+            $(NULL)
+
+################################################################################
+## library
+
+LIBRARY_NAME=msgimap_s
+
+LCFLAGS =		   \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
 
 CPP_OBJS=   .\$(OBJDIR)\nsImapUrl.obj					\
 			.\$(OBJDIR)\nsImapProtocol.obj				\
@@ -59,27 +69,6 @@ CPP_OBJS=   .\$(OBJDIR)\nsImapUrl.obj					\
 			$(NULL)
 
 
-EXPORTS=	nsImapUrl.h									\
-			nsImapProtocol.h							\
-			nsImapCore.h								\
-			nsImapFlagAndUidState.h						\
-			nsImapProxyEvent.h							\
-			nsImapHostSessionList.h						\
-			nsImapService.h								\
-			nsImapServerResponseParser.h				\
-			nsIMAPGenericParser.h						\
-			nsImapSearchResults.h						\
-			nsImapIncomingServer.h						\
-			nsIMAPNamespace.h							\
-			nsImapMailFolder.h							\
-			nsImapMessage.h								\
-            $(NULL)
-
-LCFLAGS =		   \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/imap/tests/harness/makefile.win b/mailnews/imap/tests/harness/makefile.win
index a40740505e6..724040c9014 100644
--- a/mailnews/imap/tests/harness/makefile.win
+++ b/mailnews/imap/tests/harness/makefile.win
@@ -69,8 +69,8 @@ LCFLAGS=-DNETSCAPE
 LLIBS=	 $(LLIBS) ole32.lib	\
 		$(LIBNSPR)\
  		$(DIST)\lib\plc3.lib                   \
-		$(DIST)\lib\msgcoreutil.lib	\
-		$(DIST)\lib\msglocal.lib	\
+		$(DIST)\lib\msgbaseutil.lib	\
+		$(DIST)\lib\msglocal_s.lib	\
  		$(DIST)\lib\xpcom.lib
 	
 
diff --git a/mailnews/local/build/makefile.win b/mailnews/local/build/makefile.win
index a29d0c945ee..cb05824891d 100644
--- a/mailnews/local/build/makefile.win
+++ b/mailnews/local/build/makefile.win
@@ -15,44 +15,42 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
-MODULE=mailnews 
+IGNORE_MANIFEST=1
 
-MAKE_OBJ_TYPE=DLL
-DLLNAME=msglocal
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
+DEPTH=..\..\..
+MODULE=msglocal 
+
+################################################################################
+## exports
 
 EXPORTS=								\
 			nsMsgLocalCID.h				\
 			$(NULL)
 
-CPPSRCS=								\
-			nsMsgLocalFactory.cpp		\
+################################################################################
+## library
+
+LIBNAME = .\$(OBJDIR)\msglocal
+DLL = $(LIBNAME).dll
 
 CPP_OBJS=\
 	.\$(OBJDIR)\nsMsgLocalFactory.obj	\
 	$(NULL)
 
-# XXX linking in raptor is a heinous crime that will go away once we
-# have a more DOM-based mechanism for constructing elements and
-# hooking in to their changes.
-
 LLIBS=\
 	$(DIST)\lib\xpcom.lib			\
-	$(DIST)\lib\msgcoreutil.lib		\
-	$(DIST)\lib\msglocal.lib		\
     $(LIBNSPR)						\
     $(DIST)\lib\plc3.lib			\
     $(DIST)\lib\rdfutil_s.lib		\
+	$(DIST)\lib\msgbaseutil.lib		\
+	$(DIST)\lib\msglocal_s.lib		\
 	$(NULL)
 
 MISCDEP=$(LLIBS)
 
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
diff --git a/mailnews/local/public/makefile.win b/mailnews/local/public/makefile.win
index 53b548eda90..5333e28ce89 100644
--- a/mailnews/local/public/makefile.win
+++ b/mailnews/local/public/makefile.win
@@ -15,20 +15,23 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
-EXPORTS = \
-	nsIPop3Sink.h				\
-	nsIPop3URL.h				\
-	nsIMailboxUrl.h				\
-	nsIMailboxService.h			\
-	nsIPop3Service.h			\
-	nsIPop3IncomingServer.h		\
-	nsIMsgParseMailMsgState.h	\
-	$(NULL)
+DEPTH=..\..\..
+MODULE=msglocal
 
-MODULE=mailnews
+################################################################################
+## exports
+
+EXPORTS =								\
+			nsIPop3Sink.h				\
+			nsIPop3URL.h				\
+			nsIMailboxUrl.h				\
+			nsIMailboxService.h			\
+			nsIPop3Service.h			\
+			nsIPop3IncomingServer.h		\
+			nsIMsgParseMailMsgState.h	\
+			$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
 
diff --git a/mailnews/local/src/makefile.win b/mailnews/local/src/makefile.win
index c6472445e88..d943739e727 100644
--- a/mailnews/local/src/makefile.win
+++ b/mailnews/local/src/makefile.win
@@ -15,34 +15,40 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msglocal
+
 include <$(DEPTH)\config\config.mak>
 
-LIBRARY_NAME=msglocal
+################################################################################
+## exports
 
-MODULE= mailnews
-
-REQUIRES=xpcom nspr rdf
-
-DEFINES=-DWIN32_LEAN_AND_MEAN
-
-CPPSRCS=                        \
-	nsPop3Protocol.cpp			\
-	nsPop3URL.cpp				\
-	nsPop3Sink.cpp				\
-	nsMailboxUrl.cpp			\
-	nsParseMailbox.cpp			\
-	nsMailboxProtocol.cpp		\
-	nsMailboxService.cpp		\
-	nsPop3Service.cpp			\
-	nsLocalMailFolder.cpp		\
-	nsPop3IncomingServer.cpp	\
-	nsLocalMessage.cpp			\
-	nsLocalUtils.cpp			\
+EXPORTS=				\
+	nsPop3Protocol.h	\
+	nsPop3URL.h			\
+	nsPop3Sink.h		\
+	nsMailboxUrl.h		\
+	nsParseMailbox.h	\
+	nsMailboxProtocol.h	\
+	nsMailboxService.h	\
+	nsPop3Service.h		\
+	nsPop3IncomingServer.h	\
+	nsLocalMessage.h	\
+	nsLocalMailFolder.h \
 	$(NULL)
 
+################################################################################
+## library
+
+LIBRARY_NAME=msglocal_s
+
+LCFLAGS =		   \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
 CPP_OBJS=									\
 	.\$(OBJDIR)\nsPop3Protocol.obj			\
 	.\$(OBJDIR)\nsPop3URL.obj				\
@@ -58,32 +64,12 @@ CPP_OBJS=									\
 	.\$(OBJDIR)\nsLocalUtils.obj			\
 	$(NULL)
 
-
-EXPORTS=				\
-	nsPop3Protocol.h	\
-	nsPop3URL.h			\
-	nsPop3Sink.h		\
-	nsMailboxUrl.h		\
-	nsParseMailbox.h	\
-	nsMailboxProtocol.h	\
-	nsMailboxService.h	\
-	nsPop3Service.h		\
-	nsPop3IncomingServer.h	\
-	nsLocalMessage.h \
-	nsLocalMailFolder.h \
-	$(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
-clobber::
-	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
-
 libs:: $(LIBRARY)
 	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
 
+clobber::
+	rm -f $(DIST)\lib\$(LIBRARY_NAME).lib
+
 
diff --git a/mailnews/local/tests/pop3/makefile.win b/mailnews/local/tests/pop3/makefile.win
index 570d090fd75..cebbf301162 100644
--- a/mailnews/local/tests/pop3/makefile.win
+++ b/mailnews/local/tests/pop3/makefile.win
@@ -34,7 +34,7 @@ MYLIBS=							\
  $(DIST)\lib\netlib.lib			\
  $(DIST)\lib\plc3.lib			\
  $(DIST)\lib\rdf.lib			\
- $(DIST)\lib\msgcoreutil.lib	\
+ $(DIST)\lib\msgbaseutil.lib	\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
diff --git a/mailnews/news/build/makefile.win b/mailnews/news/build/makefile.win
index 3413cc40d98..bddade01590 100644
--- a/mailnews/news/build/makefile.win
+++ b/mailnews/news/build/makefile.win
@@ -13,95 +13,45 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-#//------------------------------------------------------------------------
-#//
-#// Specify the depth of the current directory relative to the
-#// root of NS
-#//
-#//------------------------------------------------------------------------
-DEPTH=..\..\..
+IGNORE_MANIFEST=1
 
-#//------------------------------------------------------------------------
-#//
-# New build system where zip dll is build indepenant of java stubs.
-#//
-#//------------------------------------------------------------------------
-MODULE  =news
-REQUIRES=xpcom js
-EXPORTS =      \
+DEPTH=..\..\..
+MODULE=msgnews 
+
+################################################################################
+## exports
+
+EXPORTS =			   \
 		nsMsgNewsCID.h \
 		$(NULL)
 
+################################################################################
+## library
 
-#//------------------------------------------------------------------------
-#// 
-#// Define the files necessary to build the target (ie. OBJS)
-#//
-#//------------------------------------------------------------------------
+LIBNAME = .\$(OBJDIR)\msgnews
+DLL = $(LIBNAME).dll
 
-CPPSRCS=										\
-			nsMsgNewsFactory.cpp				\
-			$(NULL)
 OBJS=											\
-			.\$(OBJDIR)\nsMsgNewsFactory.obj    \
+			.\$(OBJDIR)\nsMsgNewsFactory.obj	\
 			$(NULL)
 
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
-#//
-#//------------------------------------------------------------------------
-DLLNAME=msgnews
-MAPFILE=msgnews.map
-# DEFFILE=msg.def
-
-
-#//------------------------------------------------------------------------
-#//
-#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
-#// (these must be defined before the common makefiles are included)
-#//
-#//------------------------------------------------------------------------
-
-DLL=.\$(OBJDIR)\$(DLLNAME).dll
-
-#//------------------------------------------------------------------------
-#//
-#// Define any local options for the make tools 
-#//     (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
-#//
-#//------------------------------------------------------------------------
-LCFLAGS=-DNETSCAPE
-
-MSGLIBS=				\
-		$(NULL)
-
-# These are the libraries we need to link with to create the dll
-LLIBS=												\
-			$(MSGLIBS)								\
-			$(DIST)\lib\xpcom.lib					\
-			$(DIST)\lib\plc3.lib					\
-			$(DIST)\lib\msgcoreutil.lib				\
-			$(DIST)\lib\nntp_s.lib					\
-			$(DIST)\lib\netlib.lib					\
-			$(LIBNSPR)								\
-			$(DIST)\lib\rdfutil_s.lib				\
+LLIBS=											\
+			$(MSGLIBS)							\
+			$(DIST)\lib\xpcom.lib				\
+			$(DIST)\lib\plc3.lib				\
+			$(DIST)\lib\msgbaseutil.lib			\
+			$(DIST)\lib\msgnews_s.lib			\
+			$(DIST)\lib\netlib.lib				\
+			$(LIBNSPR)							\
+			$(DIST)\lib\rdfutil_s.lib			\
 			$(NULL)
 
 MISCDEP=$(LLIBS)
 
-#//------------------------------------------------------------------------
-#//
-#// Include the common makefile rules
-#//
-#//------------------------------------------------------------------------
 include <$(DEPTH)/config/rules.mak>
 
-install:: $(DLL)
-	$(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components
-
-clobber::
-	rm -f $(DIST)\bin\$(DLLNAME)
+libs:: $(DLL)
+	$(MAKE_INSTALL)  $(LIBNAME).$(DLL_SUFFIX) $(DIST)\bin\components
+	$(MAKE_INSTALL)  $(LIBNAME).$(LIB_SUFFIX) $(DIST)\lib
 
 
diff --git a/mailnews/news/public/makefile.win b/mailnews/news/public/makefile.win
index 2d736f64aeb..f129f43bc1e 100644
--- a/mailnews/news/public/makefile.win
+++ b/mailnews/news/public/makefile.win
@@ -16,26 +16,28 @@
 # Reserved.
 
 DEPTH=..\..\..
+MODULE=msgnews
 
 XPIDLSRCS= \
-		.\nsIMsgOfflineNewsState.idl \
-		.\nsINNTPArticleList.idl \
-		.\nsINNTPCategory.idl \
-		.\nsINNTPCategoryContainer.idl \
-		.\nsINNTPHost.idl \
-		.\nsINNTPNewsgroup.idl \
-		.\nsINNTPNewsgroupList.idl \
-		.\nsINntpIncomingServer.idl \
-		.\nsINntpService.idl \
+		.\nsIMsgOfflineNewsState.idl	\
+		.\nsINNTPArticleList.idl		\
+		.\nsINNTPCategory.idl			\
+		.\nsINNTPCategoryContainer.idl	\
+		.\nsINNTPHost.idl				\
+		.\nsINNTPNewsgroup.idl			\
+		.\nsINNTPNewsgroupList.idl		\
+		.\nsINntpIncomingServer.idl		\
+		.\nsINntpService.idl			\
 		$(NULL)
 
-EXPORTS= \
+################################################################################
+## exports
+
+EXPORTS=						\
 		nsINNTPNewsgroupPost.h  \
 		nsINNTPProtocol.h       \
-		nsINntpUrl.h    \
+		nsINntpUrl.h			\
 		$(NULL)
 
-MODULE=news
-
 include <$(DEPTH)\config\rules.mak>
 include <$(DEPTH)\config\config.mak>
diff --git a/mailnews/news/src/makefile.win b/mailnews/news/src/makefile.win
index efd5adba743..b68963abce2 100644
--- a/mailnews/news/src/makefile.win
+++ b/mailnews/news/src/makefile.win
@@ -15,30 +15,41 @@
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
 
-DEPTH=..\..\..
 IGNORE_MANIFEST=1
 
+DEPTH=..\..\..
+MODULE= msgnews
+
 include <$(DEPTH)\config\config.mak>
 
+################################################################################
+## exports
 
-LIBRARY_NAME=nntp_s
-MODULE=news
-REQUIRES=xpcom js nspr netlib
+EXPORTS=	nsNNTPProtocol.h				\
+			nsNntpUrl.h						\
+			nsNNTPNewsgroupList.h			\
+			nsNNTPArticleList.h				\
+			nsNNTPNewsgroup.h				\
+			nntpCore.h						\
+			nsNNTPNewsgroupPost.h			\
+			nsNntpService.h					\
+			nsNewsFolder.h					\
+			nsNntpIncomingServer.h 			\
+			nsNewsMessage.h					\
+			nsNewsUtils.h					\
+			nsNNTPHost.h					\
+			nsNNTPCategoryContainer.h		\
+            $(NULL)
 
-CPPSRCS=    nsNNTPProtocol.cpp				\
-			nsNntpUrl.cpp					\
-			nsNNTPArticleList.cpp			\
-			nsNNTPNewsgroupList.cpp			\
-			nsNNTPNewsgroupPost.cpp			\
-			nsNNTPNewsgroup.cpp	\
-			nsNNTPCategoryContainer.cpp \
-			nsNNTPHost.cpp					\
-			nsNntpService.cpp				\
-			nsNewsFolder.cpp	\
-			nsNntpIncomingServer.cpp	\
-			nsNewsMessage.cpp	\
-			nsNewsUtils.cpp		\
-			$(NULL)
+################################################################################
+## library
+
+LIBRARY_NAME=msgnews_s
+
+LCFLAGS =		   \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
 
 CPP_OBJS=   .\$(OBJDIR)\nsNNTPProtocol.obj				\
 			.\$(OBJDIR)\nsNntpUrl.obj					\
@@ -56,27 +67,6 @@ CPP_OBJS=   .\$(OBJDIR)\nsNNTPProtocol.obj				\
 			$(NULL)
 
 
-EXPORTS=	nsNNTPProtocol.h				\
-			nsNntpUrl.h						\
-			nsNNTPNewsgroupList.h			\
-			nsNNTPArticleList.h			\
-			nsNNTPNewsgroup.h				\
-			nntpCore.h						\
-			nsNNTPNewsgroupPost.h			\
-			nsNntpService.h					\
-			nsNewsFolder.h \
-			nsNntpIncomingServer.h 				\
-			nsNewsMessage.h	\
-			nsNewsUtils.h \
-			nsNNTPHost.h	\
-			nsNNTPCategoryContainer.h \
-            $(NULL)
-
-LCFLAGS = \
-        $(LCFLAGS) \
-        $(DEFINES) \
-        $(NULL)
-
 include <$(DEPTH)\config\rules.mak>
 
 libs:: $(LIBRARY)
diff --git a/mailnews/news/tests/newsParser/makefile.win b/mailnews/news/tests/newsParser/makefile.win
index 502b306bf01..8c983e62d67 100644
--- a/mailnews/news/tests/newsParser/makefile.win
+++ b/mailnews/news/tests/newsParser/makefile.win
@@ -33,9 +33,9 @@ MYLIBS=							\
  $(DIST)\lib\raptorwidget.lib	\
  $(DIST)\lib\netlib.lib			\
  $(DIST)\lib\plc3.lib			\
- $(DIST)\lib\nntp_s.lib    		\
- $(DIST)\lib\msgcore.lib		\
- $(DIST)\lib\msgcoreutil.lib	\
+ $(DIST)\lib\msgnews_s.lib    	\
+ $(DIST)\lib\msgbase.lib		\
+ $(DIST)\lib\msgbaseutil.lib	\
  $(DIST)\lib\xplib.lib			\
  $(NULL)
 
diff --git a/mailnews/news/tests/nntp/makefile.win b/mailnews/news/tests/nntp/makefile.win
index 5df1121821f..1bbb5b2049e 100644
--- a/mailnews/news/tests/nntp/makefile.win
+++ b/mailnews/news/tests/nntp/makefile.win
@@ -33,8 +33,8 @@ MYLIBS=							\
  $(DIST)\lib\raptorwidget.lib	\
  $(DIST)\lib\netlib.lib			\
  $(DIST)\lib\plc3.lib			\
- $(DIST)\lib\msgcore.lib		\
- $(DIST)\lib\msgcoreutil.lib	\
+ $(DIST)\lib\msgbase.lib		\
+ $(DIST)\lib\msgbaseutil.lib	\
  $(DIST)\lib\xplib.lib			\
  $(NULL)