diff --git a/xbyak/xbyak.h b/xbyak/xbyak.h
index 41894d0..6896264 100644
--- a/xbyak/xbyak.h
+++ b/xbyak/xbyak.h
@@ -109,6 +109,8 @@
 #endif
 
 #if (__cplusplus >= 201103) || (_MSC_VER >= 1800)
+	#undef XBYAK_TLS
+	#define XBYAK_TLS thread_local
 	#define XBYAK_VARIADIC_TEMPLATE
 #endif