diff --git a/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp b/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
index 475d0aad3b..0f84773050 100755
--- a/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
+++ b/deps/glslang/glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp
@@ -84,8 +84,10 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 #if (defined(_MSC_VER) && _MSC_VER < 1900 /*vs2015*/)
+#ifndef snprintf
 #define snprintf sprintf_s
 #endif
+#endif
 
 #include <cassert>
 #include <cstdlib>
diff --git a/deps/libz/gzguts.h b/deps/libz/gzguts.h
index 2ab74a8d5f..78b2ef29c8 100644
--- a/deps/libz/gzguts.h
+++ b/deps/libz/gzguts.h
@@ -105,7 +105,9 @@
    termination of the result -- however this is only used in gzlib.c where
    the result is assured to fit in the space provided */
 #ifdef _MSC_VER
-#  define snprintf _snprintf
+#ifndef snprintf
+#define snprintf _snprintf
+#endif
 #endif
 
 #ifndef local
diff --git a/griffin/griffin.c b/griffin/griffin.c
index a35111a6ab..a6c93b0d08 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -874,7 +874,7 @@ AUDIO
 
 #include "../audio/drivers/nullaudio.c"
 
-#if defined(HAVE_WASAPI) || defined(HAVE_XAUDIO)
+#if defined(HAVE_WASAPI) || (_WIN32_WINNT >= 0x0602)
 #include "../audio/common/mmdevice_common.c"
 #endif