diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 77a8acd2b..74f6ac4c4 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -41,7 +41,6 @@ libdesmume_a_SOURCES = \
 	matrix.cpp matrix.h \
 	gfx3d.cpp gfx3d.h \
 	thumb_instructions.cpp types.h \
-	shaders.h \
 	movie.cpp movie.h \
 	PACKED.h PACKED_END.h \
 	utils/advanscene.cpp utils/advanscene.h \
diff --git a/desmume/src/OGLRender_3_2.cpp b/desmume/src/OGLRender_3_2.cpp
index f7af3f56a..be8188e08 100644
--- a/desmume/src/OGLRender_3_2.cpp
+++ b/desmume/src/OGLRender_3_2.cpp
@@ -124,7 +124,6 @@ static const char *fragmentShader_150 = {"\
 	{ \n\
 		vec4 texColor = vec4(1.0, 1.0, 1.0, 1.0); \n\
 		vec4 fragColor; \n\
-		float fragDepth; \n\
 		\n\
 		if(hasTexture) \n\
 		{ \n\
@@ -184,16 +183,15 @@ static const char *fragmentShader_150 = {"\
 		\n\
 		if (oglWBuffer == 1) \n\
 		{ \n\
-			// TODO \n\
-			fragDepth = (vtxPosition.z / vtxPosition.w) * 0.5 + 0.5; \n\
+			/* The w component is in 1.12 format, normalize it to [-1;+1] */ \
+			gl_FragDepth = (vtxPosition.w / 4096.0) * 0.5 + 0.5; \n\
 		} \n\
 		else \n\
 		{ \n\
-			fragDepth = (vtxPosition.z / vtxPosition.w) * 0.5 + 0.5; \n\
+			gl_FragDepth = (vtxPosition.z / vtxPosition.w) * 0.5 + 0.5; \n\
 		} \n\
 		\n\
 		outFragColor = fragColor; \n\
-		gl_FragDepth = fragDepth; \n\
 	} \n\
 "};
 
diff --git a/desmume/src/shaders.h b/desmume/src/shaders.h
deleted file mode 100644
index b1568e46a..000000000
--- a/desmume/src/shaders.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-	Copyright (C) 2008-2012 DeSmuME team
-
-	This file is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 2 of the License, or
-	(at your option) any later version.
-
-	This file is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with the this software.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/* Predefined OpenGL shaders */
-
-/* Vertex shader */
-const char *vertexShader = {"\
-	attribute vec4 inPosition; \n\
-	attribute vec2 inTexCoord0; \n\
-	attribute vec3 inColor; \n\
-	\n\
-	uniform float polyAlpha; \n\
-	uniform vec2 texScale; \n\
-	\n\
-	varying vec4 vtxPosition; \n\
-	varying vec2 vtxTexCoord; \n\
-	varying vec4 vtxColor; \n\
-	\n\
-	void main() \n\
-	{ \n\
-		// Keep the projection matrix as a placeholder in case we need to use one in the future. \n\
-		mat4 projectionMtx	= mat4(	vec4(1.0, 0.0, 0.0, 0.0), \n\
-									vec4(0.0, 1.0, 0.0, 0.0), \n\
-									vec4(0.0, 0.0, 1.0, 0.0), \n\
-									vec4(0.0, 0.0, 0.0, 1.0));\n\
-		\n\
-		mat2 texScaleMtx	= mat2(	vec2(texScale.x,        0.0), \n\
-									vec2(       0.0, texScale.y)); \n\
-		\n\
-		vtxPosition = projectionMtx * inPosition; \n\
-		vtxTexCoord = texScaleMtx * inTexCoord0; \n\
-		vtxColor = vec4(inColor * 4.0, polyAlpha); \n\
-		\n\
-		gl_Position = vtxPosition; \n\
-	} \n\
-"};
-
-/* Fragment shader */
-const char *fragmentShader = {"\
-	uniform sampler2D texMainRender; \n\
-	uniform sampler1D texToonTable; \n\
-	uniform int polyID; \n\
-	uniform bool hasTexture; \n\
-	uniform int polygonMode; \n\
-	uniform int toonShadingMode; \n\
-	uniform int oglWBuffer; \n\
-	uniform bool enableAlphaTest; \n\
-	uniform float alphaTestRef; \n\
-	\n\
-	varying vec4 vtxPosition; \n\
-	varying vec2 vtxTexCoord; \n\
-	varying vec4 vtxColor; \n\
-	\n\
-	void main() \n\
-	{ \n\
-		vec4 texColor = vec4(1.0, 1.0, 1.0, 1.0); \n\
-		vec4 flagColor; \n\
-		float flagDepth; \n\
-		\n\
-		if(hasTexture) \n\
-		{ \n\
-			texColor = texture2D(texMainRender, vtxTexCoord); \n\
-		} \n\
-		\n\
-		flagColor = texColor; \n\
-		\n\
-		if(polygonMode == 0) \n\
-		{ \n\
-			flagColor = vtxColor * texColor; \n\
-		} \n\
-		else if(polygonMode == 1) \n\
-		{ \n\
-			if (texColor.a == 0.0 || !hasTexture) \n\
-			{ \n\
-				flagColor.rgb = vtxColor.rgb; \n\
-			} \n\
-			else if (texColor.a == 1.0) \n\
-			{ \n\
-				flagColor.rgb = texColor.rgb; \n\
-			} \n\
-			else \n\
-			{ \n\
-				flagColor.rgb = texColor.rgb * (1.0-texColor.a) + vtxColor.rgb * texColor.a;\n\
-			} \n\
-			\n\
-			flagColor.a = vtxColor.a; \n\
-		} \n\
-		else if(polygonMode == 2) \n\
-		{ \n\
-			if (toonShadingMode == 0) \n\
-			{ \n\
-				vec3 toonColor = vec3(texture1D(texToonTable, vtxColor.r).rgb); \n\
-				flagColor.rgb = texColor.rgb * toonColor.rgb;\n\
-				flagColor.a = texColor.a * vtxColor.a;\n\
-			} \n\
-			else \n\
-			{ \n\
-				vec3 toonColor = vec3(texture1D(texToonTable, vtxColor.r).rgb); \n\
-				flagColor.rgb = texColor.rgb * vtxColor.rgb + toonColor.rgb; \n\
-				flagColor.a = texColor.a * vtxColor.a; \n\
-			} \n\
-		} \n\
-		else if(polygonMode == 3) \n\
-		{ \n\
-			if (polyID != 0) \n\
-			{ \n\
-				flagColor = vtxColor; \n\
-			} \n\
-		} \n\
-		\n\
-		if (flagColor.a == 0.0 || (enableAlphaTest && flagColor.a < alphaTestRef)) \n\
-		{ \n\
-			discard; \n\
-		} \n\
-		\n\
-		if (oglWBuffer == 1) \n\
-		{ \n\
-			/* The w component is in 1.12 format, normalize it to [-1;+1] */ \
-			flagDepth = (vtxPosition.w / 4096.0) * 0.5 + 0.5; \n\
-		} \n\
-		else \n\
-		{ \n\
-			flagDepth = (vtxPosition.z / vtxPosition.w) * 0.5 + 0.5; \n\
-		} \n\
-		\n\
-		gl_FragColor = flagColor; \n\
-		gl_FragDepth = flagDepth; \n\
-	} \n\
-"};
-