diff --git a/algparam.h b/algparam.h
index fcdd7f86..09c4b8cd 100644
--- a/algparam.h
+++ b/algparam.h
@@ -1,7 +1,6 @@
 // algparam.h - originally written and placed in the public domain by Wei Dai
 
-/// \file
-/// \headerfile algparam.h
+/// \file algparam.h
 /// \brief Classes for working with NameValuePairs
 
 
@@ -11,14 +10,6 @@
 #include "config.h"
 #include "cryptlib.h"
 
-#if CRYPTOPP_MSC_VERSION
-# pragma warning(push)
-# pragma warning(disable: 4231 4275)
-# if (CRYPTOPP_MSC_VERSION >= 1400)
-#  pragma warning(disable: 6011 6386 28193)
-# endif
-#endif
-
 #include "smartptr.h"
 #include "secblock.h"
 #include "integer.h"
@@ -516,11 +507,6 @@ AlgorithmParameters MakeParameters(const char *name, const T &value, bool throwI
 #define CRYPTOPP_SET_FUNCTION_ENTRY(name)		(Name::name(), &ThisClass::Set##name)
 #define CRYPTOPP_SET_FUNCTION_ENTRY2(name1, name2)	(Name::name1(), Name::name2(), &ThisClass::Set##name1##And##name2)
 
-// TODO: fix 6011 when the API/ABI can change
-#if (CRYPTOPP_MSC_VERSION >= 1400)
-# pragma warning(pop)
-#endif
-
 NAMESPACE_END
 
 #endif
diff --git a/mqv.cpp b/mqv.cpp
index 5602eb05..03896910 100644
--- a/mqv.cpp
+++ b/mqv.cpp
@@ -3,6 +3,7 @@
 //           FHMQV provided by Uri Blumenthal.
 
 #include "pch.h"
+#include "config.h"
 #include "mqv.h"
 #include "hmqv.h"
 #include "fhmqv.h"
diff --git a/padlkrng.cpp b/padlkrng.cpp
index 88384037..e65b900d 100644
--- a/padlkrng.cpp
+++ b/padlkrng.cpp
@@ -11,6 +11,10 @@
 // find copies  of the Programmer's manual, Cryptography Research Inc audit
 // report, and other goodies at http://www.cryptopp.com/wiki/VIA_Padlock.
 
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4702)
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 PadlockRNG::PadlockRNG(word32 divisor)
diff --git a/validat4.cpp b/validat4.cpp
index 9f74b516..70a2e738 100644
--- a/validat4.cpp
+++ b/validat4.cpp
@@ -32,7 +32,7 @@
 #endif
 
 #if CRYPTOPP_MSC_VERSION
-# pragma warning(disable: 4505 4355)
+# pragma warning(disable: 4610 4510 4505 4355)
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)
@@ -425,7 +425,7 @@ bool TestCryptoSign()
         uint64_t s = STDMIN(smlen, (uint64_t)crypto_sign_BYTES);
         pass = (s >= crypto_sign_BYTES) && pass;
 
-        fail = std::memcmp(sm, data.sig, s) != 0;
+        fail = std::memcmp(sm, data.sig, (size_t)s) != 0;
         pass = !fail && pass;
 
         uint64_t rmlen;
@@ -433,7 +433,7 @@ bool TestCryptoSign()
         fail = (rc != 0); pass = !fail && pass;
 
         pass = (l == rmlen) && pass;
-        fail = std::memcmp(m, rm, STDMIN(l, rmlen)) != 0;
+        fail = std::memcmp(m, rm, (size_t)STDMIN(l, rmlen)) != 0;
         pass = !fail && pass;
     }
 
@@ -470,7 +470,7 @@ bool TestCryptoSignKeys()
         if(mlen && rmlen)
         {
             pass = (mlen == rmlen) && pass;
-            fail = std::memcmp(m, rm, STDMIN(mlen, rmlen)) != 0;
+            fail = std::memcmp(m, rm, (size_t)STDMIN(mlen, rmlen)) != 0;
             pass = !fail && pass;
         }