diff --git a/platforms/sound/directsound/CustomSoundSystem.hpp b/platforms/sound/directsound/CustomSoundSystem.hpp
index 7340c3348..8b9d617c1 100644
--- a/platforms/sound/directsound/CustomSoundSystem.hpp
+++ b/platforms/sound/directsound/CustomSoundSystem.hpp
@@ -14,7 +14,7 @@
 #include <stdexcept>
 #include <vector>
 
-#ifdef _MSVC_VER
+#ifdef _MSC_VER
 #pragma comment(lib, "dsound.lib")
 #pragma comment(lib, "dxguid.lib")
 #pragma comment(lib, "winmm.lib")
diff --git a/source/client/app/NinecraftApp.cpp b/source/client/app/NinecraftApp.cpp
index e4ef91cd4..bd929f375 100644
--- a/source/client/app/NinecraftApp.cpp
+++ b/source/client/app/NinecraftApp.cpp
@@ -21,7 +21,6 @@
 #include "renderer/ConstantBufferMetaDataManager.hpp"
 #include "renderer/RenderContextImmediate.hpp"
 #include "renderer/RenderMaterial.hpp"
-#include "renderer/platform/ogl/Extensions.hpp"
 
 #ifdef DEMO
 #include "world/level/storage/MemoryLevelStorageSource.hpp"
diff --git a/source/client/gui/Gui.cpp b/source/client/gui/Gui.cpp
index d9f1ac6c0..bc87e3b9f 100644
--- a/source/client/gui/Gui.cpp
+++ b/source/client/gui/Gui.cpp
@@ -13,7 +13,7 @@
 #include "client/renderer/renderer/RenderMaterialGroup.hpp"
 #include "renderer/ShaderConstants.hpp"
 
-#ifdef _MSVC_VER
+#ifdef _MSC_VER
 #pragma warning(disable : 4244)
 #endif
 
diff --git a/source/client/renderer/ScreenRenderer.cpp b/source/client/renderer/ScreenRenderer.cpp
index 0603b68bd..7552cfec8 100644
--- a/source/client/renderer/ScreenRenderer.cpp
+++ b/source/client/renderer/ScreenRenderer.cpp
@@ -4,7 +4,7 @@
 #include "renderer/ShaderConstants.hpp"
 #include "client/renderer/Tesselator.hpp"
 
-#ifdef _MSVC_VER
+#ifdef _MSC_VER
 #pragma warning (disable : 4244)
 #endif
 
diff --git a/source/common/Utils.cpp b/source/common/Utils.cpp
index 9f178b5c3..c665d611a 100644
--- a/source/common/Utils.cpp
+++ b/source/common/Utils.cpp
@@ -17,7 +17,7 @@
 #include <winsock.h>
 
 // Why are we not using GetTickCount64()? It's simple -- getTimeMs has the exact same problem as using regular old GetTickCount.
-#ifdef _MSVC_VER
+#ifdef _MSC_VER
 #pragma warning(disable : 28159)
 #endif
 
diff --git a/thirdparty/GL/GL.hpp b/thirdparty/GL/GL.hpp
index 70e67e531..c1b9acf2b 100644
--- a/thirdparty/GL/GL.hpp
+++ b/thirdparty/GL/GL.hpp
@@ -79,7 +79,7 @@
 			#include <GL/glext.h> // it'll include from a different dir, namely thirdparty/GL/glext.h
 		#endif
 
-		#ifdef _MSVC_VER
+		#ifdef _MSC_VER
 			#pragma comment(lib, "opengl32.lib")
 			#pragma comment(lib, "glu32.lib")
 		#endif
diff --git a/thirdparty/SDL/SDL.h b/thirdparty/SDL/SDL.h
index e25fcd2e6..1df97a121 100644
--- a/thirdparty/SDL/SDL.h
+++ b/thirdparty/SDL/SDL.h
@@ -2,7 +2,7 @@
 
 #if (defined(_WIN32) || defined(USE_SDL1))
     #ifdef _WIN32
-        #ifdef _MSVC_VER
+        #ifdef _MSC_VER
             #ifdef USE_SDL1
                 #pragma comment(lib, "SDL.lib")
             #else
diff --git a/thirdparty/SDL/SDL_opengl.h b/thirdparty/SDL/SDL_opengl.h
index 9f9b4b1af..550b8ac48 100644
--- a/thirdparty/SDL/SDL_opengl.h
+++ b/thirdparty/SDL/SDL_opengl.h
@@ -2,7 +2,7 @@
 
 #if (defined(_WIN32) || defined(USE_SDL1))
     #ifdef _WIN32
-        #ifdef _MSVC_VER
+        #ifdef _MSC_VER
             #ifdef USE_SDL1
                 #pragma comment(lib, "SDL.lib")
             #else