diff --git a/stl/inc/yvals.h b/stl/inc/yvals.h
index ea0b53f4571..1a70aa17ea4 100644
--- a/stl/inc/yvals.h
+++ b/stl/inc/yvals.h
@@ -306,22 +306,6 @@ _STL_DISABLE_CLANG_WARNINGS
 #define _LOCK_DEBUG          3
 #define _LOCK_AT_THREAD_EXIT 4
 
-#ifndef _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
-#if _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8
-#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 1
-#else // ^^^ _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 // _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 vvv
-#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 0
-#endif // ^^^ _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 ^^^
-#endif // _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
-
-#ifndef _ALLOW_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE_MISMATCH
-#if _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
-#pragma detect_mismatch("_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE", "1")
-#else
-#pragma detect_mismatch("_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE", "0")
-#endif
-#endif // !_ALLOW_ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE_MISMATCH
-
 #ifdef __cplusplus
 _STD_BEGIN
 enum _Uninitialized { // tag for suppressing initialization
diff --git a/stl/src/atomic_wait.cpp b/stl/src/atomic_wait.cpp
index d16f53f2197..0a45b12aee7 100644
--- a/stl/src/atomic_wait.cpp
+++ b/stl/src/atomic_wait.cpp
@@ -88,6 +88,14 @@ namespace {
 #endif // _DEBUG
     }
 
+#ifndef _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
+#if _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8
+#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 1
+#else // ^^^ _STL_WIN32_WINNT >= _STL_WIN32_WINNT_WIN8 // _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 vvv
+#define _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE 0
+#endif // ^^^ _STL_WIN32_WINNT < _STL_WIN32_WINNT_WIN8 ^^^
+#endif // _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
+
 #if _ATOMIC_WAIT_ON_ADDRESS_STATICALLY_AVAILABLE
 
 #define __crtWaitOnAddress       WaitOnAddress