diff --git a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
index cde3cc199b25ac9de7f995aacc1c6d25cdf3bd59..1d09f2deed243119612e14ed47dca3da097520c0 100644
--- a/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
+++ b/Projects/Win32/VC7.1/xerces-all/XercesLib/XercesLib.vcproj
@@ -44,7 +44,7 @@
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
 				OutputFile="$(OutDir)\xerces-c_3_0.dll"
-				LinkIncremental="1"
+				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0.fullpdb"
@@ -112,7 +112,7 @@
 				AdditionalOptions="/MACHINE:I386"
 				AdditionalDependencies="ws2_32.lib advapi32.lib "
 				OutputFile="$(OutDir)\xerces-c_3_0D.dll"
-				LinkIncremental="2"
+				LinkIncremental="0"
 				AdditionalLibraryDirectories="$(OutDir)"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)\xerces-c_3_0D.pdb"
diff --git a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
index 8218344368d2c6172432c74eccbbc48b97922e3d..0001173edaa8d40dc95fee0ae9d05eaa066feb87 100644
--- a/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
+++ b/src/xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.cpp
@@ -25,7 +25,6 @@
 
 #include <xercesc/util/XMLUniDefs.hpp>
 #include <xercesc/util/XMLUni.hpp>
-#include <xercesc/util/XMLString.hpp>
 #include <xercesc/util/XMLExceptMsgs.hpp>
 #include <xercesc/util/NetAccessors/WinSock/BinHTTPURLInputStream.hpp>
 #include <xercesc/util/NetAccessors/WinSock/WinSockNetAccessor.hpp>
diff --git a/src/xercesc/validators/DTD/DTDValidator.cpp b/src/xercesc/validators/DTD/DTDValidator.cpp
index da9c43515291c234a4dde65553af26c6e303b5da..2408107602c3b03ba4e1dc920775ea127385944b 100644
--- a/src/xercesc/validators/DTD/DTDValidator.cpp
+++ b/src/xercesc/validators/DTD/DTDValidator.cpp
@@ -381,8 +381,11 @@ DTDValidator::validateAttrValue(const   XMLAttDef*      attDef
 
 }
 
-void DTDValidator::preContentValidation(bool /*reuseGrammar*/,
-                                        bool validateDefAttr)
+void DTDValidator::preContentValidation(bool
+#if defined(XERCES_DEBUG)
+										reuseGrammar
+#endif
+                                       ,bool validateDefAttr)
 {
     //
     //  Lets enumerate all of the elements in the element decl pool
diff --git a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
index 2a1fec33bdbc542814a4234938e1c9fa79b874e5..7347462d4b2cfc6c20442ad056a7ea19b142d0f3 100644
--- a/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
+++ b/tests/src/DOM/DOMMemTest/DOMMemTest.cpp
@@ -36,7 +36,7 @@ XERCES_CPP_NAMESPACE_USE
 
 bool errorOccurred = false;
 
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
 
 #define TASSERT(c) tassert((c), __FILE__, __LINE__)
 
diff --git a/tests/src/DOM/DOMTest/DTest.cpp b/tests/src/DOM/DOMTest/DTest.cpp
index 435c61a94ca5bce3ead104b65c1a6623800164a5..54625cf8a41aa2124d246bbd1d1ca429c877027a 100644
--- a/tests/src/DOM/DOMTest/DTest.cpp
+++ b/tests/src/DOM/DOMTest/DTest.cpp
@@ -36,7 +36,7 @@
 #include <xercesc/util/OutOfMemoryException.hpp>
 #include <xercesc/framework/MemBufInputSource.hpp>
 
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
 
 #define EXCEPTIONSTEST(operation, expectedException, resultFlag, testNum) \
     {                                                               \
@@ -830,7 +830,7 @@ void DOMTest::findTestNodes(DOMNode* node) {
  *
  *
  */
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
  {
      bool OK = true;
 
diff --git a/tests/src/DOM/Normalizer/Normalizer.cpp b/tests/src/DOM/Normalizer/Normalizer.cpp
index cc1f2de15dfeca92c4bf0dfffd9347c7a2133177..30d405b693c7748b4667da727bc45d63e56abd46 100644
--- a/tests/src/DOM/Normalizer/Normalizer.cpp
+++ b/tests/src/DOM/Normalizer/Normalizer.cpp
@@ -218,7 +218,7 @@ void Normalizer::serializeNode(const DOMNode * const node) {
     theOutput->release();
 }
 
-int main(int /*argc*/, char **/*argv*/) {
+int main(int /*argc*/, char ** /*argv*/) {
 
     Normalizer *normalizer = new Normalizer();
 
diff --git a/tests/src/DOM/RangeTest/RangeTest.cpp b/tests/src/DOM/RangeTest/RangeTest.cpp
index b8b8317710733b222ac086497d431e77bce616d2..d74ce5942653c5e25fb316079cdb92dd53fe578c 100644
--- a/tests/src/DOM/RangeTest/RangeTest.cpp
+++ b/tests/src/DOM/RangeTest/RangeTest.cpp
@@ -41,7 +41,7 @@ XERCES_CPP_NAMESPACE_USE
 
 bool errorOccurred = false;
 
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
 
 #define TASSERT(c) tassert((c), __FILE__, __LINE__)
 
diff --git a/tests/src/DOM/Traversal/Traversal.cpp b/tests/src/DOM/Traversal/Traversal.cpp
index 332773905f3277a7486a1d539142a32d99bddae9..5e1e7d0a4639e550c236674c1810e301f0c3f068 100644
--- a/tests/src/DOM/Traversal/Traversal.cpp
+++ b/tests/src/DOM/Traversal/Traversal.cpp
@@ -41,7 +41,7 @@ XERCES_CPP_NAMESPACE_USE
 
 bool errorOccurred = false;
 
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
 
 #define TASSERT(c) tassert((c), __FILE__, __LINE__)
 
diff --git a/tests/src/DOM/TypeInfo/TypeInfo.cpp b/tests/src/DOM/TypeInfo/TypeInfo.cpp
index 70b9d20a222935130c277741537f563158a5c62b..092ada8dca43e051e27f52fcfd9ee8f5d2cb5d75 100644
--- a/tests/src/DOM/TypeInfo/TypeInfo.cpp
+++ b/tests/src/DOM/TypeInfo/TypeInfo.cpp
@@ -30,7 +30,7 @@
 #include <iostream.h>
 #endif
 
-#define UNUSED(x) { if(x!=0); }
+#define UNUSED(x) { if(x!=0){} }
 
 #define DOMTYPEINFOTEST(info, type, uri, line) \
     tmp = XMLString::equals(info->getTypeName(), type) && XMLString::equals(info->getTypeNamespace(), uri);\
@@ -825,7 +825,7 @@ DOMElement* TypeInfo::findElement(const XMLCh *name) const {
     return (DOMElement *)toTest;
 }
 
-int main(int /*argc*/, char **/*argv*/)
+int main(int /*argc*/, char ** /*argv*/)
 {
     bool passed = true;