diff --git a/other/sdl/VERSION b/other/sdl/VERSION
index 1fc5b8206..2165f8f9b 100644
--- a/other/sdl/VERSION
+++ b/other/sdl/VERSION
@@ -1 +1 @@
-1.2.15
+2.0.4
diff --git a/src/base/tl/threading.h b/src/base/tl/threading.h
index 2b61c779f..fdef37a94 100644
--- a/src/base/tl/threading.h
+++ b/src/base/tl/threading.h
@@ -35,7 +35,9 @@
 #elif defined(_MSC_VER)
 	#include <intrin.h>
 
-	#define WIN32_LEAN_AND_MEAN
+	#ifndef WIN32_LEAN_AND_MEAN
+		#define WIN32_LEAN_AND_MEAN
+	#endif
 	#include <windows.h>
 
 	inline unsigned atomic_inc(volatile unsigned *pValue)
diff --git a/src/engine/client/backend_sdl.cpp b/src/engine/client/backend_sdl.cpp
index 940c2dc8d..a7a84f504 100644
--- a/src/engine/client/backend_sdl.cpp
+++ b/src/engine/client/backend_sdl.cpp
@@ -14,7 +14,12 @@
 
 
 #if defined(CONF_FAMILY_WINDOWS)
-	PFNGLTEXIMAGE3DPROC glTexImage3D;
+	PFNGLTEXIMAGE3DPROC glTexImage3DInternal;
+
+	GLAPI void GLAPIENTRY glTexImage3D(GLenum target, GLint level, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+	{
+		glTexImage3DInternal(target, level, internalFormat, width, height, depth, border, format, type, pixels);
+	}
 #endif
 
 // ------------ CGraphicsBackend_Threaded
@@ -730,8 +735,8 @@ int CGraphicsBackend_SDL_OpenGL::Init(const char *pName, int *Screen, int *pWidt
 	}
 
 	#if defined(CONF_FAMILY_WINDOWS)
-		glTexImage3D = (PFNGLTEXIMAGE3DPROC) wglGetProcAddress("glTexImage3D");
-		if(glTexImage3D == 0)
+		glTexImage3DInternal = (PFNGLTEXIMAGE3DPROC) wglGetProcAddress("glTexImage3D");
+		if(glTexImage3DInternal == 0)
 		{
 			dbg_msg("gfx", "glTexImage3D not supported");
 			return -1;
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index fb56ef9e1..a428d0f7c 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -259,7 +259,6 @@ void CGameClient::OnInit()
 		Client()->SnapSetStaticsize(i, m_NetObjHandler.GetObjSize(i));
 
 	// load default font
-	static CFont *pDefaultFont = 0;
 	char aFontName[256];
 	str_format(aFontName, sizeof(aFontName), "fonts/%s", g_Config.m_ClFontfile);
 	char aFilename[512];