diff --git a/clientgui/stdwx.h b/clientgui/stdwx.h
index d381ba750c..d92a2e1efa 100644
--- a/clientgui/stdwx.h
+++ b/clientgui/stdwx.h
@@ -29,7 +29,9 @@
 // platforms we are going to disable the deprecation warnings if we are compiling
 // on Visual Studio 2005
 #if _MSC_VER >= 1400
-#pragma warning(disable: 4996) // function deprecation
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
 #endif
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
@@ -109,6 +111,11 @@
 
 #if wxUSE_ACCESSIBILITY
     #include <oleacc.h>
+#else
+    #pragma message("")
+    #pragma message("wxUSE_ACCESSIBILITY is not defined in setup.h for the wxWidgets library.")
+    #pragma message("***** Accessibility features are disabled *****")
+    #pragma message("")
 #endif // wxUSE_ACCESSIBILITY
 
 #include "wx/msw/ole/oleutils.h"
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index 0db458bba4..4502dfc3bb 100644
--- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -38,8 +38,10 @@
 // platforms we are going to disable the deprecation warnings if we are compiling
 // on Visual Studio 2005
 #if _MSC_VER >= 1400
+#ifndef _CRT_SECURE_NO_DEPRECATE
 #define _CRT_SECURE_NO_DEPRECATE
 #endif
+#endif
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.