diff --git a/mozilla/content/base/src/makefile.win b/mozilla/content/base/src/makefile.win
index d63ec5f7816..caecdb382b9 100644
--- a/mozilla/content/base/src/makefile.win
+++ b/mozilla/content/base/src/makefile.win
@@ -27,43 +27,6 @@ DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
 !endif
 
-CPPSRCS =				\
-	nsStyleContext.cpp		\
-	nsStyleSet.cpp			\
-	nsCommentNode.cpp		\
-	nsGenericElement.cpp		\
-	nsGenericDOMDataNode.cpp	\
-	nsGenericDOMNodeList.cpp	\
-	nsContentList.cpp		\
-	nsContentIterator.cpp		\
-	nsContentPolicy.cpp		\
-	nsDocument.cpp			\
-	nsDocumentEncoder.cpp		\
-	nsDocumentFragment.cpp		\
-	nsDocumentViewer.cpp		\
-	nsDOMAttribute.cpp		\
-	nsDOMAttributeMap.cpp		\
-	nsDOMDocumentType.cpp		\
-	nsGeneratedIterator.cpp		\
-	nsNameSpaceManager.cpp		\
-	nsNodeInfo.cpp			\
-	nsNodeInfoManager.cpp		\
-	nsTextFragment.cpp		\
-	nsSelection.cpp			\
-	nsRange.cpp			\
-	nsRuleNode.cpp			\
-	nsTextContentChangeData.cpp	\
-	nsTextNode.cpp			\
-	nsTreeWalker.cpp		\
-	nsXMLContentSerializer.cpp	\
-	nsHTMLContentSerializer.cpp	\
-	nsParserUtils.cpp		\
-	nsPlainTextSerializer.cpp	\
-	nsContentUtils.cpp 		\
-	nsScriptLoader.cpp		\
-	nsStyleLinkElement.cpp		\
-	$(NULL)
-
 MODULE=content
 REQUIRES	= xpcom \
 		  string \
diff --git a/mozilla/content/events/src/makefile.win b/mozilla/content/events/src/makefile.win
index 336b44d593e..b8311141714 100644
--- a/mozilla/content/events/src/makefile.win
+++ b/mozilla/content/events/src/makefile.win
@@ -50,13 +50,6 @@ include <$(DEPTH)\config\config.mak>
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=    nsEventListenerManager.cpp  \
-	    nsEventStateManager.cpp  \
-	    nsDOMEvent.cpp		\
-	    nsDOMMutationEvent.cpp \
-	    nsPrivateTextRange.cpp		\
-	    $(NULL)
-
 CPP_OBJS=   .\$(OBJDIR)\nsEventListenerManager.obj  \
 	    .\$(OBJDIR)\nsEventStateManager.obj  \
 	    .\$(OBJDIR)\nsDOMEvent.obj	    \
diff --git a/mozilla/content/html/content/src/makefile.win b/mozilla/content/html/content/src/makefile.win
index 53aeb3b865b..7ad50e5c59d 100644
--- a/mozilla/content/html/content/src/makefile.win
+++ b/mozilla/content/html/content/src/makefile.win
@@ -59,68 +59,6 @@ EXPORTS= \
   nsIHTMLTableColElement.h \
   $(NULL)
 
-CPPSRCS=				\
-	nsAttributeContent.cpp		\
-	nsGenericHTMLElement.cpp	\
-	nsGenericDOMHTMLCollection.cpp	\
-	GenericElementCollection.cpp    \
-	nsFormSubmitter.cpp             \
-	nsHTMLAnchorElement.cpp		\
-	nsHTMLAppletElement.cpp		\
-	nsHTMLAreaElement.cpp		\
-	nsHTMLBRElement.cpp		\
-	nsHTMLBaseFontElement.cpp	\
-	nsHTMLBodyElement.cpp		\
-	nsHTMLButtonElement.cpp		\
-	nsHTMLDListElement.cpp		\
-	nsHTMLDelElement.cpp		\
-	nsHTMLDirectoryElement.cpp	\
-	nsHTMLDivElement.cpp		\
-	nsHTMLFieldSetElement.cpp	\
-	nsHTMLFontElement.cpp		\
-	nsHTMLFormElement.cpp		\
-	nsHTMLFrameElement.cpp		\
-	nsHTMLFrameSetElement.cpp	\
-	nsHTMLHRElement.cpp		\
-	nsHTMLHeadElement.cpp		\
-	nsHTMLHeadingElement.cpp	\
-	nsHTMLHtmlElement.cpp		\
-	nsHTMLIFrameElement.cpp		\
-	nsHTMLImageElement.cpp		\
-	nsHTMLInputElement.cpp		\
-	nsHTMLInsElement.cpp		\
-	nsHTMLLIElement.cpp		\
-	nsHTMLLabelrElement.cpp		\
-	nsHTMLLegendElement.cpp		\
-	nsHTMLLinkElement.cpp		\
-	nsHTMLMapElement.cpp		\
-	nsHTMLMenuElement.cpp		\
-	nsHTMLMetaElement.cpp		\
-	nsHTMLModElement.cpp		\
-	nsHTMLOListElement.cpp		\
-	nsHTMLObjectElement.cpp		\
-	nsHTMLOptionElement.cpp		\
-	nsHTMLOptGroupElement.cpp	\
-	nsHTMLParagraphElement.cpp	\
-	nsHTMLPreElement.cpp		\
-	nsHTMLQuoteElement.cpp		\
-	nsHTMLScriptElement.cpp		\
-	nsHTMLSelectElement.cpp		\
-	nsHTMLSharedLeafElement.cpp	\
-	nsHTMLSpanElement.cpp		\
-	nsHTMLStyleElement.cpp		\
-	nsHTMLTableElement.cpp		\
-	nsHTMLTableCaptionElement.cpp	\
-	nsHTMLTableCellElement.cpp	\
-	nsHTMLTableColElement.cpp	\
-	nsHTMLTableRowElement.cpp	\
-	nsHTMLTableSectionElement.cpp	\
-	nsHTMLTextAreaElement.cpp	\
-	nsHTMLTitleElement.cpp		\
-	nsHTMLUListElement.cpp		\
-	nsHTMLUnknownElement.cpp	\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsAttributeContent.obj		\
 	.\$(OBJDIR)\nsGenericHTMLElement.obj		\
diff --git a/mozilla/content/html/document/src/makefile.win b/mozilla/content/html/document/src/makefile.win
index 6d5c702c38b..2c6e7e05659 100644
--- a/mozilla/content/html/document/src/makefile.win
+++ b/mozilla/content/html/document/src/makefile.win
@@ -60,14 +60,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
 !endif
 
-CPPSRCS=					\
-	nsHTMLContentSink.cpp			\
-	nsHTMLDocument.cpp			\
-	nsHTMLFragmentContentSink.cpp		\
-	nsImageDocument.cpp			\
-	nsMarkupDocument.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsHTMLContentSink.obj	\
 	.\$(OBJDIR)\nsHTMLDocument.obj		\
diff --git a/mozilla/content/html/style/src/makefile.win b/mozilla/content/html/style/src/makefile.win
index 0dd8527b9c7..6bef83a6598 100644
--- a/mozilla/content/html/style/src/makefile.win
+++ b/mozilla/content/html/style/src/makefile.win
@@ -61,26 +61,6 @@ EXPORTS =			\
 	nsIHTMLAttributes.h 	\
 	$(NULL)
 
-CPPSRCS=				\
-	nsHTMLStyleSheet.cpp 	\
-	nsCSSDeclaration.cpp 		\
-	nsCSSLoader.cpp   \
-	nsCSSOMFactory.cpp 		\
-	nsCSSParser.cpp 		\
-	nsCSSScanner.cpp 		\
-	nsCSSRule.cpp 		\
-	nsCSSStyleRule.cpp 		\
-	nsCSSRules.cpp 		\
-	nsCSSStyleSheet.cpp 		\
-	nsCSSValue.cpp			\
-	nsHTMLAttributes.cpp 		\
-	nsHTMLCSSStyleSheet.cpp		\
-	nsDOMCSSAttrDeclaration.cpp	\
-	nsDOMCSSDeclaration.cpp		\
-	nsComputedDOMStyle.cpp		\
-	nsROCSSPrimitiveValue.cpp	\
-  $(NULL)
-
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsHTMLStyleSheet.obj 		\
 	.\$(OBJDIR)\nsCSSDeclaration.obj 	\
diff --git a/mozilla/content/shared/src/makefile.win b/mozilla/content/shared/src/makefile.win
index b63c34365fd..510aa5a9ec2 100644
--- a/mozilla/content/shared/src/makefile.win
+++ b/mozilla/content/shared/src/makefile.win
@@ -43,24 +43,6 @@ DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
 !endif
 
-CPPSRCS = \
-  nsCSSAtoms.cpp \
-  nsCSSKeywords.cpp \
-  nsCSSProps.cpp \
-  nsHTMLAtoms.cpp \
-  nsHTMLUtils.cpp \
-  nsHTMLValue.cpp \
-  nsImageMapUtils.cpp \
-  nsLayoutAtoms.cpp \
-  nsStyleUtil.cpp \
-  nsStyleStruct.cpp \
-  nsTextFragment.cpp \
-  nsXULAtoms.cpp \
-  nsXBLAtoms.cpp \
-  nsStyleCoord.cpp \
-  $(NULL)
-
-
 CPP_OBJS= \
   .\$(OBJDIR)\nsCSSAtoms.obj \
   .\$(OBJDIR)\nsCSSKeywords.obj \
diff --git a/mozilla/content/xbl/src/makefile.win b/mozilla/content/xbl/src/makefile.win
index f0dff6bd446..b8e73646ad5 100644
--- a/mozilla/content/xbl/src/makefile.win
+++ b/mozilla/content/xbl/src/makefile.win
@@ -50,38 +50,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-  nsXBLBinding.cpp \
-  nsXBLPrototypeBinding.cpp \
-  nsXBLPrototypeResources.cpp \
-  nsXBLResourceLoader.cpp \
-  nsXBLDocumentInfo.cpp \
-  nsXBLContentSink.cpp \
-  nsXBLService.cpp \
-  nsXBLEventHandler.cpp \
-  nsXBLWindowHandler.cpp \
-  nsXBLWindowKeyHandler.cpp \
-  nsXBLWindowDragHandler.cpp \
-  nsXBLKeyHandler.cpp \
-  nsXBLMouseHandler.cpp \
-  nsXBLMouseMotionHandler.cpp \
-  nsXBLMutationHandler.cpp \
-  nsXBLDragHandler.cpp \
-  nsXBLFocusHandler.cpp \
-  nsXBLXULHandler.cpp \
-  nsXBLScrollHandler.cpp \
-  nsXBLFormHandler.cpp \
-  nsXBLLoadHandler.cpp \
-  nsXBLContextMenuHandler.cpp \
-  nsXBLPrototypeHandler.cpp \
-  nsBindingManager.cpp \
-  nsXBLInsertionPoint.cpp \
-  nsXBLProtoImplProperty.cpp \
-  nsXBLProtoImplMethod.cpp \
-  nsXBLProtoImplField.cpp \
-  nsXBLProtoImpl.cpp \
-	$(NULL)
-
 CPP_OBJS=					\
   .\$(OBJDIR)\nsXBLBinding.obj \
   .\$(OBJDIR)\nsXBLPrototypeBinding.obj \
diff --git a/mozilla/content/xml/content/src/makefile.win b/mozilla/content/xml/content/src/makefile.win
index 1280d0c6b99..7adf32a867a 100644
--- a/mozilla/content/xml/content/src/makefile.win
+++ b/mozilla/content/xml/content/src/makefile.win
@@ -41,15 +41,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-	nsXMLElement.cpp			\
-	nsXMLCDATASection.cpp			\
-	nsXMLProcessingInstruction.cpp		\
-	nsXMLEntity.cpp				\
-	nsXMLNotation.cpp			\
-	nsXMLNamedNodeMap.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsXMLElement.obj		\
 	.\$(OBJDIR)\nsXMLCDATASection.obj	\
diff --git a/mozilla/content/xml/document/src/makefile.win b/mozilla/content/xml/document/src/makefile.win
index 8b6ce10af8c..0edb5144054 100644
--- a/mozilla/content/xml/document/src/makefile.win
+++ b/mozilla/content/xml/document/src/makefile.win
@@ -48,11 +48,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-	nsXMLContentSink.cpp			\
-	nsXMLDocument.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsXMLContentSink.obj	\
 	.\$(OBJDIR)\nsXMLDocument.obj		\
diff --git a/mozilla/content/xsl/document/src/makefile.win b/mozilla/content/xsl/document/src/makefile.win
index a7ebee3690e..1b33815e501 100644
--- a/mozilla/content/xsl/document/src/makefile.win
+++ b/mozilla/content/xsl/document/src/makefile.win
@@ -40,11 +40,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 XPIDLSRCS=	.\nsIDocumentTransformer.idl \
             $(NULL)
 
