diff --git a/include/wx/afterstd.h b/include/wx/afterstd.h
index b99a08402c..5d3858cae8 100644
--- a/include/wx/afterstd.h
+++ b/include/wx/afterstd.h
@@ -16,8 +16,9 @@
 #if defined(__WXMSW__)
     #include "wx/msw/winundef.h"
 #endif
-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+
+// undo what we did in wx/beforestd.h
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
     // MSVC 5 does not have this
     #if _MSC_VER > 1100
         // don't restore this one for VC6, it gives it in each try/catch which is a
diff --git a/include/wx/beforestd.h b/include/wx/beforestd.h
index 4c79e2660e..945296dde1 100644
--- a/include/wx/beforestd.h
+++ b/include/wx/beforestd.h
@@ -20,8 +20,9 @@
     it can be included several times.
  */
 
-// VC 7.x isn't as bad as VC6 and doesn't give these warnings
-#if defined(__VISUALC__) && __VISUALC__ <= 1200
+// VC 7.x isn't as bad as VC6 and doesn't give these warnings but eVC (which
+// defines _MSC_VER as 1201) does need to be included as it's VC6-like
+#if defined(__VISUALC__) && __VISUALC__ <= 1201
     // MSVC 5 does not have this
     #if __VISUALC__ > 1100
         // we have to disable (and reenable in afterstd.h) this one because,