diff --git a/src/StepMania-net2003.vcproj b/src/StepMania-net2003.vcproj
index 9db69d0655..734b021f7b 100644
--- a/src/StepMania-net2003.vcproj
+++ b/src/StepMania-net2003.vcproj
@@ -25,7 +25,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="3"
@@ -110,7 +110,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				FavorSizeOrSpeed="2"
 				OptimizeForProcessor="2"
 				OptimizeForWindowsApplication="TRUE"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
 				StringPooling="TRUE"
 				MinimalRebuild="FALSE"
@@ -192,7 +192,7 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/EHa"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;"..\extern\lua-5.1\src";ffmpeg\modern_working\include;BaseClasses;"..\extern\jsoncpp\include";"..\extern\glew-1.5.8\include";..\extern\pcre;"..\extern\mad-0.15.1b";..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="FALSE"
 				BasicRuntimeChecks="0"
@@ -2162,6 +2162,30 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\
 				<File
 					RelativePath="glext.h">
 				</File>
+				<Filter Name="libpng" Filter="">
+					<File RelativePath="..\extern\libpng\include\png.c"></File>
+					<File RelativePath="..\extern\libpng\include\png.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngget.c"></File>
+					<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
+					<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngread.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngset.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
+				</Filter>
 				<Filter
 					Name="pcre"
 					Filter="">
diff --git a/src/StepMania-net2005.vcproj b/src/StepMania-net2005.vcproj
index 9af73c4efd..a7a5636a7b 100644
--- a/src/StepMania-net2005.vcproj
+++ b/src/StepMania-net2005.vcproj
@@ -49,7 +49,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -157,7 +157,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
@@ -3580,6 +3580,30 @@
 					RelativePath="glext.h"
 					>
 				</File>
+				<Filter Name="libpng">
+					<File RelativePath="..\extern\libpng\include\png.c"></File>
+					<File RelativePath="..\extern\libpng\include\png.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngget.c"></File>
+					<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
+					<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngread.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngset.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
+					<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
+					<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
+				</Filter>
 				<Filter
 					Name="pcre"
 					>
diff --git a/src/StepMania-net2008.vcproj b/src/StepMania-net2008.vcproj
index e8c4745f15..d8d2058138 100644
--- a/src/StepMania-net2008.vcproj
+++ b/src/StepMania-net2008.vcproj
@@ -50,7 +50,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="3"
@@ -158,7 +158,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="2"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -263,7 +263,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,GLEW_STATIC"
 				ExceptionHandling="0"
 				BasicRuntimeChecks="0"
@@ -371,7 +371,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories=".;vorbis;libjpeg;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
+				AdditionalIncludeDirectories=".;&quot;..\extern\lua-5.1\src&quot;;ffmpeg\modern_working\include;BaseClasses;&quot;..\extern\jsoncpp\include&quot;;&quot;..\extern\glew-1.5.8\include&quot;;..\extern\pcre;&quot;..\extern\mad-0.15.1b&quot;;..\extern\libpng;..\extern\libjpeg;..\extern\zlib;..\extern\vorbis"
 				PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,GLEW_STATIC"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -6564,6 +6564,30 @@
 				RelativePath="glext.h"
 				>
 			</File>
+			<Filter Name="libpng">
+				<File RelativePath="..\extern\libpng\include\png.c"></File>
+				<File RelativePath="..\extern\libpng\include\png.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngconf.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngdebug.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngerror.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngget.c"></File>
+				<File RelativePath="..\extern\libpng\include\pnginfo.h"></File>
+				<File RelativePath="..\extern\libpng\include\scripts\pnglibconf.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngmem.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngpread.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngpriv.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngread.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngrio.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngrtran.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngrutil.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngset.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngstruct.h"></File>
+				<File RelativePath="..\extern\libpng\include\pngtrans.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngwio.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngwrite.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngwtran.c"></File>
+				<File RelativePath="..\extern\libpng\include\pngwutil.c"></File>
+			</Filter>
 			<Filter
 				Name="pcre"
 				>