-CPPSRCS=					\
-	nsXSLContentSink.cpp			\
-	nsTransformMediator.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsXSLContentSink.obj	\
 	.\$(OBJDIR)\nsTransformMediator.obj     \
diff --git a/mozilla/content/xul/content/src/makefile.win b/mozilla/content/xul/content/src/makefile.win
index c2ddbafc3e4..a1d8b880613 100644
--- a/mozilla/content/xul/content/src/makefile.win
+++ b/mozilla/content/xul/content/src/makefile.win
@@ -46,15 +46,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-        nsRDFDOMNodeList.cpp                    \
-        nsXULAttributeValue.cpp                 \
-        nsXULAttributes.cpp                     \
-        nsXULElement.cpp                        \
-        nsXULPopupListener.cpp                  \
-        nsXULTreeElement.cpp                    \
-	$(NULL)
-
 CPP_OBJS=					        \
         .\$(OBJDIR)\nsRDFDOMNodeList.obj                \
         .\$(OBJDIR)\nsXULAttributeValue.obj             \
diff --git a/mozilla/content/xul/document/src/makefile.win b/mozilla/content/xul/document/src/makefile.win
index 2b6546abd82..17ab9c8a5a3 100644
--- a/mozilla/content/xul/document/src/makefile.win
+++ b/mozilla/content/xul/document/src/makefile.win
@@ -52,17 +52,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-        nsControllerCommandManager.cpp          \
-        nsElementMap.cpp                        \
-        nsXULCommandDispatcher.cpp              \
-        nsXULContentSink.cpp                    \
-        nsXULControllers.cpp                    \
-        nsXULDocument.cpp                       \
-        nsXULPrototypeCache.cpp                 \
-        nsXULPrototypeDocument.cpp              \
-	$(NULL)
-
 CPP_OBJS=					        \
         .\$(OBJDIR)\nsControllerCommandManager.obj      \
         .\$(OBJDIR)\nsElementMap.obj                    \
diff --git a/mozilla/content/xul/templates/src/makefile.win b/mozilla/content/xul/templates/src/makefile.win
index 80824b494a3..d7c8d3a4f19 100644
--- a/mozilla/content/xul/templates/src/makefile.win
+++ b/mozilla/content/xul/templates/src/makefile.win
@@ -45,31 +45,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-        nsClusterKey.cpp                        \
-        nsClusterKeySet.cpp                     \
-        nsConflictSet.cpp                       \
-        nsContentSupportMap.cpp                 \
-        nsContentTagTestNode.cpp                \
-        nsContentTestNode.cpp                   \
-        nsInstantiationNode.cpp                 \
-        nsOutlinerRowTestNode.cpp               \
-        nsOutlinerRows.cpp                      \
-        nsRDFConInstanceTestNode.cpp            \
-        nsRDFConMemberTestNode.cpp              \
-        nsRDFPropertyTestNode.cpp               \
-        nsResourceSet.cpp                       \
-        nsRuleNetwork.cpp                       \
-        nsTemplateMatch.cpp                     \
-        nsTemplateMatchSet.cpp                  \
-        nsTemplateRule.cpp                      \
-        nsXULContentBuilder.cpp                 \
-        nsXULContentUtils.cpp                   \
-        nsXULOutlinerBuilder.cpp                \
-        nsXULSortService.cpp                    \
-        nsXULTemplateBuilder.cpp                \
-	$(NULL)
-
 CPP_OBJS=					        \
         .\$(OBJDIR)\nsClusterKey.obj                    \
         .\$(OBJDIR)\nsClusterKeySet.obj                 \
diff --git a/mozilla/dom/src/base/makefile.win b/mozilla/dom/src/base/makefile.win
index 382f3424743..23f948318b6 100644
--- a/mozilla/dom/src/base/makefile.win
+++ b/mozilla/dom/src/base/makefile.win
@@ -63,23 +63,6 @@ REQUIRES	= xpcom \
                   appshell \
 		  $(NULL)
 
-CPPSRCS =			\
-	nsBarProps.cpp          \
-	nsDOMException.cpp 	\
-	nsJSEnvironment.cpp	\
-	nsFocusController.cpp	\
-	nsGlobalWindow.cpp      \
-	nsLocation.cpp		\
-	nsDOMWindowList.cpp	\
-	nsJSUtils.cpp		\
-	nsScreen.cpp		\
-	nsHistory.cpp		\
-	nsMimeTypeArray.cpp	\
-	nsPluginArray.cpp	\
-	nsWindowRoot.cpp	\
-	nsDOMClassInfo.cpp	\
-	$(NULL)
-
 MODULE=dom
 
 
diff --git a/mozilla/dom/src/build/makefile.win b/mozilla/dom/src/build/makefile.win
index fa55d0c1ff1..fd844597ec4 100644
--- a/mozilla/dom/src/build/makefile.win
+++ b/mozilla/dom/src/build/makefile.win
@@ -43,9 +43,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=-D_IMPL_NS_DOM
 LINCS=-I..\base
 
-CPPSRCS = nsDOMFactory.cpp      	\
-	  nsScriptNameSpaceManager.cpp
-
 CPP_OBJS = .\$(OBJDIR)\nsDOMFactory.obj			\
 	   .\$(OBJDIR)\nsScriptNameSpaceManager.obj 
 
diff --git a/mozilla/dom/src/jsurl/makefile.win b/mozilla/dom/src/jsurl/makefile.win
index 4173a8d8055..901af11ba7c 100644
--- a/mozilla/dom/src/jsurl/makefile.win
+++ b/mozilla/dom/src/jsurl/makefile.win
@@ -65,10 +65,6 @@ OBJS=   \
 	.\$(OBJDIR)\nsJSProtocolHandler.obj	\
 	$(NULL)
 
-CPPSRCS = \
-	nsJSProtocolHandler.cpp	\
-	$(NULL)
-
 XPIDLSRCS = \
     .\nsIEvaluateStringProxy.idl \
     $(NULL) 
diff --git a/mozilla/editor/composer/src/makefile.win b/mozilla/editor/composer/src/makefile.win
index b289573bbfb..601a9847f54 100644
--- a/mozilla/editor/composer/src/makefile.win
+++ b/mozilla/editor/composer/src/makefile.win
@@ -25,16 +25,6 @@ MODULE=editor
 LIBRARY_NAME=composer
 MODULE_NAME=nsComposerModule
 
-CPPSRCS =                                \
-          nsEditorShell.cpp              \
-          nsEditorShellMouseListener.cpp \
-          nsInterfaceState.cpp           \
-          nsComposerController.cpp       \
-          nsComposerCommands.cpp         \
-          nsComposerRegistration.cpp     \
-          nsEditorParserObserver.cpp     \
-          $(NULL)
-
 CPP_OBJS =                                            \
           .\$(OBJDIR)\nsEditorShell.obj              \
           .\$(OBJDIR)\nsEditorShellMouseListener.obj \
diff --git a/mozilla/editor/libeditor/base/makefile.win b/mozilla/editor/libeditor/base/makefile.win
index d2f5bb04998..f07fb1e98dd 100644
--- a/mozilla/editor/libeditor/base/makefile.win
+++ b/mozilla/editor/libeditor/base/makefile.win
@@ -40,31 +40,6 @@ REQUIRES        = xpcom \
                   widget \
                   $(NULL)
 
-CPPSRCS =                          \
-          ChangeAttributeTxn.cpp   \
-          CreateElementTxn.cpp     \
-          DeleteElementTxn.cpp     \
-          DeleteRangeTxn.cpp       \
-          DeleteTextTxn.cpp        \
-          EditAggregateTxn.cpp     \
-          EditTxn.cpp              \
-          IMETextTxn.cpp           \
-          InsertElementTxn.cpp     \
-          InsertTextTxn.cpp        \
-          JoinElementTxn.cpp       \
-          PlaceholderTxn.cpp       \
-          SetDocTitleTxn.cpp       \
-          SplitElementTxn.cpp      \
-          TransactionFactory.cpp   \
-          nsEditor.cpp             \
-          nsEditorCommands.cpp     \
-          nsEditorController.cpp   \
-          nsEditorService.cpp      \
-          nsEditorUtils.cpp        \
-          nsSelectionState.cpp     \
-          nsStyleSheetTxns.cpp     \
-          $(NULL)
-
 CPP_OBJS =                                      \
            .\$(OBJDIR)\ChangeAttributeTxn.obj   \
            .\$(OBJDIR)\CreateElementTxn.obj     \
diff --git a/mozilla/editor/libeditor/build/makefile.win b/mozilla/editor/libeditor/build/makefile.win
index ea1719257ab..194d4499417 100644
--- a/mozilla/editor/libeditor/build/makefile.win
+++ b/mozilla/editor/libeditor/build/makefile.win
@@ -46,11 +46,6 @@ MODULE_NAME = nsEditorModule
 
 !if defined(MOZ_BUILD_PLAINTEXT_EDITOR_CORE_ONLY)
 
-CPPSRCS =                          \
-          $(CPPSRCS)               \
-          nsTextEditorReg.cpp      \
-          $(NULL)
-
 CPP_OBJS =                                 \
            $(CPP_OBJS)                     \
            .\$(OBJDIR)\nsTextEditorReg.obj \
@@ -60,11 +55,6 @@ LIBRARY_NAME = texteditor
 
 !else
 
-CPPSRCS =                          \
-          $(CPPSRCS)               \
-          nsEditorRegistration.cpp \
-          $(NULL)
-
 CPP_OBJS =                                      \
            $(CPP_OBJS)                          \
            .\$(OBJDIR)\nsEditorRegistration.obj \
diff --git a/mozilla/editor/libeditor/html/makefile.win b/mozilla/editor/libeditor/html/makefile.win
index c53bb69dff3..c84b7aab1a2 100644
--- a/mozilla/editor/libeditor/html/makefile.win
+++ b/mozilla/editor/libeditor/html/makefile.win
@@ -38,20 +38,6 @@ REQUIRES        = xpcom \
                   widget \
                   $(NULL)
 
-CPPSRCS =                        \
-          TypeInState.cpp        \
-          nsEditProperty.cpp     \
-          nsHTMLDataTransfer.cpp \
-          nsHTMLEditRules.cpp    \
-          nsHTMLEditUtils.cpp    \
-          nsHTMLEditor.cpp       \
-          nsHTMLEditorStyle.cpp  \
-          nsHTMLURIRefObject.cpp \
-          nsTableEditor.cpp      \
-          nsWSRunObject.cpp      \
-          TextEditorTest.cpp     \
-          $(NULL)
-
 CPP_OBJS =                                    \
            .\$(OBJDIR)\TypeInState.obj        \
            .\$(OBJDIR)\nsEditProperty.obj     \
@@ -72,12 +58,6 @@ ENABLE_EDITOR_API_LOG=1
 
 !if defined(ENABLE_EDITOR_API_LOG)
 
-CPPSRCS =                     \
-          $(CPPSRCS)          \
-          nsEditorTxnLog.cpp  \
-          nsHTMLEditorLog.cpp \
-          $(NULL)
-
 CPP_OBJS =                                 \
            $(CPP_OBJS)                     \
            .\$(OBJDIR)\nsEditorTxnLog.obj  \
diff --git a/mozilla/editor/libeditor/text/makefile.win b/mozilla/editor/libeditor/text/makefile.win
index 1992d6ac8d0..d0260e0d7fc 100644
--- a/mozilla/editor/libeditor/text/makefile.win
+++ b/mozilla/editor/libeditor/text/makefile.win
@@ -39,18 +39,6 @@ REQUIRES        = xpcom \
                   widget \
                   $(NULL)
 
-CPPSRCS =                             \
-          nsAOLCiter.cpp              \
-          nsEditorEventListeners.cpp  \
-          nsInternetCiter.cpp         \
-          nsPlaintextDataTransfer.cpp \
-          nsPlaintextEditor.cpp       \
-          nsTextEditRules.cpp         \
-          nsTextEditRulesBidi.cpp     \
-          nsTextEditUtils.cpp         \
-          nsWrapUtils.cpp             \
-          $(NULL)
-
 CPP_OBJS =                                         \
            .\$(OBJDIR)\nsAOLCiter.obj              \
            .\$(OBJDIR)\nsEditorEventListeners.obj  \
diff --git a/mozilla/editor/txmgr/src/makefile.win b/mozilla/editor/txmgr/src/makefile.win
index 8a74a0a334c..c8d563891f5 100644
--- a/mozilla/editor/txmgr/src/makefile.win
+++ b/mozilla/editor/txmgr/src/makefile.win
@@ -28,14 +28,6 @@ REQUIRES	= xpcom \
 		  string \
 		  $(NULL)
 
-CPPSRCS =				\
-	nsTransactionItem.cpp	\
-	nsTransactionList.cpp	\
-	nsTransactionManager.cpp	\
-	nsTransactionManagerFactory.cpp	\
-	nsTransactionStack.cpp	\
-	$(NULL)
-
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsTransactionItem.obj	\
 	.\$(OBJDIR)\nsTransactionList.obj	\
