diff --git a/samples/Projects/Win32/VC6/CreateDOMDocument/CreateDOMDocument.dsp b/samples/Projects/Win32/VC6/CreateDOMDocument/CreateDOMDocument.dsp
index d480f6e034a9107229d132c52f646aaf8746bbba..9826de274dab62620e56b95dee4e192391184ccc 100644
--- a/samples/Projects/Win32/VC6/CreateDOMDocument/CreateDOMDocument.dsp
+++ b/samples/Projects/Win32/VC6/CreateDOMDocument/CreateDOMDocument.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_CreateDOMDocument" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_CreateDOMDocument" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/DOMCount/DOMCount.dsp b/samples/Projects/Win32/VC6/DOMCount/DOMCount.dsp
index 8339aad515b3d5fa420b9b8b56cce3fd825c3370..4980b5ed94d6eaf654c1ee0c1913bbcf0fc0c35a 100644
--- a/samples/Projects/Win32/VC6/DOMCount/DOMCount.dsp
+++ b/samples/Projects/Win32/VC6/DOMCount/DOMCount.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_DOMCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_DOMCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/DOMPrint/DOMPrint.dsp b/samples/Projects/Win32/VC6/DOMPrint/DOMPrint.dsp
index 66c114b9c417cf3365106cf863b929673235b6ad..2b705d47d9061a1b0edd857d002ce7d9b1cb1820 100644
--- a/samples/Projects/Win32/VC6/DOMPrint/DOMPrint.dsp
+++ b/samples/Projects/Win32/VC6/DOMPrint/DOMPrint.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_DOMPRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_DOMPRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/EnumVal/EnumVal.dsp b/samples/Projects/Win32/VC6/EnumVal/EnumVal.dsp
index 8b8290bbc61a32c65d5978172dc835026343189d..a5a24a7f987bbf1a46131eea809c4ae199127d4d 100644
--- a/samples/Projects/Win32/VC6/EnumVal/EnumVal.dsp
+++ b/samples/Projects/Win32/VC6/EnumVal/EnumVal.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/MemParse/MemParse.dsp b/samples/Projects/Win32/VC6/MemParse/MemParse.dsp
index 441c5e13db044811a6a394075764dd1dd5abe68f..d67a9c542df1d65a6134326c557276d57193a843 100644
--- a/samples/Projects/Win32/VC6/MemParse/MemParse.dsp
+++ b/samples/Projects/Win32/VC6/MemParse/MemParse.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\include" /D "PROJ_MEMPARSE" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\include" /D "PROJ_MEMPARSE" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/PParse/PParse.dsp b/samples/Projects/Win32/VC6/PParse/PParse.dsp
index 321b38e7768b2e8a31df23e9e08652241f9334d7..d71563776a0ff13fd4cbd99541b20ac1973be830 100644
--- a/samples/Projects/Win32/VC6/PParse/PParse.dsp
+++ b/samples/Projects/Win32/VC6/PParse/PParse.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/Redirect/Redirect.dsp b/samples/Projects/Win32/VC6/Redirect/Redirect.dsp
index 57351552bbe8562ec53cbba1b0bd234dee8df013..387983f1bd4eaccdde49893d24a2e1156606685d 100644
--- a/samples/Projects/Win32/VC6/Redirect/Redirect.dsp
+++ b/samples/Projects/Win32/VC6/Redirect/Redirect.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\include" /D "PROJ_REDIRECT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\include" /D "PROJ_REDIRECT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/SAX2Count/SAX2Count.dsp b/samples/Projects/Win32/VC6/SAX2Count/SAX2Count.dsp
index 651200829de97c2b59bdd4fadaa125340fd693c2..5b48e339542aa7a40c8e140565ae83425d4938bf 100644
--- a/samples/Projects/Win32/VC6/SAX2Count/SAX2Count.dsp
+++ b/samples/Projects/Win32/VC6/SAX2Count/SAX2Count.dsp
@@ -7,18 +7,18 @@
 CFG=SAX2Count - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "SAX2Count.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "SAX2Count.mak" CFG="SAX2Count - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "SAX2Count - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAX2COUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAX2COUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/SAX2Print/SAX2Print.dsp b/samples/Projects/Win32/VC6/SAX2Print/SAX2Print.dsp
index c2315e4ef5778807ccbced801b8fefb26caab56a..db21cf623bbf6707cb323998dc6f0fd4173eba91 100644
--- a/samples/Projects/Win32/VC6/SAX2Print/SAX2Print.dsp
+++ b/samples/Projects/Win32/VC6/SAX2Print/SAX2Print.dsp
@@ -7,18 +7,18 @@
 CFG=SAX2Print - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "SAX2Print.mak".
-!MESSAGE
+!MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
+!MESSAGE 
 !MESSAGE NMAKE /f "SAX2Print.mak" CFG="SAX2Print - Win32 Debug"
-!MESSAGE
+!MESSAGE 
 !MESSAGE Possible choices for configuration are:
-!MESSAGE
+!MESSAGE 
 !MESSAGE "SAX2Print - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
+!MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAX2PRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAX2PRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/SAXCount/SAXCount.dsp b/samples/Projects/Win32/VC6/SAXCount/SAXCount.dsp
index 87a1a76e31d5b5b12dc13df23e40321414273073..bc89b1d08ef1ee358ffbf1fd38e767afd93cf74f 100644
--- a/samples/Projects/Win32/VC6/SAXCount/SAXCount.dsp
+++ b/samples/Projects/Win32/VC6/SAXCount/SAXCount.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/SAXPrint/SAXPrint.dsp b/samples/Projects/Win32/VC6/SAXPrint/SAXPrint.dsp
index 1b2e26edd8d7ad2d9226591270a45b38433096b4..4313474c322239e33b0d7c336f5f610e47c9e543 100644
--- a/samples/Projects/Win32/VC6/SAXPrint/SAXPrint.dsp
+++ b/samples/Projects/Win32/VC6/SAXPrint/SAXPrint.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXPRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXPRINT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/SEnumVal/SEnumVal.dsp b/samples/Projects/Win32/VC6/SEnumVal/SEnumVal.dsp
index d55be05126c221e35bbb7bf42289a198edee15c9..cade5ba0f0cacae531247863a75207530ca302b7 100644
--- a/samples/Projects/Win32/VC6/SEnumVal/SEnumVal.dsp
+++ b/samples/Projects/Win32/VC6/SEnumVal/SEnumVal.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
diff --git a/samples/Projects/Win32/VC6/StdInParse/StdInParse.dsp b/samples/Projects/Win32/VC6/StdInParse/StdInParse.dsp
index a5acff845cfcc29a53f6fc0029ee47f11f04cb1c..ae9666ebd8c404643cbe39859b6c59fb16ff9c5f 100644
--- a/samples/Projects/Win32/VC6/StdInParse/StdInParse.dsp
+++ b/samples/Projects/Win32/VC6/StdInParse/StdInParse.dsp
@@ -38,8 +38,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /G5 /MD /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
-# SUBTRACT CPP /YX
+# ADD CPP /nologo /G5 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\include" /D "PROJ_SAXCOUNT" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "PLATFORM_WIN32" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe