diff --git a/win32/ezstream.sln b/win32/ezstream.sln
index 5824176..7dcca1d 100644
--- a/win32/ezstream.sln
+++ b/win32/ezstream.sln
@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{43809192-0B8F-4AFE-85E6-C54E265CFB75}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0A70BF55-FCF6-4DD8-A455-8233666A60E1} = {0A70BF55-FCF6-4DD8-A455-8233666A60E1}
 		{1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5} = {1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5}
 		{29A3AE75-E9A8-4A43-BADB-A4EF0972BD5B} = {29A3AE75-E9A8-4A43-BADB-A4EF0972BD5B}
 		{8FB7BDB7-B66C-4D45-A03D-2FD46AAB1B08} = {8FB7BDB7-B66C-4D45-A03D-2FD46AAB1B08}
@@ -46,6 +47,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "libshout.vcproj
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libz", "libz.vcproj", "{1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib", "taglib.vcproj", "{B1A6316C-A73A-4B34-A428-E967A698CA37}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib_c", "taglib_c.vcproj", "{0A70BF55-FCF6-4DD8-A455-8233666A60E1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B1A6316C-A73A-4B34-A428-E967A698CA37} = {B1A6316C-A73A-4B34-A428-E967A698CA37}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -88,6 +96,14 @@ Global
 		{1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5}.Debug|Win32.Build.0 = Debug|Win32
 		{1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5}.Release|Win32.ActiveCfg = Release|Win32
 		{1ACB165E-8C63-4B44-A4EB-791EFA8FA0A5}.Release|Win32.Build.0 = Release|Win32
+		{B1A6316C-A73A-4B34-A428-E967A698CA37}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B1A6316C-A73A-4B34-A428-E967A698CA37}.Debug|Win32.Build.0 = Debug|Win32
+		{B1A6316C-A73A-4B34-A428-E967A698CA37}.Release|Win32.ActiveCfg = Release|Win32
+		{B1A6316C-A73A-4B34-A428-E967A698CA37}.Release|Win32.Build.0 = Release|Win32
+		{0A70BF55-FCF6-4DD8-A455-8233666A60E1}.Debug|Win32.ActiveCfg = Debug|Win32
+		{0A70BF55-FCF6-4DD8-A455-8233666A60E1}.Debug|Win32.Build.0 = Debug|Win32
+		{0A70BF55-FCF6-4DD8-A455-8233666A60E1}.Release|Win32.ActiveCfg = Release|Win32
+		{0A70BF55-FCF6-4DD8-A455-8233666A60E1}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32/ezstream.vcproj b/win32/ezstream.vcproj
index 35992b5..7ed2a60 100644
--- a/win32/ezstream.vcproj
+++ b/win32/ezstream.vcproj
@@ -71,7 +71,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="ws2_32.lib .\taglib-bin\lib\tag.lib .\taglib-bin\lib\tag_c.lib libxml2-bin\lib\libxml2_a.lib .\libiconv-bin\lib\libiconv-vc9.lib"
+				AdditionalDependencies="ws2_32.lib libxml2-bin\lib\libxml2_a.lib .\libiconv-bin\lib\libiconv-vc9.lib"
 				GenerateDebugInformation="true"
 				SubSystem="0"
 				LargeAddressAware="2"
@@ -153,7 +153,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="ws2_32.lib .\taglib-bin\lib\tag.lib .\taglib-bin\lib\tag_c.lib libxml2-bin\lib\libxml2_a.lib .\libiconv-bin\lib\libiconv-vc9.lib"
+				AdditionalDependencies="ws2_32.lib libxml2-bin\lib\libxml2_a.lib .\libiconv-bin\lib\libiconv-vc9.lib"
 				GenerateDebugInformation="false"
 				SubSystem="1"
 				LargeAddressAware="2"
diff --git a/win32/taglib.vcproj b/win32/taglib.vcproj
index 7c9540e..17bb2fe 100644
--- a/win32/taglib.vcproj
+++ b/win32/taglib.vcproj
@@ -56,7 +56,8 @@
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName)-vc90.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="0"
+				CompileAs="2"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,7 +128,8 @@
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName)-vc90.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="0"
-				CompileAs="0"
+				CompileAs="2"
+				DisableSpecificWarnings="4996"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -203,10 +205,6 @@
 				RelativePath=".\taglib\taglib\flac\flacproperties.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\mpeg\id3v2\frames\generalencapsulatedobjectframe.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\mpeg\id3v1\id3v1genres.cpp"
 				>
@@ -283,22 +281,10 @@
 				RelativePath=".\taglib\taglib\mpeg\id3v2\frames\relativevolumeframe.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\ogg\speex\speexfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\taglib\taglib\ogg\speex\speexproperties.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\tag.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\tagunion.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\toolkit\tbytevector.cpp"
 				>
@@ -319,14 +305,6 @@
 				RelativePath=".\taglib\taglib\toolkit\tfile.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\trueaudio\trueaudiofile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\taglib\taglib\trueaudio\trueaudioproperties.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\toolkit\tstring.cpp"
 				>
@@ -347,14 +325,6 @@
 				RelativePath=".\taglib\taglib\mpeg\id3v2\frames\unknownframe.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\mpeg\id3v2\frames\unsynchronizedlyricsframe.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\taglib\taglib\mpeg\id3v2\frames\urllinkframe.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\ogg\vorbis\vorbisfile.cpp"
 				>
@@ -363,14 +333,6 @@
 				RelativePath=".\taglib\taglib\ogg\vorbis\vorbisproperties.cpp"
 				>
 			</File>
-			<File
-				RelativePath=".\taglib\taglib\wavpack\wavpackfile.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\taglib\taglib\wavpack\wavpackproperties.cpp"
-				>
-			</File>
 			<File
 				RelativePath=".\taglib\taglib\mpeg\xingheader.cpp"
 				>
diff --git a/win32/taglib_c.vcproj b/win32/taglib_c.vcproj
index ee69582..104f561 100644
--- a/win32/taglib_c.vcproj
+++ b/win32/taglib_c.vcproj
@@ -56,7 +56,7 @@
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName)-vc90.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="4"
-				CompileAs="0"
+				CompileAs="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,7 +127,7 @@
 				ProgramDataBaseFileName="$(IntDir)\$(TargetName)-vc90.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="0"
-				CompileAs="0"
+				CompileAs="2"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"