diff --git a/mozilla/editor/txtsvc/src/makefile.win b/mozilla/editor/txtsvc/src/makefile.win
index 353b983efef..e95a0a7a904 100644
--- a/mozilla/editor/txtsvc/src/makefile.win
+++ b/mozilla/editor/txtsvc/src/makefile.win
@@ -34,13 +34,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=txtsvc
 MODULE_NAME=nsTextServicesModule
 
-CPPSRCS =				\
-	nsFindAndReplace.cpp	\
-	nsTextServicesDocument.cpp	\
-	nsTextServicesFactory.cpp	\
-	nsTSDNotifier.cpp	\
-	$(NULL)
-
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsFindAndReplace.obj	\
 	.\$(OBJDIR)\nsTextServicesDocument.obj	\
diff --git a/mozilla/expat/xmlparse/makefile.win b/mozilla/expat/xmlparse/makefile.win
index 22bf5c926f8..27675f6cd16 100644
--- a/mozilla/expat/xmlparse/makefile.win
+++ b/mozilla/expat/xmlparse/makefile.win
@@ -41,11 +41,6 @@ MODULE = expat
 EXPORTS = xmlparse.h
 LIBRARY_NAME=expat
 
-CPPSRCS=					\
-	xmlparse.c				\
-	hashtable.c				\
-	$(NULL)
-
 CPP_OBJS=                                   	\
 	.\$(OBJDIR)\xmlparse.obj      		\
 	.\$(OBJDIR)\hashtable.obj     		\
diff --git a/mozilla/expat/xmltok/makefile.win b/mozilla/expat/xmltok/makefile.win
index 7722102ae1f..f9bc1b7fc7b 100644
--- a/mozilla/expat/xmltok/makefile.win
+++ b/mozilla/expat/xmltok/makefile.win
@@ -38,11 +38,6 @@
 
 DEPTH= ..\..
 
-CPPSRCS=				\
-	xmltok.c			\
-	xmlrole.c			\
-	$(NULL)
-
 CPP_OBJS=				\
 	.\$(OBJDIR)\xmltok.obj      	\
 	.\$(OBJDIR)\xmlrole.obj     	\
diff --git a/mozilla/extensions/cookie/makefile.win b/mozilla/extensions/cookie/makefile.win
index 81229d44456..7bebba4eb30 100644
--- a/mozilla/extensions/cookie/makefile.win
+++ b/mozilla/extensions/cookie/makefile.win
@@ -39,21 +39,6 @@ REQUIRES	= xpcom \
 
 EXPORTS = nsCookieHTTPNotify.h
 
-CPPSRCS=				\
- nsModuleFactory.cpp		\
- nsCookie.cpp			\
- nsPermission.cpp			\
- nsCookieManager.cpp			\
- nsCookieService.cpp			\
- nsImgManager.cpp			\
- nsPermissionManager.cpp			\
- nsCookies.cpp			\
- nsImages.cpp			\
- nsPermissions.cpp			\
- nsUtils.cpp			\
- nsCookieHTTPNotify.cpp			\
- $(NULL)
-
 XPIDLSRCS=      .\nsICookieManager.idl           \
                 .\nsIImgManager.idl            \
                 .\nsIPermissionManager.idl       \
diff --git a/mozilla/extensions/inspector/base/src/makefile.win b/mozilla/extensions/inspector/base/src/makefile.win
index b2d33cb0c85..d58a89311c0 100644
--- a/mozilla/extensions/inspector/base/src/makefile.win
+++ b/mozilla/extensions/inspector/base/src/makefile.win
@@ -50,25 +50,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
 DIRS=win
 
-CPPSRCS= \
-  .\inDOMView.cpp \
-  .\inDeepTreeWalker.cpp \
-  .\inFlasher.cpp \
-  .\inSearchLoop.cpp \
-  .\inFileSearch.cpp \
-  .\inCSSValueSearch.cpp \
-  .\inDOMUtils.cpp \
-  .\inLayoutUtils.cpp \
-  .\inBitmap.cpp \
-  .\inBitmapDepot.cpp \
-  .\inBitmapDecoder.cpp \
-  .\inBitmapProtocolHandler.cpp \
-  .\inBitmapChannel.cpp \
-  .\inBitmapURI.cpp \
-  .\inPNGEncoder.cpp \
-  $(NULL)
-
-
 CPP_OBJS= \
   .\$(OBJDIR)\inDOMView.obj \
   .\$(OBJDIR)\inDeepTreeWalker.obj \
diff --git a/mozilla/extensions/inspector/base/src/win/makefile.win b/mozilla/extensions/inspector/base/src/win/makefile.win
index 4c915e74ff5..8ba20564653 100755
--- a/mozilla/extensions/inspector/base/src/win/makefile.win
+++ b/mozilla/extensions/inspector/base/src/win/makefile.win
@@ -41,11 +41,6 @@ INCS = $(INCS)                  \
         -I..\       	         	\
 		$(NULL)
 
-CPPSRCS=					               \
-	inScreenCapturer.cpp              \
-	$(NULL)
-
-
 CPP_OBJS=					                      \
 	.\$(OBJDIR)\inScreenCapturer.obj		      \
 	$(NULL)
diff --git a/mozilla/extensions/p3p/src/makefile.win b/mozilla/extensions/p3p/src/makefile.win
index c48f2902544..e23451dbd1f 100644
--- a/mozilla/extensions/p3p/src/makefile.win
+++ b/mozilla/extensions/p3p/src/makefile.win
@@ -74,31 +74,6 @@ CPP_OBJS     =                                  \
 		.\$(OBJDIR)\nsP3PSimpleEnumerator.obj   \
 		$(NULL)
 
-CPPSRCS      =                      \
-		nsP3PModule.cpp             \
-		nsP3PService.cpp            \
-		nsP3PUIService.cpp          \
-		nsP3PHTTPNotify.cpp         \
-		nsP3PObserverHTML.cpp       \
-		nsP3PObserverXML.cpp        \
-		nsP3PObserverUtils.cpp      \
-		nsP3PObserverLayout.cpp     \
-		nsP3PObserverFormSubmit.cpp \
-		nsP3PURIInformation.cpp     \
-		nsP3PReference.cpp          \
-		nsP3PXMLProcessor.cpp       \
-		nsP3PPoliycRefFile.cpp      \
-		nsP3PPolicy.cpp             \
-		nsP3PDataSchema.cpp         \
-		nsP3PPrivacyResult.cpp      \
-		nsP3PTags.cpp               \
-		nsP3PDataStruct.cpp         \
-		nsP3PXMLUtils.cpp           \
-		nsP3PPreferences.cpp        \
-		nsP3PUI.cpp                 \
-		nsP3PSimpleEnumerator.cpp   \
-		$(NULL)
-
 LLIBS        =                 \
 		$(LLIBS)               \
 		$(LIBNSPR)             \
diff --git a/mozilla/extensions/pics/src/makefile.win b/mozilla/extensions/pics/src/makefile.win
index 19432f8fa62..4d81feb7a37 100644
--- a/mozilla/extensions/pics/src/makefile.win
+++ b/mozilla/extensions/pics/src/makefile.win
@@ -37,11 +37,6 @@ CSRCS=				\
  lablpars.c	\
  $(NULL)
 
-CPPSRCS=				\
- nsPICS.cpp			\
- nsPICSElementObserver.cpp			\
- $(NULL)
-
 C_OBJS=				\
  .\$(OBJDIR)\cslabel.obj	\
  .\$(OBJDIR)\csparse.obj	\
diff --git a/mozilla/extensions/python/xpcom/src/loader/makefile.win b/mozilla/extensions/python/xpcom/src/loader/makefile.win
index 3a5ff3938f4..41c7a1f828d 100755
--- a/mozilla/extensions/python/xpcom/src/loader/makefile.win
+++ b/mozilla/extensions/python/xpcom/src/loader/makefile.win
@@ -35,10 +35,6 @@ CPP_OBJS= \
 	$(NULL)
 
 
-CPPSRCS = \
-	pyloader.cpp \
-	$(NULL)
-
 MODULE=pyloader
 EXPORTS= $(NULL)
 
diff --git a/mozilla/extensions/python/xpcom/src/makefile.win b/mozilla/extensions/python/xpcom/src/makefile.win
index 3c4cae54770..c43eeb66775 100755
--- a/mozilla/extensions/python/xpcom/src/makefile.win
+++ b/mozilla/extensions/python/xpcom/src/makefile.win
@@ -59,31 +59,6 @@ CPP_OBJS= \
 	.\$(OBJDIR)\xpcom.obj \
 	$(NULL)
     
-
-CPPSRCS = \
-	ErrorUtils.cpp \
-	PyGBase.cpp \
-	PyGModule.cpp \
-	PyGStub.cpp \
-	PyGInputStream.cpp \
-	PyGWeakReference.cpp \
-	PyIClassInfo.cpp \
-	PyIComponentManager.cpp \
-	PyIInputStream.cpp \
-	PyIEnumerator.cpp \
-	PyIID.cpp \
-	PyIInterfaceInfo.cpp \
-	PyIInterfaceInfoManager.cpp \
-	PyIServiceManager.cpp \
-	PyISimpleEnumerator.cpp \
-	PyISupports.cpp \
-	Pyxpt_info.cpp \
-	TypeObject.cpp \
-	VariantUtils.cpp \
-	dllmain.cpp \
-	xpcom.cpp \
-	$(NULL)
-
 MODULE=_xpcom
 EXPORTS= $(NULL)
 
diff --git a/mozilla/extensions/transformiix/build/makefile.win b/mozilla/extensions/transformiix/build/makefile.win
index 2da52e93d73..42519438c52 100644
--- a/mozilla/extensions/transformiix/build/makefile.win
+++ b/mozilla/extensions/transformiix/build/makefile.win
@@ -34,10 +34,6 @@ include <$(DEPTH)/config/config.mak>
 LIBRARY_NAME=transformiix
 MODULE_NAME=TransformiixModule
 
-CPPSRCS=						\
-	XSLTProcessorModule.cpp		\
-	$(NULL)
-
 CPP_OBJS=							\
 	..\source\base\$(OBJDIR)\ArrayList.obj \
 	..\source\base\$(OBJDIR)\Double.obj \
