diff --git a/src/common/log.h b/src/common/log.h
index 4c96ef0a6..09ae66523 100644
--- a/src/common/log.h
+++ b/src/common/log.h
@@ -104,7 +104,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
 #endif // loglevel
 #endif // logging
 
-#ifdef MSVC_VER
+#ifdef _MSC_VER
 #ifndef __func__
 #define __func__ __FUNCTION__
 #endif
@@ -149,7 +149,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
 #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
 
 #ifndef GEKKO
-#ifdef MSVC_VER
+#ifdef _MSC_VER
 #define _assert_msg_(_t_, _a_, _fmt_, ...)        \
     if (!(_a_)) {\
         if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \
@@ -159,7 +159,7 @@ void GenericLog(LOGTYPES_LEVELS level, LOGTYPES_TYPE type, const char*file, int
     if (!(_a_)) {\
         if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) {Crash();} \
     }
-#endif // MSVC_VER
+#endif // _MSC_VER
 #else // GEKKO
 #define _assert_msg_(_t_, _a_, _fmt_, ...)
 #endif
diff --git a/src/common/msg_handler.h b/src/common/msg_handler.h
index a1db89aa3..1c76e6936 100644
--- a/src/common/msg_handler.h
+++ b/src/common/msg_handler.h
@@ -30,7 +30,7 @@ extern bool MsgAlert(bool yes_no, int Style, const char* format, ...)
 void SetEnableAlert(bool enable);
 
 #ifndef GEKKO
-#ifdef MSVC_VER
+#ifdef _MSC_VER
     #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__)
     #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__)
     #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__)
diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp
index 1ca2dfb39..0d5c3bcc3 100644
--- a/src/common/string_util.cpp
+++ b/src/common/string_util.cpp
@@ -7,7 +7,7 @@
 #include "common/common.h"
 #include "common/string_util.h"
 
-#ifdef MSVC_VER
+#ifdef _MSC_VER
     #include <Windows.h>
     #include <codecvt>
 #else
@@ -45,7 +45,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar
 {
     int writtenCount;
 
-#ifdef MSVC_VER
+#ifdef _MSC_VER
     // You would think *printf are simple, right? Iterate on each character,
     // if it's a format specifier handle it properly, etc.
     //
@@ -410,7 +410,7 @@ std::string UriEncode(const std::string & sSrc)
     return sResult;
 }
 
-#ifdef MSVC_VER
+#ifdef _MSC_VER
 
 std::string UTF16ToUTF8(const std::u16string& input)
 {
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 6eeda0828..ef594a671 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -17,7 +17,7 @@ namespace Common
 
 int CurrentThreadId()
 {
-#ifdef MSVC_VER
+#ifdef _MSC_VER
     return GetCurrentThreadId();
 #elif defined __APPLE__
     return mach_thread_self();
@@ -34,7 +34,7 @@ void SleepCurrentThread(int ms)
 }
 #endif
 
-#ifdef MSVC_VER
+#ifdef _MSC_VER
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
 {
@@ -84,7 +84,7 @@ void SetCurrentThreadName(const char* szThreadName)
     {}
 }
 
-#else // !MSVC_VER, so must be POSIX threads
+#else // !_MSC_VER, so must be POSIX threads
 
 void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
 {
@@ -121,7 +121,7 @@ void SwitchCurrentThread()
 #endif
 
 // MinGW with the POSIX threading model does not support pthread_setname_np
-#if !defined(_WIN32) || defined(MSVC_VER)
+#if !defined(_WIN32) || defined(_MSC_VER)
 void SetCurrentThreadName(const char* szThreadName)
 {
 #ifdef __APPLE__