diff --git a/mozilla/extensions/transformiix/source/base/makefile.win b/mozilla/extensions/transformiix/source/base/makefile.win
index f55787f1ed1..345ff327e4a 100644
--- a/mozilla/extensions/transformiix/source/base/makefile.win
+++ b/mozilla/extensions/transformiix/source/base/makefile.win
@@ -30,30 +30,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES= $(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=				\
-	ArrayList.cpp 			\
-	Double.cpp			\
-	List.cpp			\
-	TxObjectWrapper.cpp		\
-	NamedMap.cpp			\
-	SimpleErrorObserver.cpp		\
-	Stack.cpp			\
-	Map.cpp				\
-	StringList.cpp			\
-	Tokenizer.cpp			\
-	txAtoms.cpp
-
-!ifndef TX_EXE
-CPPSRCS = $(CPPSRCS)			\
-	MozillaString.cpp		\
-	$(NULL)
-!else
-CPPSRCS = $(CPPSRCS)		\
-	CommandLineUtils.cpp	\
-	TxString.cpp			\
-	$(NULL)
-!endif
-
 CPP_OBJS=                                       \
 	.\$(OBJDIR)\ArrayList.obj 		\
 	.\$(OBJDIR)\Double.obj			\
diff --git a/mozilla/extensions/transformiix/source/net/makefile.win b/mozilla/extensions/transformiix/source/net/makefile.win
index e3c3b3447c6..865c4e3b367 100644
--- a/mozilla/extensions/transformiix/source/net/makefile.win
+++ b/mozilla/extensions/transformiix/source/net/makefile.win
@@ -30,10 +30,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES= $(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=		\
-	URIUtils.cpp 	\
-	$(NULL)
-
 CPP_OBJS=			\
 	.\$(OBJDIR)\URIUtils.obj \
 	$(NULL)
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
index 4e9de1a2979..03072500a17 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/makefile.win
@@ -31,27 +31,6 @@ REQUIRES	= string \
 
 include <$(DEPTH)/config/config.mak>
 
-CPPSRCS=				\
-	MozillaAttr.cpp			\
-	MozillaCDATASection.cpp		\
-	MozillaCharacterData.cpp	\
-	MozillaComment.cpp		\
-	MozillaDocument.cpp		\
-	MozillaDocumentFragment.cpp	\
-	MozillaDocumentType.cpp		\
-	MozillaDOMImplementation.cpp	\
-	MozillaElement.cpp		\
-	MozillaEntity.cpp		\
-	MozillaEntityReference.cpp	\
-	MozillaNamedNodeMap.cpp		\
-	MozillaNode.cpp			\
-	MozillaNodeList.cpp		\
-	MozillaNotation.cpp		\
-  MozillaObjectWrapper.cpp	\
-	MozillaProcInstruction.cpp	\
-	MozillaText.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\MozillaAttr.obj		\
 	.\$(OBJDIR)\MozillaCDATASection.obj	\
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win b/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
index 857e091e8eb..4e22eca06de 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/makefile.win
@@ -24,25 +24,6 @@ include <$(DEPTH)/config/config.mak>
 
 DEFINES=$(DEFINES) -DTX_EXE
 
-CPPSRCS=Attr.cpp \
-        CDATASection.cpp \
-        CharacterData.cpp \
-        Comment.cpp \
-        DOMImplementation.cpp \
-        Document.cpp \
-        DocumentFragment.cpp \
-        DocumentType.cpp \
-        Element.cpp \
-        Entity.cpp \
-        EntityReference.cpp \
-        NamedNodeMap.cpp \
-        NodeDefinition.cpp \
-        NodeListDefinition.cpp \
-        Notation.cpp \
-        ProcessingInstruction.cpp \
-        Text.cpp \
-	$(NULL)
-
 CPP_OBJS=					\
 	  .\$(OBJDIR)\Attr.obj \
         .\$(OBJDIR)\CDATASection.obj \
diff --git a/mozilla/extensions/transformiix/source/xml/makefile.win b/mozilla/extensions/transformiix/source/xml/makefile.win
index 11f0542db26..f7fc0ecdd25 100644
--- a/mozilla/extensions/transformiix/source/xml/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/makefile.win
@@ -36,11 +36,6 @@ DEFINES=$(DEFINES) -DTX_EXE
 DIRS = $(DIRS) printer
 !endif
 
-CPPSRCS=				\
-	XMLDOMUtils.cpp			\
-	XMLUtils.cpp			\
-	$(NULL)
-
 CPP_OBJS=				\
 	.\$(OBJDIR)\XMLDOMUtils.obj	\
 	.\$(OBJDIR)\XMLUtils.obj	\
diff --git a/mozilla/extensions/transformiix/source/xml/parser/makefile.win b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
index 4495c45e145..3d1600b2842 100644
--- a/mozilla/extensions/transformiix/source/xml/parser/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/parser/makefile.win
@@ -37,11 +37,6 @@ REQUIRES	= string \
 include <$(DEPTH)/config/config.mak>
 
 !ifndef TX_EXE
-CPPSRCS= 			\
-	nsSyncLoader.cpp	\
-	XMLParser.cpp	\
-	$(NULL)
-
 CPP_OBJS= 					\
 	.\$(OBJDIR)\nsSyncLoader.obj	\
 	.\$(OBJDIR)\XMLParser.obj	\
@@ -49,10 +44,6 @@ CPP_OBJS= 					\
 !else
 DEFINES=$(DEFINES) -DTX_EXE
 
-CPPSRCS= 			\
-	XMLParser.cpp	\
-	$(NULL)
-
 CPP_OBJS= 					\
 	.\$(OBJDIR)\XMLParser.obj	\
 	$(NULL)
diff --git a/mozilla/extensions/transformiix/source/xml/printer/makefile.win b/mozilla/extensions/transformiix/source/xml/printer/makefile.win
index 4c0c096fbe4..3bab61b6b82 100644
--- a/mozilla/extensions/transformiix/source/xml/printer/makefile.win
+++ b/mozilla/extensions/transformiix/source/xml/printer/makefile.win
@@ -26,12 +26,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=$(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=			\
-	XMLPrinter.cpp		\
-	HTMLPrinter.cpp		\
-	TEXTPrinter.cpp		\
-	$(NULL)
-
 CPP_OBJS=				\
 	.\$(OBJDIR)\XMLPrinter.obj	\
 	.\$(OBJDIR)\HTMLPrinter.obj	\
diff --git a/mozilla/extensions/transformiix/source/xpath/makefile.win b/mozilla/extensions/transformiix/source/xpath/makefile.win
index 7e48a11828f..ab7861437e7 100644
--- a/mozilla/extensions/transformiix/source/xpath/makefile.win
+++ b/mozilla/extensions/transformiix/source/xpath/makefile.win
@@ -33,48 +33,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=$(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=				\
-	AdditiveExpr.cpp		\
-	AttributeExpr.cpp		\
-	AttributeValueTemplate.cpp	\
-	BasicNodeExpr.cpp		\
-	BooleanExpr.cpp		        \
-	BooleanFunctionCall.cpp		\
-	BooleanResult.cpp		\
-	ElementExpr.cpp			\
-	ErrorFunctionCall.cpp		\
-	Expr.cpp			\
-	ExprLexer.cpp			\
-	ExprLexerChars.cpp		\
-	ExprParser.cpp			\
-	ExtensionFunctionCall.cpp	\
-	FilterExpr.cpp			\
-	FunctionCall.cpp		\
-	LocationStep.cpp		\
-	MultiplicativeExpr.cpp		\
-	NodeSet.cpp			\
-	NodeSetFunctionCall.cpp		\
-	NumberExpr.cpp			\
-	NumberFunctionCall.cpp		\
-	NumberResult.cpp		\
-	PathExpr.cpp			\
-	PredicateList.cpp		\
-	RelationalExpr.cpp		\
-	RootExpr.cpp			\
-	StringExpr.cpp			\
-	StringFunctionCall.cpp		\
-	StringResult.cpp		\
-	TextExpr.cpp			\
-	UnionExpr.cpp			\
-	UnaryExpr.cpp			\
-	VariableRefExpr.cpp		\
-	XPathNames.cpp			\
-!if !defined(TX_EXE)
-	nsNodeSet.cpp			\
-	XPathProcessor.cpp		\
-!endif
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\AdditiveExpr.obj			\
 	.\$(OBJDIR)\AttributeExpr.obj			\
diff --git a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
index 8d7855cac47..df35361cbdf 100644
--- a/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/functions/makefile.win
@@ -33,17 +33,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=$(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=					\
-	CurrentFunctionCall.cpp			\
-	DocumentFunctionCall.cpp		\
-	ElementAvailableFnCall.cpp		\
-	FunctionAvailableFnCall.cpp		\
-	GenerateIDFunctionCall.cpp		\
-	SystemPropertyFunctionCall.cpp		\
-	txFormatNumberFunctionCall.cpp		\
-	txKeyFunctionCall.cpp			\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\CurrentFunctionCall.obj			\
 	.\$(OBJDIR)\DocumentFunctionCall.obj		\
diff --git a/mozilla/extensions/transformiix/source/xslt/makefile.win b/mozilla/extensions/transformiix/source/xslt/makefile.win
index c6706a6c431..0020942a2ad 100644
--- a/mozilla/extensions/transformiix/source/xslt/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/makefile.win
@@ -37,15 +37,6 @@ DIRS=util functions
 DEFINES= $(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=					\
-	Names.cpp				\
-	Numbering.cpp				\
-	OutputFormat.cpp			\
-	ProcessorState.cpp			\
-	VariableBinding.cpp			\
-	XSLTProcessor.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\Names.obj			\
 	.\$(OBJDIR)\Numbering.obj		\
diff --git a/mozilla/extensions/transformiix/source/xslt/util/makefile.win b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
index fbd5284b001..07efc371fb5 100644
--- a/mozilla/extensions/transformiix/source/xslt/util/makefile.win
+++ b/mozilla/extensions/transformiix/source/xslt/util/makefile.win
@@ -34,12 +34,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=$(DEFINES) -DTX_EXE
 !endif
 
-CPPSRCS=			\
-	NodeStack.cpp		\
-	txNodeSorter.cpp	\
-	txXPathResultComparator.cpp \
-	$(NULL)
-
 CPP_OBJS=				\
 	.\$(OBJDIR)\NodeStack.obj	\
 	.\$(OBJDIR)\txNodeSorter.obj	\
diff --git a/mozilla/extensions/wallet/src/makefile.win b/mozilla/extensions/wallet/src/makefile.win
index 940790e555a..b5b38d077e4 100644
--- a/mozilla/extensions/wallet/src/makefile.win
+++ b/mozilla/extensions/wallet/src/makefile.win
@@ -53,15 +53,6 @@ CPP_OBJS= .\$(OBJDIR)\wallet.obj		\
 	.\$(OBJDIR)\nsBasicStreamGenerator.obj		\
 	$(NULL)
 
-CPPSRCS = \
-	nsWalletFactory.cpp		\
-	nsWalletService.cpp		\
-	wallet.cpp			\
-	singsign.cpp			\
-	nsPassword.cpp			\
-	nsPasswordManager.cpp		\
-	$(NULL)
-
 MODULE=wallet
 EXPORTS= $(NULL)
 
diff --git a/mozilla/extensions/xmlextras/base/src/makefile.win b/mozilla/extensions/xmlextras/base/src/makefile.win
index a8c1763c9cd..63dbe5e260d 100644
--- a/mozilla/extensions/xmlextras/base/src/makefile.win
+++ b/mozilla/extensions/xmlextras/base/src/makefile.win
@@ -42,14 +42,6 @@ REQUIRES	= xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-	nsDOMSerializer.cpp			\
-	nsXMLHttpRequest.cpp			\
-	nsDOMParser.cpp				\
-	nsLoadListenerProxy.cpp				\
-	$(NULL)
-
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsDOMSerializer.obj		\
 	.\$(OBJDIR)\nsXMLHttpRequest.obj	\
diff --git a/mozilla/extensions/xmlextras/proxy/src/makefile.win b/mozilla/extensions/xmlextras/proxy/src/makefile.win
index 579c682757e..4abbfcc0c83 100755
--- a/mozilla/extensions/xmlextras/proxy/src/makefile.win
+++ b/mozilla/extensions/xmlextras/proxy/src/makefile.win
@@ -38,13 +38,6 @@ REQUIRES = xpcom \
 	   necko \
 	   $(NULL)
 
-CPPSRCS=					\
-	wspproxy.cpp				\
-	wspfactory.cpp				\
-	wspcomplextypewrapper.cpp		\
-	wsppropertybagwrapper.cpp		\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\wspproxy.obj		\
 	.\$(OBJDIR)\wspfactory.obj		\
diff --git a/mozilla/extensions/xmlextras/schema/src/makefile.win b/mozilla/extensions/xmlextras/schema/src/makefile.win
index c6b4d310270..1ca93a365b8 100644
--- a/mozilla/extensions/xmlextras/schema/src/makefile.win
+++ b/mozilla/extensions/xmlextras/schema/src/makefile.win
@@ -50,16 +50,6 @@ REQUIRES = xpcom \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-	nsSchema.cpp				\
-	nsSchemaComponentBase.cpp		\
-	nsSchemaSimpleTypes.cpp			\
-	nsSchemaComplexType.cpp			\
-	nsSchemaParticles.cpp			\
-	nsSchemaAttributes.cpp			\
-	nsSchemaLoader.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsSchema.obj		\
 	.\$(OBJDIR)\nsSchemaComponentBase.obj	\
diff --git a/mozilla/extensions/xmlextras/wsdl/src/makefile.win b/mozilla/extensions/xmlextras/wsdl/src/makefile.win
index 6b79565f300..4d021aec156 100644
--- a/mozilla/extensions/xmlextras/wsdl/src/makefile.win
+++ b/mozilla/extensions/xmlextras/wsdl/src/makefile.win
@@ -38,12 +38,6 @@ REQUIRES = xpcom \
 	   necko \
 	   $(NULL)
 
-CPPSRCS=					\
-	nsWSDLLoader.cpp			\
-	nsWSDLDefinitions.cpp			\
-	nsWSDLInterfaceInfo.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsWSDLLoader.obj		\
 	.\$(OBJDIR)\nsWSDLDefinitions.obj	\
diff --git a/mozilla/gfx/src/makefile.win b/mozilla/gfx/src/makefile.win
index 0a8390207f3..09ae4306f6e 100644
--- a/mozilla/gfx/src/makefile.win
+++ b/mozilla/gfx/src/makefile.win
@@ -25,16 +25,16 @@ DIRS = windows
 
 MODULE=gfx
 
-REQUIRES= 	xpcom \
-			string \
-			widget \
+REQUIRES=   xpcom \
+            string \
+            widget \
             locale \
             view \
             pref \
             gfx2 \
-			imglib2 \
-			unicharutil \
-			$(NULL)
+            imglib2 \
+            unicharutil \
+            $(NULL)
 
 include <$(DEPTH)\config\config.mak>
 
@@ -45,18 +45,18 @@ EXPORT_LIBRARY=1
 
 DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=nsColor.cpp nsColorNames.cpp nsFont.cpp nsFontList.cpp \
-    nsRect.cpp nsTransform2D.cpp nsBlender.cpp \
-	nsDeviceContext.cpp nsScriptableRegion.cpp nsPrintOptionsImpl.cpp
-
-CPP_OBJS=.\$(OBJDIR)\nsColor.obj .\$(OBJDIR)\nsColorNames.obj \
-    .\$(OBJDIR)\nsFont.obj .\$(OBJDIR)\nsFontList.obj \
-    .\$(OBJDIR)\nsRect.obj .\$(OBJDIR)\nsTransform2D.obj \
-    .\$(OBJDIR)\nsDeviceContext.obj \
-	.\$(OBJDIR)\nsBlender.obj \
-  .\$(OBJDIR)\nsRenderingContextImpl.obj\
-	.\$(OBJDIR)\nsScriptableRegion.obj\
-  .\$(OBJDIR)\nsPrintOptionsImpl.obj
+CPP_OBJS=.\$(OBJDIR)\nsColor.obj \
+         .\$(OBJDIR)\nsColorNames.obj \
+         .\$(OBJDIR)\nsFont.obj \
+         .\$(OBJDIR)\nsFontList.obj \
+         .\$(OBJDIR)\nsRect.obj \
+         .\$(OBJDIR)\nsTransform2D.obj \
+         .\$(OBJDIR)\nsDeviceContext.obj \
+	 .\$(OBJDIR)\nsBlender.obj \
+         .\$(OBJDIR)\nsRenderingContextImpl.obj \
+	 .\$(OBJDIR)\nsScriptableRegion.obj \
+         .\$(OBJDIR)\nsPrintOptionsImpl.obj \
+         $(NULL)
 
 
 LCFLAGS = \
@@ -67,7 +67,7 @@ LCFLAGS = \
 LLIBS=				                \
         $(DIST)\lib\util.lib                    \
         $(DIST)\lib\xpcom.lib	                \
-		$(DIST)\lib\unicharutil_s.lib			\
+        $(DIST)\lib\unicharutil_s.lib           \
         $(LIBNSPR)  
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mozilla/htmlparser/robot/makefile.win b/mozilla/htmlparser/robot/makefile.win
index 7d71327beca..77814d232b6 100644
--- a/mozilla/htmlparser/robot/makefile.win
+++ b/mozilla/htmlparser/robot/makefile.win
@@ -45,11 +45,6 @@ LLIBS=				\
 !endif
  $(NULL)
 
-CPPSRCS=			\
- nsRobotSink.cpp		\
- nsDebugRobot.cpp		\
- $(NULL)
-
 CPP_OBJS=			\
  .\$(OBJDIR)\nsRobotSink.obj	\
  .\$(OBJDIR)\nsDebugRobot.obj  \
diff --git a/mozilla/htmlparser/robot/test/makefile.win b/mozilla/htmlparser/robot/test/makefile.win
index f908d8805f1..2b49ae7c594 100644
--- a/mozilla/htmlparser/robot/test/makefile.win
+++ b/mozilla/htmlparser/robot/test/makefile.win
@@ -39,12 +39,9 @@ WIN_LIBS= shell32.lib
 
 LLFLAGS=-SUBSYSTEM:CONSOLE
 
-CPPSRCS=			\
- RobotMain.cpp			\
- $(NULL)
-
 CPP_OBJS=			\
- .\$(OBJDIR)\RobotMain.obj
+ .\$(OBJDIR)\RobotMain.obj      \
+ $(NULL)
 
 LINCS=-I.. 
 
diff --git a/mozilla/htmlparser/src/makefile.win b/mozilla/htmlparser/src/makefile.win
index 4e603971e05..bf868a6c0f0 100644
--- a/mozilla/htmlparser/src/makefile.win
+++ b/mozilla/htmlparser/src/makefile.win
@@ -43,32 +43,6 @@ DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD
 LIBRARY_NAME   = gkparser
 MODULE_NAME	   = nsParserModule
 
-CPPSRCS =               \
-	nsDTDUtils.cpp      \
-	nsHTMLTokenizer.cpp \
-	nsExpatTokenizer.cpp\
-	nsElementTable.cpp  \
-	CNavDTD.cpp         \
-	COtherDTD.cpp       \
-	nsHTMLEntities.cpp  \
-	nsHTMLTags.cpp      \
-	nsHTMLTokens.cpp    \
-	nsParser.cpp        \
-	CParserContext.cpp  \
-	nsParserNode.cpp    \
-	nsScanner.cpp       \
-	nsToken.cpp         \
-	nsWellFormedDTD.cpp \
-	nsViewSourceHTML.cpp\
-	nsParserService.cpp \
-	nsParserModule.cpp  \
-	nsParserMsgUtils.cpp  \
-!ifdef MOZ_DEBUG
-	nsLoggingSink.cpp   \
-	nsHTMLNullSink.cpp  \
-!endif
-	$(NULL)
-
 CPP_OBJS =                          \
 	.\$(OBJDIR)\nsDTDUtils.obj      \
 	.\$(OBJDIR)\nsHTMLTokenizer.obj \
diff --git a/mozilla/intl/chardet/src/classic/makefile.win b/mozilla/intl/chardet/src/classic/makefile.win
index 7a03abd44c7..e73b55238e8 100644
--- a/mozilla/intl/chardet/src/classic/makefile.win
+++ b/mozilla/intl/chardet/src/classic/makefile.win
@@ -36,11 +36,6 @@ OBJS= \
 CSRCS= \
 	$(NULL)
 
-CPPSRCS= \
-         nsClassicCharDetDll.cpp \
-         nsClassicDetectors.cpp \
-	$(NULL)
-
 CPP_OBJS= \
         .\$(OBJDIR)\nsClassicCharDetDll.obj \
         .\$(OBJDIR)\nsClassicDetectors.obj \
diff --git a/mozilla/intl/chardet/src/makefile.win b/mozilla/intl/chardet/src/makefile.win
index 0a6fe209ec8..0e4c67f564c 100644
--- a/mozilla/intl/chardet/src/makefile.win
+++ b/mozilla/intl/chardet/src/makefile.win
@@ -32,18 +32,6 @@ OBJS= \
 CSRCS= \
 	$(NULL)
 
-CPPSRCS= \
-         nsCharDetModule.cpp \
-         nsMetaCharsetObserver.cpp \
-         nsXMLEncodingObserver.cpp \
-         nsObserverBase.cpp \
-         nsDetectionAdaptor.cpp \
-         nsDebugDetector.cpp \
-         nsPSMDetectors.cpp \
-         nsCyrillicDetector.cpp \
-         nsDocumentCharsetInfo.cpp \
-	$(NULL)
-
 CPP_OBJS= \
         .\$(OBJDIR)\nsCharDetModule.obj \
         .\$(OBJDIR)\nsMetaCharsetObserver.obj \
diff --git a/mozilla/intl/chardet/src/windows/makefile.win b/mozilla/intl/chardet/src/windows/makefile.win
index 42b6bd577dd..7f30c3cd026 100644
--- a/mozilla/intl/chardet/src/windows/makefile.win
+++ b/mozilla/intl/chardet/src/windows/makefile.win
@@ -36,11 +36,6 @@ OBJS= \
 CSRCS= \
 	$(NULL)
 
-CPPSRCS= \
-         nsNativeCharDetDll.cpp \
-         nsNativeDetectors.cpp \
-	$(NULL)
-
 CPP_OBJS= \
         .\$(OBJDIR)\nsNativeCharDetDll.obj \
         .\$(OBJDIR)\nsNativeDetectors.obj \
diff --git a/mozilla/intl/compatibility/src/makefile.win b/mozilla/intl/compatibility/src/makefile.win
index 33bb9a72dfc..3399b8a6a80 100644
--- a/mozilla/intl/compatibility/src/makefile.win
+++ b/mozilla/intl/compatibility/src/makefile.win
@@ -27,11 +27,6 @@ DEFINES= -DWIN32_LEAN_AND_MEAN
 LIBRARY_NAME= intlcmpt 
 
 
-CPPSRCS= \
-	nsI18nCompatibility.cpp \
-	nsCSIDtoCharsetName.cpp \
-	$(NULL)
-
 CPP_OBJS= \
 	.\$(OBJDIR)\nsI18nCompatibility.obj \
 	.\$(OBJDIR)\nsCSIDtoCharsetName.obj \
diff --git a/mozilla/intl/lwbrk/src/makefile.win b/mozilla/intl/lwbrk/src/makefile.win
index afd3bf5e250..39c71ea0e29 100644
--- a/mozilla/intl/lwbrk/src/makefile.win
+++ b/mozilla/intl/lwbrk/src/makefile.win
@@ -34,13 +34,6 @@ CSRCS= \
         rulebrk.c \
 	$(NULL)
 
-CPPSRCS= \
-	nsJISx4501LineBreaker.cpp \
-	nsLWBreakerFImp.cpp \
-	nsLWBrkModule.cpp \
-	nsSampleWordBreaker.cpp \
-	$(NULL)
-
 CPP_OBJS= \
 	.\$(OBJDIR)\nsJISx4501LineBreaker.obj \
 	.\$(OBJDIR)\nsLWBreakerFImp.obj \
diff --git a/mozilla/intl/strres/src/makefile.win b/mozilla/intl/strres/src/makefile.win
index cc020bfb084..94c7ac38739 100644
--- a/mozilla/intl/strres/src/makefile.win
+++ b/mozilla/intl/strres/src/makefile.win
@@ -30,10 +30,6 @@ include <$(DEPTH)\config\config.mak>
 
 LIBRARY_NAME=strres
 
-CPPSRCS =				\
-	nsStringBundle.cpp		\
-	$(NULL)
-
 CPP_OBJS =					\
 	.\$(OBJDIR)\nsStringBundle.obj		\
 	$(NULL)
diff --git a/mozilla/intl/uconv/src/makefile.win b/mozilla/intl/uconv/src/makefile.win
index 3a29f1c0e47..17e96897eb3 100644
--- a/mozilla/intl/uconv/src/makefile.win
+++ b/mozilla/intl/uconv/src/makefile.win
@@ -35,29 +35,6 @@ DEFINES=-D_IMPL_NS_INTL -DWIN32_LEAN_AND_MEAN
 LIBRARY_NAME=uconv
 MODULE_NAME=nsUConvModule
 
-CPPSRCS =				\
-	nsTextToSubURI.cpp		\
-	nsCharsetConverterManager.cpp	\
-	nsUnicodeDecodeHelper.cpp	\
-	nsUnicodeEncodeHelper.cpp	\
-	nsWinCharset.cpp		\
-	nsCharsetAliasImp.cpp		\
-	nsUConvModule.cpp		\
-	nsMappingCache.cpp		\
-	nsURLProperties.cpp		\
-	nsISO88591ToUnicode.cpp     \
-	nsCP1252ToUnicode.cpp     \
-	nsMacRomanToUnicode.cpp     \
-	nsUTF8ToUnicode.cpp     \
-	nsUnicodeToISO88591.cpp     \
-	nsUnicodeToCP1252.cpp     \
-	nsUnicodeToMacRoman.cpp     \
-	nsUnicodeToUTF8.cpp     \
-	nsUCvMinSupport.cpp		\
-	nsScriptableUConv.cpp	\
-	nsConverterInputStream.cpp   \
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsTextToSubURI.obj			\
 	.\$(OBJDIR)\nsCharsetConverterManager.obj 	\
diff --git a/mozilla/intl/uconv/ucvcn/makefile.win b/mozilla/intl/uconv/ucvcn/makefile.win
index 10540396416..30c652a7c5f 100644
--- a/mozilla/intl/uconv/ucvcn/makefile.win
+++ b/mozilla/intl/uconv/ucvcn/makefile.win
@@ -30,24 +30,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvcn
 MODULE_NAME=nsUCvCnModule
 
-CPPSRCS =				\
-	nsGB2312ToUnicodeV2.cpp		\
-	nsUnicodeToGB2312V2.cpp		\
-	nsUnicodeToGB2312GL.cpp		\
-	nsGBKToUnicode.cpp		\
-	nsUnicodeToGBKNoAscii.cpp	\
-	nsUnicodeToGBK.cpp		\
-	nsISO2022CNToUnicode.cpp		\
-	nsUnicodeToISO2022CN.cpp		\
-	nsHZToUnicode.cpp		\
-	nsUnicodeToHZ.cpp		\
-	nsCP936ToUnicode.cpp		\
-	nsUnicodeToCP936.cpp		\
-	nsUCvCnSupport.cpp		\
-	nsUCvCnModule.cpp			\
-	nsGBKConvUtil.cpp			\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsGB2312ToUnicodeV2.obj 		\
 	.\$(OBJDIR)\nsUnicodeToGB2312V2.obj		\
diff --git a/mozilla/intl/uconv/ucvibm/makefile.win b/mozilla/intl/uconv/ucvibm/makefile.win
index 123daf6ee92..6b248800e3b 100644
--- a/mozilla/intl/uconv/ucvibm/makefile.win
+++ b/mozilla/intl/uconv/ucvibm/makefile.win
@@ -42,25 +42,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvibm
 MODULE_NAME=nsUCvIBMModule
 
-CPPSRCS =				\
-	nsCP850ToUnicode.cpp		\
-	nsCP852ToUnicode.cpp		\
-	nsCP855ToUnicode.cpp		\
-	nsCP857ToUnicode.cpp		\
-	nsCP862ToUnicode.cpp		\
-	nsCP864ToUnicode.cpp		\
-	nsCP864iToUnicode.cpp		\
-	nsUnicodeToCP850.cpp		\
-	nsUnicodeToCP852.cpp		\
-	nsUnicodeToCP855.cpp		\
-	nsUnicodeToCP857.cpp		\
-	nsUnicodeToCP862.cpp		\
-	nsUnicodeToCP864.cpp		\
-	nsUnicodeToCP864i.cpp		\
-	nsUCvIBMSupport.cpp		\
-	nsUCvIBMModule.cpp		\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsCP850ToUnicode.obj 		\
 	.\$(OBJDIR)\nsCP852ToUnicode.obj 		\
diff --git a/mozilla/intl/uconv/ucvja/makefile.win b/mozilla/intl/uconv/ucvja/makefile.win
index 12e5a7cd2f7..f169a522b1f 100644
--- a/mozilla/intl/uconv/ucvja/makefile.win
+++ b/mozilla/intl/uconv/ucvja/makefile.win
@@ -30,20 +30,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvja
 MODULE_NAME=nsUCvJAModule
 
-CPPSRCS =				\
-	nsJapaneseToUnicode.cpp		\
-	nsUnicodeToSJIS.cpp		\
-	nsCP932ToUnicode.cpp		\
-	nsUnicodeToCP932.cpp		\
-	nsUCvJaSupport.cpp		\
-	nsUCvJaModule.cpp			\
-        nsUnicodeToEUCJP.cpp            \
-        nsUnicodeToJISx0201.cpp         \
-        nsUnicodeToJISx0208.cpp         \
-        nsUnicodeToJISx0212.cpp         \
-        nsUnicodeToISO2022JP.cpp        \
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsJapaneseToUnicode.obj 			\
 	.\$(OBJDIR)\nsUnicodeToSJIS.obj			\
diff --git a/mozilla/intl/uconv/ucvko/makefile.win b/mozilla/intl/uconv/ucvko/makefile.win
index d333553eab0..295f44fd98d 100644
--- a/mozilla/intl/uconv/ucvko/makefile.win
+++ b/mozilla/intl/uconv/ucvko/makefile.win
@@ -30,22 +30,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvko
 MODULE_NAME=nsUCvKoModule
 
-CPPSRCS =				\
-	nsEUCKRToUnicode.cpp		\
-	nsUnicodeToEUCKR.cpp		\
-	nsUnicodeToKSC5601.cpp		\
-	nsISO2022KRToUnicode.cpp		\
-	nsUnicodeToISO2022KR.cpp		\
-	nsCP949ToUnicode.cpp		\
-	nsUnicodeToCP949.cpp		\
-	nsUnicodeToX11Johab.cpp		\
-	nsJohabToUnicode.cpp	\
-	nsUnicodeToJohab.cpp	\
-	nsUnicodeToJohabNoAscii.cpp	\
-	nsUCvKOSupport.cpp		\
-	nsUCvKoModule.cpp			\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsEUCKRToUnicode.obj 		\
 	.\$(OBJDIR)\nsUnicodeToEUCKR.obj		\
diff --git a/mozilla/intl/uconv/ucvlatin/makefile.win b/mozilla/intl/uconv/ucvlatin/makefile.win
index 93d7376e7c2..6c837e62088 100644
--- a/mozilla/intl/uconv/ucvlatin/makefile.win
+++ b/mozilla/intl/uconv/ucvlatin/makefile.win
@@ -30,135 +30,6 @@ REQUIRES	= xpcom \
 		  string \
 		  $(NULL)
 
-CPPSRCS =				\
-	nsUEscapeToUnicode.cpp		\
-	nsAsciiToUnicode.cpp		\
-	nsISO88592ToUnicode.cpp		\
-	nsISO88593ToUnicode.cpp		\
-	nsISO88594ToUnicode.cpp		\
-	nsISO88595ToUnicode.cpp		\
-	nsISO88596ToUnicode.cpp		\
-	nsISO88596EToUnicode.cpp		\
-	nsISO88596IToUnicode.cpp		\
-	nsISO88597ToUnicode.cpp		\
-	nsISO88598ToUnicode.cpp		\
-	nsISO88598EToUnicode.cpp		\
-	nsISO88598IToUnicode.cpp		\
-	nsISO88599ToUnicode.cpp		\
-	nsISO885910ToUnicode.cpp	\
-	nsISO885913ToUnicode.cpp	\
-	nsISO885914ToUnicode.cpp	\
-	nsISO885915ToUnicode.cpp	\
-	nsISO885916ToUnicode.cpp	\
-	nsISOIR111ToUnicode.cpp	\
-	nsCP1250ToUnicode.cpp		\
-	nsCP1251ToUnicode.cpp		\
-	nsCP1253ToUnicode.cpp		\
-	nsCP1254ToUnicode.cpp		\
-	nsCP1255ToUnicode.cpp		\
-	nsCP1256ToUnicode.cpp		\
-	nsCP1257ToUnicode.cpp		\
-	nsCP1258ToUnicode.cpp		\
-	nsCP874ToUnicode.cpp		\
-	nsCP866ToUnicode.cpp		\
-	nsKOI8UToUnicode.cpp		\
-	nsKOI8RToUnicode.cpp		\
-	nsMacCEToUnicode.cpp		\
-	nsMacGreekToUnicode.cpp		\
-	nsMacTurkishToUnicode.cpp	\
-	nsMacCroatianToUnicode.cpp	\
-	nsMacRomanianToUnicode.cpp	\
-	nsMacCyrillicToUnicode.cpp	\
-	nsMacUkrainianToUnicode.cpp	\
-	nsMacIcelandicToUnicode.cpp	\
-	nsMacArabicToUnicode.cpp	\
-	nsMacDevanagariToUnicode.cpp	\
-	nsMacGujaratiToUnicode.cpp	\
-	nsMacGurmukhiToUnicode.cpp	\
-	nsMacHebrewToUnicode.cpp	\
-	nsMacFarsiToUnicode.cpp		\
-	nsGEOSTD8ToUnicode.cpp		\
-	nsARMSCII8ToUnicode.cpp		\
-	nsTCVN5712ToUnicode.cpp		\
-	nsVISCIIToUnicode.cpp		\
-	nsVPSToUnicode.cpp		\
-	nsVIQRToUnicode.cpp		\
-	nsVNIToUnicode.cpp		\
-	nsUTF7ToUnicode.cpp		\
-	nsMUTF7ToUnicode.cpp		\
-	nsUCS2BEToUnicode.cpp		\
-	nsUCS2LEToUnicode.cpp		\
-	nsUCS4BEToUnicode.cpp		\
-	nsUCS4LEToUnicode.cpp		\
-	nsT61ToUnicode.cpp		\
-	nsUserDefinedToUnicode.cpp		\
-	nsUnicodeToUEscape.cpp		\
-	nsUnicodeToAscii.cpp		\
-	nsUnicodeToISO88592.cpp		\
-	nsUnicodeToISO88593.cpp		\
-	nsUnicodeToISO88594.cpp		\
-	nsUnicodeToISO88595.cpp		\
-	nsUnicodeToISO88596.cpp		\
-	nsUnicodeToISO88596E.cpp		\
-	nsUnicodeToISO88596I.cpp		\
-	nsUnicodeToISO88597.cpp		\
-	nsUnicodeToISO88598.cpp		\
-	nsUnicodeToISO88598E.cpp		\
-	nsUnicodeToISO88598I.cpp		\
-	nsUnicodeToISO88599.cpp		\
-	nsUnicodeToISO885910.cpp	\
-	nsUnicodeToISO885913.cpp	\
-	nsUnicodeToISO885914.cpp	\
-	nsUnicodeToISO885915.cpp	\
-	nsUnicodeToISO885916.cpp	\
-	nsUnicodeToISOIR111.cpp	\
-	nsUnicodeToCP1250.cpp		\
-	nsUnicodeToCP1251.cpp		\
-	nsUnicodeToCP1253.cpp		\
-	nsUnicodeToCP1254.cpp		\
-	nsUnicodeToCP1255.cpp		\
-	nsUnicodeToCP1256.cpp		\
-	nsUnicodeToCP1257.cpp		\
-	nsUnicodeToCP1258.cpp		\
-	nsUnicodeToCP874.cpp		\
-	nsUnicodeToCP866.cpp		\
-	nsUnicodeToKOI8R.cpp		\
-	nsUnicodeToKOI8U.cpp		\
-	nsUnicodeToMacCE.cpp		\
-	nsUnicodeToMacGreek.cpp		\
-	nsUnicodeToMacTurkish.cpp	\
-	nsUnicodeToMacCroatian.cpp	\
-	nsUnicodeToMacRomanian.cpp	\
-	nsUnicodeToMacCyrillic.cpp	\
-	nsUnicodeToMacUkrainian.cpp	\
-	nsUnicodeToMacIcelandic.cpp	\
-	nsUnicodeToMacArabic.cpp	\
-	nsUnicodeToMacDevanagari.cpp	\
-	nsUnicodeToMacGujarati.cpp	\
-	nsUnicodeToMacGurmukhi.cpp	\
-	nsUnicodeToMacHebrew.cpp	\
-	nsUnicodeToMacFarsi.cpp		\
-	nsUnicodeToUTF7.cpp		\
-	nsUnicodeToMUTF7.cpp		\
-	nsUnicodeToUCS2BE.cpp		\
-	nsUnicodeToUCS2LE.cpp		\
-	nsUnicodeToUCS4BE.cpp		\
-	nsUnicodeToUCS4LE.cpp		\
-	nsUnicodeToT61.cpp		\
-	nsUnicodeToGEOSTD8.cpp		\
-	nsUnicodeToARMSCII8.cpp		\
-	nsUnicodeToTCVN5712.cpp		\
-	nsUnicodeToVISCII.cpp		\
-	nsUnicodeToVPS.cpp		\
-	nsUnicodeToVIQR.cpp		\
-	nsUnicodeToVNI.cpp		\
-	nsUnicodeToUserDefined.cpp		\
-	nsUnicodeToSymbol.cpp		\
-	nsUnicodeToZapfDingbat.cpp		\
-	nsUCvLatinSupport.cpp		\
-	nsUCvLatinModule.cpp		\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsUEscapeToUnicode.obj 		\
 	.\$(OBJDIR)\nsAsciiToUnicode.obj 		\
diff --git a/mozilla/intl/uconv/ucvmath/makefile.win b/mozilla/intl/uconv/ucvmath/makefile.win
index 75709dc40d3..4fe0cdc3a75 100644
--- a/mozilla/intl/uconv/ucvmath/makefile.win
+++ b/mozilla/intl/uconv/ucvmath/makefile.win
@@ -31,21 +31,6 @@ REQUIRES         =	xpcom \
                     string \
                     $(NULL)
 
-CPPSRCS =				\
-	nsUnicodeToTeXCMRttf.cpp 	\
-	nsUnicodeToTeXCMMIttf.cpp 	\
-	nsUnicodeToTeXCMSYttf.cpp 	\
-	nsUnicodeToTeXCMEXttf.cpp 	\
-	nsUnicodeToMathematica1.cpp 	\
-	nsUnicodeToMathematica2.cpp 	\
-	nsUnicodeToMathematica3.cpp 	\
-	nsUnicodeToMathematica4.cpp 	\
-	nsUnicodeToMathematica5.cpp 	\
-	nsUnicodeToMTExtra.cpp 	\
-	nsUCvMathSupport.cpp		\
-	nsUCvMathModule.cpp		\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsUnicodeToTeXCMRttf.obj		\
 	.\$(OBJDIR)\nsUnicodeToTeXCMMIttf.obj		\
diff --git a/mozilla/intl/uconv/ucvtw/makefile.win b/mozilla/intl/uconv/ucvtw/makefile.win
index 3553f3e5eb6..d324c1a1c66 100644
--- a/mozilla/intl/uconv/ucvtw/makefile.win
+++ b/mozilla/intl/uconv/ucvtw/makefile.win
@@ -30,19 +30,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvtw
 MODULE_NAME=nsUCvTWModule
 
-CPPSRCS =				\
-	nsBIG5ToUnicode.cpp		\
-	nsUnicodeToBIG5.cpp		\
-	nsBIG5HKSCSToUnicode.cpp		\
-	nsUnicodeToBIG5HKSCS.cpp		\
-	nsUnicodeToHKSCS.cpp		\
-	nsCP950ToUnicode.cpp		\
-	nsUnicodeToCP950.cpp		\
-	nsUnicodeToBIG5NoAscii.cpp		\
-	nsUCvTWSupport.cpp		\
-	nsUCvTwModule.cpp			\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsBIG5ToUnicode.obj 		\
 	.\$(OBJDIR)\nsUnicodeToBIG5.obj			\
diff --git a/mozilla/intl/uconv/ucvtw2/makefile.win b/mozilla/intl/uconv/ucvtw2/makefile.win
index c4f521ad878..bb135e31680 100644
--- a/mozilla/intl/uconv/ucvtw2/makefile.win
+++ b/mozilla/intl/uconv/ucvtw2/makefile.win
@@ -30,20 +30,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=ucvtw2
 MODULE_NAME=nsUCvTW2Module
 
-CPPSRCS =				\
-	nsEUCTWToUnicode.cpp		\
-	nsUnicodeToEUCTW.cpp		\
-	nsUnicodeToCNS11643p1.cpp		\
-	nsUnicodeToCNS11643p2.cpp		\
-	nsUnicodeToCNS11643p3.cpp		\
-	nsUnicodeToCNS11643p4.cpp		\
-	nsUnicodeToCNS11643p5.cpp		\
-	nsUnicodeToCNS11643p6.cpp		\
-	nsUnicodeToCNS11643p7.cpp		\
-	nsUCvTW2Support.cpp		\
-	nsUCvTw2Module.cpp			\
-	$(NULL)
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsEUCTWToUnicode.obj 		\
 	.\$(OBJDIR)\nsUnicodeToEUCTW.obj		\
diff --git a/mozilla/intl/unicharutil/src/makefile.win b/mozilla/intl/unicharutil/src/makefile.win
index 9d1a37ed6fd..cd99cc989f7 100644
--- a/mozilla/intl/unicharutil/src/makefile.win
+++ b/mozilla/intl/unicharutil/src/makefile.win
@@ -39,19 +39,6 @@ OBJS= \
 CSRCS= \
 	$(NULL)
 
-CPPSRCS= \
-	nsCategoryImp.cpp	\
-	nsCaseConversionImp2.cpp	\
-	nsUcharUtilModule.cpp	\
-	nsHankakuToZenkaku.cpp	\
-	nsEntityConverter.cpp	\
-	nsSaveAsCharset.cpp	\
-!ifdef IBMBIDI
-	nsBidiUtilsImp.cpp \
-	nsBidiImp.cpp \
-!endif
-	$(NULL)
-
 CPP_OBJS= \
 	.\$(OBJDIR)\nsCategoryImp.obj \
 	.\$(OBJDIR)\nsCaseConversionImp2.obj \
diff --git a/mozilla/layout/build/makefile.win b/mozilla/layout/build/makefile.win
index f7b5bccd0ff..f260407e5bd 100644
--- a/mozilla/layout/build/makefile.win
+++ b/mozilla/layout/build/makefile.win
@@ -38,8 +38,6 @@ DEFINES=-D_IMPL_NS_HTML
 LIBRARY_NAME=gklayout
 MODULE_NAME=nsLayoutModule
 
-CPPSRCS=dlldeps.cpp nsLayoutDLF.cpp nsLayoutFactory.cpp
-
 CPP_OBJS=				\
 	.\$(OBJDIR)\dlldeps.obj		\
 	.\$(OBJDIR)\nsLayoutModule.obj	\
diff --git a/mozilla/layout/html/document/src/makefile.win b/mozilla/layout/html/document/src/makefile.win
index 23410f40fc9..11d8ef97288 100644
--- a/mozilla/layout/html/document/src/makefile.win
+++ b/mozilla/layout/html/document/src/makefile.win
@@ -49,11 +49,6 @@ DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 DEFINES = $(DEFINES) -DXP_NEW_SELECTION
 !endif
 
-CPPSRCS=					\
-	nsFrameFrame.cpp				\
-	nsFrameSetFrame.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsFrameFrame.obj		\
 	.\$(OBJDIR)\nsFrameSetFrame.obj		\
diff --git a/mozilla/layout/html/forms/src/makefile.win b/mozilla/layout/html/forms/src/makefile.win
index 4a413fb58cc..43f8815cb79 100644
--- a/mozilla/layout/html/forms/src/makefile.win
+++ b/mozilla/layout/html/forms/src/makefile.win
@@ -52,26 +52,6 @@ REQUIRES	= xpcom \
 		  content_xul \
 		  $(NULL)
 
-CPPSRCS= \
-  nsFormControlHelper.cpp \
-  nsComboboxControlFrame.cpp \
-  nsListControlFrame.cpp \
-  nsFormFrame.cpp \
-  nsFormControlFrame.cpp \
-  nsFileControlFrame.cpp \
-  nsGfxTextControlFrame2.cpp \
-  nsFieldSetFrame.cpp \
-  nsLegendFrame.cpp \
-  nsHTMLButtonControlFrame.cpp \
-  nsLabelFrame.cpp \
-  nsButtonFrameRenderer.cpp \
-  nsImageControlFrame.cpp \
-  nsGfxButtonControlFrame.cpp \
-  nsGfxCheckboxControlFrame.cpp \
-  nsGfxRadioControlFrame.cpp \
-  nsIsIndexFrame.cpp \
-  nsRadioControlGroup.cpp
-
 CPP_OBJS= \
   .\$(OBJDIR)\nsFormControlHelper.obj \
   .\$(OBJDIR)\nsComboboxControlFrame.obj \
diff --git a/mozilla/layout/html/table/src/makefile.win b/mozilla/layout/html/table/src/makefile.win
index 5b6757ac82e..64cf28a9d19 100644
--- a/mozilla/layout/html/table/src/makefile.win
+++ b/mozilla/layout/html/table/src/makefile.win
@@ -42,28 +42,18 @@ DEFINES		=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN -DoffDEBUG_TABLE_REFLOW \
                 -DoffDEBUG_TABLE_STRATEGY \
 		$(NULL)
 
-CPPSRCS= nsCellMap.cpp			\
-    nsTableCellFrame.cpp		\
-	nsTableColFrame.cpp			\
-    nsTableColGroupFrame.cpp	\
-	nsTableFrame.cpp			\
-    nsTableOuterFrame.cpp		\
-	nsTableRowFrame.cpp			\
-	nsTableRowGroupFrame.cpp	\
-	BasicTableLayoutStrategy.cpp \
-	FixedTableLayoutStrategy.cpp \
-	nsTableBorderCollapser
-
 CPP_OBJS= .\$(OBJDIR)\nsCellMap.obj \
-    .\$(OBJDIR)\nsTableCellFrame.obj .\$(OBJDIR)\nsTableColFrame.obj \
+    .\$(OBJDIR)\nsTableCellFrame.obj \
+    .\$(OBJDIR)\nsTableColFrame.obj \
     .\$(OBJDIR)\nsTableColGroupFrame.obj \
     .\$(OBJDIR)\nsTableFrame.obj \
     .\$(OBJDIR)\nsTableOuterFrame.obj  \
     .\$(OBJDIR)\nsTableRowFrame.obj \
     .\$(OBJDIR)\nsTableRowGroupFrame.obj \
-	.\$(OBJDIR)\BasicTableLayoutStrategy.obj \
-	.\$(OBJDIR)\FixedTableLayoutStrategy.obj \
-	.\$(OBJDIR)\nsTableBorderCollapser.obj
+    .\$(OBJDIR)\BasicTableLayoutStrategy.obj \
+    .\$(OBJDIR)\FixedTableLayoutStrategy.obj \
+    .\$(OBJDIR)\nsTableBorderCollapser.obj \
+    $(NULL)
 
 LINCS=-I..\..\base\src -I..\..\style\src -I..\..\content\src \
   -I..\..\..\base\src
diff --git a/mozilla/layout/mathml/base/src/makefile.win b/mozilla/layout/mathml/base/src/makefile.win
index 7eea5355452..cc14ed175a4 100644
--- a/mozilla/layout/mathml/base/src/makefile.win
+++ b/mozilla/layout/mathml/base/src/makefile.win
@@ -40,33 +40,6 @@ REQUIRES    = xpcom \
 
 DEFINES= -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=          nsMathMLChar.cpp                      \
-                  nsMathMLFrame.cpp		\
-                  nsMathMLContainerFrame.cpp		\
-                  nsMathMLmrowFrame.obj 		\
-                  nsMathMLmphantomFrame.cpp		\
-                  nsMathMLmfencedFrame.cpp		\
-                  nsMathMLmfracFrame.cpp		\
-                  nsMathMLmsubFrame.cpp			\
-                  nsMathMLmiFrame.cpp			\
-                  nsMathMLmtextFrame.cpp		\
-                  nsMathMLmsubsupFrame.cpp		\
-                  nsMathMLmmultiscriptsFrame.cpp	\
-                  nsMathMLmsupFrame.cpp			\
-                  nsMathMLmtableFrame.cpp		\
-                  nsMathMLmoFrame.cpp			\
-                  nsMathMLmunderFrame.cpp		\
-                  nsMathMLmoverFrame.cpp		\
-                  nsMathMLmunderoverFrame.cpp		\
-                  nsMathMLmpaddedFrame.cpp		\
-                  nsMathMLmspaceFrame.cpp		\
-                  nsMathMLmsFrame.cpp			\
-                  nsMathMLmstyleFrame.cpp		\
-                  nsMathMLmsqrtFrame.cpp		\
-                  nsMathMLmrootFrame.cpp		\
-                  nsMathMLmactionFrame.cpp		\
-                  $(NULL)
-
 CPP_OBJS= .\$(OBJDIR)\nsMathMLChar.obj		        \
           .\$(OBJDIR)\nsMathMLFrame.obj        \
           .\$(OBJDIR)\nsMathMLContainerFrame.obj        \
diff --git a/mozilla/layout/mathml/content/src/makefile.win b/mozilla/layout/mathml/content/src/makefile.win
index d551afeb3db..610fcbf9818 100644
--- a/mozilla/layout/mathml/content/src/makefile.win
+++ b/mozilla/layout/mathml/content/src/makefile.win
@@ -34,11 +34,6 @@ REQUIRES    = string \
 
 DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN
 
-CPPSRCS=					\
-	nsMathMLAtoms.cpp			\
-	nsMathMLOperators.cpp			\
-	$(NULL)
-
 CPP_OBJS=					\
 	.\$(OBJDIR)\nsMathMLAtoms.obj		\
 	.\$(OBJDIR)\nsMathMLOperators.obj	\
diff --git a/mozilla/modules/libimg/gifcom/makefile.win b/mozilla/modules/libimg/gifcom/makefile.win
index 2368b1b8691..e29e8e4905f 100644
--- a/mozilla/modules/libimg/gifcom/makefile.win
+++ b/mozilla/modules/libimg/gifcom/makefile.win
@@ -72,7 +72,6 @@ DEFFILE=nsgif.def
 #// (these must be defined before the common makefiles are included)
 #//
 #//------------------------------------------------------------------------
-CPPSRCS= nsGIFModule.cpp nsGIFDecoder.cpp gif.cpp 
 CPP_OBJS=   .\$(OBJDIR)\nsGIFModule.obj .\$(OBJDIR)\nsGIFDecoder.obj \
            .\$(OBJDIR)\gif.obj
 
diff --git a/mozilla/modules/libutil/src/makefile.win b/mozilla/modules/libutil/src/makefile.win
index 8978fc32eca..ea909661de4 100644
--- a/mozilla/modules/libutil/src/makefile.win
+++ b/mozilla/modules/libutil/src/makefile.win
@@ -21,10 +21,7 @@
 
 MODULE=util 
 DEPTH=..\..\.. 
-CSRCS=obs.c 
 LIBRARY_NAME=util 
-CPPSRCS=stopwatch.cpp \
-        $(NULL)
 
 CPP_OBJS=.\$(OBJDIR)\stopwatch.obj \
 	 $(NULL)
diff --git a/mozilla/parser/htmlparser/robot/makefile.win b/mozilla/parser/htmlparser/robot/makefile.win
index 7d71327beca..77814d232b6 100644
--- a/mozilla/parser/htmlparser/robot/makefile.win
+++ b/mozilla/parser/htmlparser/robot/makefile.win
@@ -45,11 +45,6 @@ LLIBS=				\
 !endif
  $(NULL)
 
-CPPSRCS=			\
- nsRobotSink.cpp		\
- nsDebugRobot.cpp		\
- $(NULL)
-
 CPP_OBJS=			\
  .\$(OBJDIR)\nsRobotSink.obj	\
  .\$(OBJDIR)\nsDebugRobot.obj  \
diff --git a/mozilla/parser/htmlparser/robot/test/makefile.win b/mozilla/parser/htmlparser/robot/test/makefile.win
index f908d8805f1..2b49ae7c594 100644
--- a/mozilla/parser/htmlparser/robot/test/makefile.win
+++ b/mozilla/parser/htmlparser/robot/test/makefile.win
@@ -39,12 +39,9 @@ WIN_LIBS= shell32.lib
 
 LLFLAGS=-SUBSYSTEM:CONSOLE
 
-CPPSRCS=			\
- RobotMain.cpp			\
- $(NULL)
-
 CPP_OBJS=			\
- .\$(OBJDIR)\RobotMain.obj
+ .\$(OBJDIR)\RobotMain.obj      \
+ $(NULL)
 
 LINCS=-I.. 
 
diff --git a/mozilla/parser/htmlparser/src/makefile.win b/mozilla/parser/htmlparser/src/makefile.win
index 4e603971e05..bf868a6c0f0 100644
--- a/mozilla/parser/htmlparser/src/makefile.win
+++ b/mozilla/parser/htmlparser/src/makefile.win
@@ -43,32 +43,6 @@ DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN -DXML_DTD
 LIBRARY_NAME   = gkparser
 MODULE_NAME	   = nsParserModule
 
-CPPSRCS =               \
-	nsDTDUtils.cpp      \
-	nsHTMLTokenizer.cpp \
-	nsExpatTokenizer.cpp\
-	nsElementTable.cpp  \
-	CNavDTD.cpp         \
-	COtherDTD.cpp       \
-	nsHTMLEntities.cpp  \
-	nsHTMLTags.cpp      \
-	nsHTMLTokens.cpp    \
-	nsParser.cpp        \
-	CParserContext.cpp  \
-	nsParserNode.cpp    \
-	nsScanner.cpp       \
-	nsToken.cpp         \
-	nsWellFormedDTD.cpp \
-	nsViewSourceHTML.cpp\
-	nsParserService.cpp \
-	nsParserModule.cpp  \
-	nsParserMsgUtils.cpp  \
-!ifdef MOZ_DEBUG
-	nsLoggingSink.cpp   \
-	nsHTMLNullSink.cpp  \
-!endif
-	$(NULL)
-
 CPP_OBJS =                          \
 	.\$(OBJDIR)\nsDTDUtils.obj      \
 	.\$(OBJDIR)\nsHTMLTokenizer.obj \
diff --git a/mozilla/rdf/chrome/tools/chromereg/makefile.win b/mozilla/rdf/chrome/tools/chromereg/makefile.win
index b9cdf13faed..0083b0057d3 100644
--- a/mozilla/rdf/chrome/tools/chromereg/makefile.win
+++ b/mozilla/rdf/chrome/tools/chromereg/makefile.win
@@ -18,7 +18,6 @@ REQUIRES	= xpcom \
 		  chrome \
 		  necko \
 		  $(NULL)
-CPPSRCS		= regchrome.cpp
 
 MAKE_OBJ_TYPE   = EXE
 PROG = .\$(OBJDIR)\regchrome.exe
diff --git a/mozilla/tools/preloader/makefile.win b/mozilla/tools/preloader/makefile.win
index 452ab81c4a4..e5d3158a85e 100644
--- a/mozilla/tools/preloader/makefile.win
+++ b/mozilla/tools/preloader/makefile.win
@@ -33,9 +33,6 @@ CPP_OBJS =                      \
  .\$(OBJDIR)\preloader.obj      \
  $(NULL)
 
-CPPSRCS =                       \
- preloader.cpp                  \
- $(NULL)
 
 MAKE_OBJ_TYPE = exe
 
diff --git a/mozilla/webshell/src/makefile.win b/mozilla/webshell/src/makefile.win
index c5427e6fb9c..f6e0667ca4f 100644
--- a/mozilla/webshell/src/makefile.win
+++ b/mozilla/webshell/src/makefile.win
@@ -26,13 +26,6 @@ include <$(DEPTH)/config/config.mak>
 DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN
 MODULE=raptor 
 
-CPPSRCS=				\
- dlldeps.cpp			    \
- nsComFactory.cpp			\
- nsDLLFactory.cpp			\
- nsWebShell.cpp				\
- $(NULL)
-
 CPP_OBJS=				\
  .\$(OBJDIR)\dlldeps.obj		    \
  .\$(OBJDIR)\nsComFactory.obj		\
diff --git a/mozilla/webshell/tests/viewer/windows/makefile.win b/mozilla/webshell/tests/viewer/windows/makefile.win
index 2a2f8137b86..a59e8cdb25b 100644
--- a/mozilla/webshell/tests/viewer/windows/makefile.win
+++ b/mozilla/webshell/tests/viewer/windows/makefile.win
@@ -31,15 +31,7 @@ LIBRARY_NAME=raptornativewidgets_s
 
 DEFINES=-DWIN32_LEAN_AND_MEAN
 
-CPPSRCS= \
-	nsButton.cpp         \
-	nsTextWidget.cpp     \
-	nsTextHelper.cpp     \
-	nsLabel.cpp     \
-	nsCheckButton.cpp     \
-	$(NULL)
-
-OBJS =                                      \
+CPP_OBJS =                                      \
 	.\$(OBJDIR)\nsButton.obj           \
 	.\$(OBJDIR)\nsCheckButton.obj           \
 	.\$(OBJDIR)\nsTextWidget.obj           \
diff --git a/mozilla/widget/src/build/makefile.win b/mozilla/widget/src/build/makefile.win
index 9eddca372a4..388836bf8d2 100644
--- a/mozilla/widget/src/build/makefile.win
+++ b/mozilla/widget/src/build/makefile.win
@@ -37,8 +37,6 @@ REQUIRES	= xpcom \
 
 RESFILE = widget.res
 
-CPPSRCS  = nsWinWidgetFactory.cpp
-
 CPP_OBJS = .\$(OBJDIR)\nsWinWidgetFactory.obj
 
 
diff --git a/mozilla/widget/src/support/makefile.win b/mozilla/widget/src/support/makefile.win
index ee0e8d28461..7531f7ee3e6 100644
--- a/mozilla/widget/src/support/makefile.win
+++ b/mozilla/widget/src/support/makefile.win
@@ -25,10 +25,6 @@ DEPTH=..\..\..
 LIBRARY_NAME = widgetsupport_s
 #DEFINES =-D_IMPL_NS_WIDGET
 
-CPPSRCS = \
-	nsWidgetSupport.cpp      \
-	$(NULL)
-
 EXPORTS = \
 	nsWidgetSupport.h \
 	$(NULL)
@@ -39,7 +35,7 @@ REQUIRES	= xpcom \
 		  gfx \
 		  $(NULL)
 
-OBJS= \
+CPP_OBJS= \
 	.\$(OBJDIR)\nsWidgetSupport.obj  \
 	$(NULL)
 
diff --git a/mozilla/widget/src/windows/makefile.win b/mozilla/widget/src/windows/makefile.win
index fad65e06e78..1457be18af4 100644
--- a/mozilla/widget/src/windows/makefile.win
+++ b/mozilla/widget/src/windows/makefile.win
@@ -50,31 +50,7 @@ EXPORTS = \
 	nsdefs.h \
 	$(NULL)
 
-CPPSRCS =              \
-!ifdef ACCESSIBILITY
-	Accessible.cpp      \
-	SimpleDOMNode.cpp      \
-!endif
-	nsNativeDragTarget.cpp      \
-	nsNativeDragSource.cpp      \
-	nsDragService.cpp      \
-	Ienumfe.cpp      \
-	nsDataObj.cpp      \
-	nsDataObjCollection.cpp      \
-	nsClipboard.cpp      \
-	nsWindow.cpp         \
-	nsFilePicker.cpp     \
-	nsScrollbar.cpp      \
-	nsAppShell.cpp       \
-	nsLookAndFeel.cpp    \
-	nsToolkit.cpp        \
-	nsSound.cpp          \
-	nsImageClipboard.cpp \
-	nsBidiKeyboard.cpp   \
-	$(NULL)
-
-
-OBJS =                             \
+CPP_OBJS =                             \
 !ifdef ACCESSIBILITY
 	.\$(OBJDIR)\Accessible.obj  \
 	.\$(OBJDIR)\SimpleDOMNode.obj  \
diff --git a/mozilla/widget/src/xpwidgets/makefile.win b/mozilla/widget/src/xpwidgets/makefile.win
index cc72ed2590e..90cf9ab83f8 100644
--- a/mozilla/widget/src/xpwidgets/makefile.win
+++ b/mozilla/widget/src/xpwidgets/makefile.win
@@ -40,22 +40,9 @@ REQUIRES	= xpcom \
 LIBRARY_NAME = raptorbasewidget_s
 DEFINES =-D_IMPL_NS_WIDGET -DUSE_TLS_FOR_TOOLKIT
 
-
-CPPSRCS = \
-	nsBaseDragService.cpp      \
-	nsBaseWidget.cpp      \
-	nsBaseFilePicker.cpp	\
-	nsBaseClipboard.cpp         \
-	nsClipboardHelper.cpp         \
-	nsTransferable.cpp         \
-	nsHTMLFormatConverter.cpp         \
-	nsPrimitiveHelpers.cpp         \
-	nsXPLookAndFeel.cpp         \
-	$(NULL)
-
 MODULE=widget
 
-OBJS= \
+CPP_OBJS= \
 	.\$(OBJDIR)\nsBaseDragService.obj  \
 	.\$(OBJDIR)\nsBaseWidget.obj  \
 	.\$(OBJDIR)\nsBaseFilePicker.obj  \
diff --git a/mozilla/widget/timer/src/windows/makefile.win b/mozilla/widget/timer/src/windows/makefile.win
index 5222676ded7..e7899c4d12d 100644
--- a/mozilla/widget/timer/src/windows/makefile.win
+++ b/mozilla/widget/timer/src/windows/makefile.win
@@ -29,15 +29,8 @@ DEFINES=-DWIN32_LEAN_AND_MEAN -DSTRICT
 
 EXPORTS=nsTimerManager.h nsWindowsTimer.h nsIWindowsTimerMap.h
 
-CPPSRCS =			\
-	nsTimer.cpp		\
-	nsNewTimer.cpp		\
-	nsTimerManager.cpp		\
-	$(NULL)
-
 MODULE=timer
 
-
 CPP_OBJS=						\
 	.\$(OBJDIR)\nsTimer.obj		\
 	.\$(OBJDIR)\nsNewTimer.obj		\
diff --git a/mozilla/xpcom/tests/dynamic/makefile.win b/mozilla/xpcom/tests/dynamic/makefile.win
index 1415413de6a..810a062a822 100644
--- a/mozilla/xpcom/tests/dynamic/makefile.win
+++ b/mozilla/xpcom/tests/dynamic/makefile.win
@@ -33,10 +33,6 @@ LLIBS=				\
  $(DIST)\lib\xpcom.lib	\
  $(LIBNSPR)
 
-CPPSRCS =				\
-	TestDynamic.cpp			\
-	$(NULL)
-
 CPP_OBJS = \
 	.\$(OBJDIR)\TestDynamic.obj	\
 	$(NULL)
diff --git a/mozilla/xpcom/tests/services/makefile.win b/mozilla/xpcom/tests/services/makefile.win
index 52f50d7949f..02aa95b43f4 100644
--- a/mozilla/xpcom/tests/services/makefile.win
+++ b/mozilla/xpcom/tests/services/makefile.win
@@ -34,10 +34,6 @@ LLIBS=				\
  $(DIST)\lib\xpcom.lib		\
  $(LIBNSPR)
 
-CPPSRCS =				\
-	MyService.cpp			\
-	$(NULL)
-
 CPP_OBJS = \
 	.\$(OBJDIR)\MyService.obj	\
 	$(NULL)
diff --git a/mozilla/xpfe/bootstrap/makefile.win b/mozilla/xpfe/bootstrap/makefile.win
index ca5ca02a9d3..e19487fc696 100644
--- a/mozilla/xpfe/bootstrap/makefile.win
+++ b/mozilla/xpfe/bootstrap/makefile.win
@@ -57,18 +57,6 @@ SEDCMDS=nsStaticComonents.cpp.sed
 GARBAGE=$(GARBAGE) $(EXTRA_LIBS_LIST_FILE) $(SEDCMDS) nsStaticComponents.cpp
 !endif
 
-CPPSRCS=                                \
- nsAppRunner.cpp                        \
- nsSetupRegistry.cpp                    \
- nsWindowCreator.cpp                    \
- nsNativeAppSupportBase.cpp             \
- nsNativeAppSupportWin.cpp              \
- showOSAlert.cpp                        \
-!if defined(MOZ_STATIC_COMPONENT_LIBS) && !defined(MOZ_GECKO_DLL)
- nsStaticComponents.cpp                 \
-!endif
- $(NULL)
-
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsAppRunner.obj            \
  .\$(OBJDIR)\nsSetupRegistry.obj        \
diff --git a/mozilla/xpfe/components/regviewer/makefile.win b/mozilla/xpfe/components/regviewer/makefile.win
index 6ea99181d8a..f3f7ac8defb 100644
--- a/mozilla/xpfe/components/regviewer/makefile.win
+++ b/mozilla/xpfe/components/regviewer/makefile.win
@@ -48,10 +48,6 @@ XPIDLSRCS =                             \
         .\nsIRegistryDataSource.idl     \
         $(NULL)
 
-CPPSRCS=                                \
- nsRegistryViewer.cpp                   \
- $(NULL)
-
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsRegistryDataSource.obj   \
  $(NULL)
diff --git a/mozilla/xpfe/components/shistory/src/makefile.win b/mozilla/xpfe/components/shistory/src/makefile.win
index 331c25b8f92..fefaf7e3bcc 100644
--- a/mozilla/xpfe/components/shistory/src/makefile.win
+++ b/mozilla/xpfe/components/shistory/src/makefile.win
@@ -31,13 +31,6 @@ REQUIRES	= xpcom \
 LIBRARY_NAME=shistory
 MODULE_NAME=Session_History_Module
 
-CPPSRCS=                                \
- nsSHEntry.obj                          \
- nsSHTrasaction.obj                     \
- nsSHistoryModule.obj                   \
- nsSHistory.obj                         \
- $(NULL)
-
 CPP_OBJS=                               \
  .\$(OBJDIR)\nsSHEntry.obj              \
  .\$(OBJDIR)\nsSHTransaction.obj        \