diff --git a/configure.in b/configure.in
index 8680490..2def1a0 100644
--- a/configure.in
+++ b/configure.in
@@ -4,6 +4,7 @@ dnl ###########
 
 AC_INIT([ezstream], [0.5.4],
 	[https://trac.xiph.org/newticket?component=ezstream])
+AC_REVISION([$Id$])
 AC_PREREQ([2.61])
 AC_CONFIG_SRCDIR([src/ezstream.c])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/m4/ccflags.m4 b/m4/ccflags.m4
index 543c52e..75f3f86 100644
--- a/m4/ccflags.m4
+++ b/m4/ccflags.m4
@@ -1,4 +1,4 @@
-dnl $Id: ccflags.m4 907 2009-03-08 10:28:51Z mgrimm $
+dnl $Id$
 
 dnl * Check if the compiler understands a certain flag or not.
 dnl   Inspiration for this came from watching TagLib configure.
diff --git a/m4/libogg.m4 b/m4/libogg.m4
index 13b2005..f2b2857 100644
--- a/m4/libogg.m4
+++ b/m4/libogg.m4
@@ -1,4 +1,4 @@
-dnl $Id: libogg.m4 729 2008-11-01 17:38:43Z mgrimm $
+dnl $Id$
 
 dnl # Check for a working installation of libogg.
 dnl # Provides appropriate --with configuration options, fills and substitutes
diff --git a/m4/libshout.m4 b/m4/libshout.m4
index 88550b7..3bf6145 100644
--- a/m4/libshout.m4
+++ b/m4/libshout.m4
@@ -1,4 +1,4 @@
-dnl $Id: libshout.m4 948 2009-03-15 17:59:37Z mgrimm $
+dnl $Id$
 
 dnl # Check for a working installation of libshout.
 dnl # Provides appropriate --with configuration options, fills and substitutes
diff --git a/m4/libvorbis.m4 b/m4/libvorbis.m4
index a3e2a27..713ee6e 100644
--- a/m4/libvorbis.m4
+++ b/m4/libvorbis.m4
@@ -1,4 +1,4 @@
-dnl $Id: libvorbis.m4 735 2008-11-01 18:34:34Z mgrimm $
+dnl $Id$
 
 dnl # Check for working installations of libvorbis, libvorbisfile and
 dnl # libvorbisenc.
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
index 1940d94..10cd038 100644
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@@ -1,4 +1,4 @@
-dnl # $Id: libxml2.m4 736 2008-11-01 19:04:55Z mgrimm $
+dnl # $Id$
 
 dnl # Check for a working installation of libxml (version 2.)
 dnl # Provides appropriate --with configuration options, fills and substitutes
diff --git a/m4/progname.m4 b/m4/progname.m4
index bdc0984..e20c275 100644
--- a/m4/progname.m4
+++ b/m4/progname.m4
@@ -1,4 +1,4 @@
-dnl $Id: progname.m4 719 2008-10-29 09:08:42Z mgrimm $
+dnl $Id$
 
 dnl Check whether libc defines __progname. Defines HAVE___PROGNAME, if
 dnl applicable. This check is heavily inspired by the one in OpenNTPd
diff --git a/m4/tree.m4 b/m4/tree.m4
index 1fb7bb7..58bf385 100644
--- a/m4/tree.m4
+++ b/m4/tree.m4
@@ -1,4 +1,4 @@
-dnl $Id: tree.m4 719 2008-10-29 09:08:42Z mgrimm $
+dnl $Id$
 
 dnl Check for sys/tree.h and if it is recent enough by looking at a certain
 dnl macro. Defines HAVE_SYS_TREE_H if all conditions are met.
diff --git a/m4/vacopy.m4 b/m4/vacopy.m4
index 9278472..1a747f1 100644
--- a/m4/vacopy.m4
+++ b/m4/vacopy.m4
@@ -1,4 +1,4 @@
-dnl $Id: vacopy.m4 719 2008-10-29 09:08:42Z mgrimm $
+dnl $Id$
 
 dnl Check for means to copy variable argument lists. After this check,
 dnl va_copy will at least be defined to something working.
diff --git a/m4/vars.m4 b/m4/vars.m4
index e266d8b..b487d7e 100644
--- a/m4/vars.m4
+++ b/m4/vars.m4
@@ -1,4 +1,4 @@
-dnl $Id: vars.m4 947 2009-03-15 17:51:37Z mgrimm $
+dnl $Id$
 
 dnl # Append or prepend items to a variable, but keep the items in the
 dnl # variable unique.
diff --git a/src/compat.c b/src/compat.c
index b9a1233..5c7c466 100644
--- a/src/compat.c
+++ b/src/compat.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
  *
diff --git a/src/compat.h b/src/compat.h
index 6ab237c..b710e60 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/configfile.c b/src/configfile.c
index 53cb7ab..004d2ad 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/configfile.h b/src/configfile.h
index 089d78a..3cf94ef 100644
--- a/src/configfile.h
+++ b/src/configfile.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/ezstream.c b/src/ezstream.c
index e2579b7..84c2c1e 100644
--- a/src/ezstream.c
+++ b/src/ezstream.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/metadata.c b/src/metadata.c
index 18948f9..fa40e8e 100644
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/metadata.h b/src/metadata.h
index 05409a9..852b91a 100644
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/playlist.c b/src/playlist.c
index f4e8404..82d9ae0 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/playlist.h b/src/playlist.h
index 93041b7..01640cb 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (c) 2007 Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/strfctns.h b/src/strfctns.h
index 83316fa..0a1eca0 100644
--- a/src/strfctns.h
+++ b/src/strfctns.h
@@ -1,3 +1,5 @@
+/*	$Id$	*/
+
 #ifndef __STRLFCTNS_H__
 #define __STRLFCTNS_H__
 
diff --git a/src/strlcat.c b/src/strlcat.c
index 3307fb1..edf5535 100644
--- a/src/strlcat.c
+++ b/src/strlcat.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
 
 /*
diff --git a/src/strlcpy.c b/src/strlcpy.c
index e7b807b..950dd47 100644
--- a/src/strlcpy.c
+++ b/src/strlcpy.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
 
 /*
diff --git a/src/strtonum.c b/src/strtonum.c
index 8672182..5d71616 100644
--- a/src/strtonum.c
+++ b/src/strtonum.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*	$OpenBSD: strtonum.c,v 1.6 2004/08/03 19:38:01 millert Exp $	*/
 
 /*
diff --git a/src/util.c b/src/util.c
index 053618e..26475dd 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/util.h b/src/util.h
index 82e1aa0..1e69c0c 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  *  ezstream - source client for Icecast with external en-/decoder support
  *  Copyright (C) 2003, 2004, 2005, 2006  Ed Zaleski <oddsock@oddsock.org>
diff --git a/src/xalloc.c b/src/xalloc.c
index 42e2a7d..f8d6c0b 100644
--- a/src/xalloc.c
+++ b/src/xalloc.c
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * Copyright (C) 2007  Moritz Grimm <mdgrimm@gmx.net>
  *
diff --git a/src/xalloc.h b/src/xalloc.h
index 033924d..3c814b4 100644
--- a/src/xalloc.h
+++ b/src/xalloc.h
@@ -1,3 +1,4 @@
+/*	$Id$	*/
 /*
  * libxalloc - Portable memory allocation wrapper library, with extensive
  *             error checking, debugging facilities and hooks for 3rd party
diff --git a/win32/ezstream.sln b/win32/ezstream.sln
index 18eddc4..39544fc 100644
--- a/win32/ezstream.sln
+++ b/win32/ezstream.sln
@@ -1,111 +1,111 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
-		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E} = {A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\shout\win32\libshout.vcproj", "{376BDB5E-7092-44EC-AF16-C087D2D80FC6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E} = {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "..\..\theora\win32\theora_static.vcproj", "{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "..\..\vorbis\win32\vorbisfile_static.vcproj", "{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}"
-	ProjectSection(ProjectDependencies) = postProject
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "..\..\vorbis\win32\vorbis_static.vcproj", "{FB2ECA7B-D98C-4341-84B7-005E037E25A7}"
-	ProjectSection(ProjectDependencies) = postProject
-		{A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\..\ogg\win32\ogg_static.vcproj", "{A0144DD0-0064-46CF-93D3-78DB712034D4}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\libxml2\win32\VC7\libxml2.vcproj", "{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C6320F61-2939-4C52-A749-933377C12DEA} = {C6320F61-2939-4C52-A749-933377C12DEA}
-		{12329AC8-F4EC-4663-AEE2-93911D033E97} = {12329AC8-F4EC-4663-AEE2-93911D033E97}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\zlib\win32\zlib.vcproj", "{C6320F61-2939-4C52-A749-933377C12DEA}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\libiconv\win32\libiconv.vcproj", "{12329AC8-F4EC-4663-AEE2-93911D033E97}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib", "..\..\taglib\win32\taglib.vcproj", "{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib_c", "..\..\taglib\win32\taglib_c.vcproj", "{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD} = {F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfiguration) = preSolution
-		Debug = Debug
-		Release = Release
-	EndGlobalSection
-	GlobalSection(ProjectConfiguration) = postSolution
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.ActiveCfg = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.Build.0 = Debug|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32
-		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.ActiveCfg = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.Build.0 = Debug|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.ActiveCfg = Release|Win32
-		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.Build.0 = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.ActiveCfg = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.Build.0 = Debug|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.ActiveCfg = Release|Win32
-		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.Build.0 = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.ActiveCfg = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.Build.0 = Debug|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.ActiveCfg = Release|Win32
-		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.Build.0 = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.ActiveCfg = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.Build.0 = Debug|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.ActiveCfg = Release|Win32
-		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.Build.0 = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.ActiveCfg = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.Build.0 = Debug|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.ActiveCfg = Release|Win32
-		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.Build.0 = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.ActiveCfg = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32
-		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32
-		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.ActiveCfg = Debug|Win32
-		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.Build.0 = Debug|Win32
-		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.ActiveCfg = Release|Win32
-		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.Build.0 = Release|Win32
-		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.ActiveCfg = Debug|Win32
-		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.Build.0 = Debug|Win32
-		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.ActiveCfg = Release|Win32
-		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.Build.0 = Release|Win32
-		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Debug.ActiveCfg = Debug|Win32
-		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Debug.Build.0 = Debug|Win32
-		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Release.ActiveCfg = Release|Win32
-		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Release.Build.0 = Release|Win32
-		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Debug.ActiveCfg = Debug|Win32
-		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Debug.Build.0 = Debug|Win32
-		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Release.ActiveCfg = Release|Win32
-		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Release.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-	EndGlobalSection
-	GlobalSection(ExtensibilityAddIns) = postSolution
-	EndGlobalSection
-EndGlobal
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ezstream", "ezstream.vcproj", "{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6} = {376BDB5E-7092-44EC-AF16-C087D2D80FC6}
+		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E} = {A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1} = {3E590C94-A4E0-4E79-839E-A7263F3CA6B1}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libshout", "..\..\shout\win32\libshout.vcproj", "{376BDB5E-7092-44EC-AF16-C087D2D80FC6}"
+	ProjectSection(ProjectDependencies) = postProject
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E} = {63A539B9-C6CD-4DC9-80B2-B28DB92C151E}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtheora", "..\..\theora\win32\theora_static.vcproj", "{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9} = {5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbisfile", "..\..\vorbis\win32\vorbisfile_static.vcproj", "{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}"
+	ProjectSection(ProjectDependencies) = postProject
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7} = {FB2ECA7B-D98C-4341-84B7-005E037E25A7}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvorbis", "..\..\vorbis\win32\vorbis_static.vcproj", "{FB2ECA7B-D98C-4341-84B7-005E037E25A7}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A0144DD0-0064-46CF-93D3-78DB712034D4} = {A0144DD0-0064-46CF-93D3-78DB712034D4}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libogg", "..\..\ogg\win32\ogg_static.vcproj", "{A0144DD0-0064-46CF-93D3-78DB712034D4}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\libxml2\win32\VC7\libxml2.vcproj", "{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C6320F61-2939-4C52-A749-933377C12DEA} = {C6320F61-2939-4C52-A749-933377C12DEA}
+		{12329AC8-F4EC-4663-AEE2-93911D033E97} = {12329AC8-F4EC-4663-AEE2-93911D033E97}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\zlib\win32\zlib.vcproj", "{C6320F61-2939-4C52-A749-933377C12DEA}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libiconv", "..\..\libiconv\win32\libiconv.vcproj", "{12329AC8-F4EC-4663-AEE2-93911D033E97}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib", "..\..\taglib\win32\taglib.vcproj", "{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "taglib_c", "..\..\taglib\win32\taglib_c.vcproj", "{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}"
+	ProjectSection(ProjectDependencies) = postProject
+		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD} = {F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.ActiveCfg = Debug|Win32
+		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Debug.Build.0 = Debug|Win32
+		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.ActiveCfg = Release|Win32
+		{4C27B249-0C17-4007-9D51-2ED145DF06C2}.Release.Build.0 = Release|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.ActiveCfg = Debug|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Debug.Build.0 = Debug|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.ActiveCfg = Release|Win32
+		{376BDB5E-7092-44EC-AF16-C087D2D80FC6}.Release.Build.0 = Release|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.ActiveCfg = Debug|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Debug.Build.0 = Debug|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.ActiveCfg = Release|Win32
+		{63A539B9-C6CD-4DC9-80B2-B28DB92C151E}.Release.Build.0 = Release|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.ActiveCfg = Debug|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Debug.Build.0 = Debug|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.ActiveCfg = Release|Win32
+		{5E55AD4D-483E-466D-B3B7-EAD8B6128DC9}.Release.Build.0 = Release|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.ActiveCfg = Debug|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Debug.Build.0 = Debug|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.ActiveCfg = Release|Win32
+		{FB2ECA7B-D98C-4341-84B7-005E037E25A7}.Release.Build.0 = Release|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.ActiveCfg = Debug|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Debug.Build.0 = Debug|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.ActiveCfg = Release|Win32
+		{A0144DD0-0064-46CF-93D3-78DB712034D4}.Release.Build.0 = Release|Win32
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.ActiveCfg = Debug|Win32
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Debug.Build.0 = Debug|Win32
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.ActiveCfg = Release|Win32
+		{3E590C94-A4E0-4E79-839E-A7263F3CA6B1}.Release.Build.0 = Release|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.ActiveCfg = Debug|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Debug.Build.0 = Debug|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.ActiveCfg = Release|Win32
+		{C6320F61-2939-4C52-A749-933377C12DEA}.Release.Build.0 = Release|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.ActiveCfg = Debug|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Debug.Build.0 = Debug|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.ActiveCfg = Release|Win32
+		{12329AC8-F4EC-4663-AEE2-93911D033E97}.Release.Build.0 = Release|Win32
+		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Debug.ActiveCfg = Debug|Win32
+		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Debug.Build.0 = Debug|Win32
+		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Release.ActiveCfg = Release|Win32
+		{F91FFAA9-0A12-4D51-9E10-FA7D8FCA8DFD}.Release.Build.0 = Release|Win32
+		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Debug.ActiveCfg = Debug|Win32
+		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Debug.Build.0 = Debug|Win32
+		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Release.ActiveCfg = Release|Win32
+		{A1CA7E73-EA91-43C0-80B5-5B16CF3EA61E}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/win32/ezstream.vcproj b/win32/ezstream.vcproj
index 9b68589..06c4dc5 100644
--- a/win32/ezstream.vcproj
+++ b/win32/ezstream.vcproj
@@ -1,287 +1,287 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="ezstream"
-	ProjectGUID="{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
-	RootNamespace="ezstream"
-	SccProjectName=""
-	SccLocalPath="">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\Release"
-			IntermediateDirectory=".\Release"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2"
-			WholeProgramOptimization="TRUE">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				GlobalOptimizations="TRUE"
-				InlineFunctionExpansion="1"
-				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;../../taglib;.;../compat"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;HAVE_TAGLIB"
-				StringPooling="TRUE"
-				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="FALSE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Release/"
-				ObjectFile=".\Release/"
-				ProgramDataBaseFileName=".\Release/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.lib WinMM.lib"
-				OutputFile=".\Release/ezstream.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				IgnoreDefaultLibraryNames=""
-				ProgramDatabaseFile=".\Release/ezstream.pdb"
-				SubSystem="1"
-				LargeAddressAware="2"
-				SetChecksum="TRUE"
-				TargetMachine="0"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Release/ezstream.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\Debug"
-			IntermediateDirectory=".\Debug"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="FALSE"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				ImproveFloatingPointConsistency="TRUE"
-				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;../../taglib;.;../compat"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;HAVE_TAGLIB;XALLOC_DEBUG"
-				ExceptionHandling="FALSE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				BufferSecurityCheck="TRUE"
-				EnableFunctionLevelLinking="TRUE"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderThrough=""
-				PrecompiledHeaderFile=""
-				AssemblerListingLocation=".\Debug/"
-				ObjectFile=".\Debug/"
-				ProgramDataBaseFileName=".\Debug/"
-				WarningLevel="3"
-				SuppressStartupBanner="TRUE"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"
-				CompileAs="0"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.lib WinMM.lib"
-				OutputFile=".\Debug/ezstream.exe"
-				LinkIncremental="0"
-				SuppressStartupBanner="TRUE"
-				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="FALSE"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile=".\Debug/ezstream.pdb"
-				SubSystem="1"
-				LargeAddressAware="2"
-				TargetMachine="0"/>
-			<Tool
-				Name="VCMIDLTool"
-				TypeLibraryName=".\Debug/ezstream.tlb"
-				HeaderFileName=""/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-			<File
-				RelativePath="..\src\compat.c">
-			</File>
-			<File
-				RelativePath="..\src\configfile.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\ezstream.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\getopt.c">
-				<FileConfiguration
-					Name="Release|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="2"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Win32">
-					<Tool
-						Name="VCCLCompilerTool"
-						Optimization="0"
-						AdditionalIncludeDirectories=""
-						PreprocessorDefinitions=""
-						BasicRuntimeChecks="3"/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\src\metadata.c">
-			</File>
-			<File
-				RelativePath="..\src\playlist.c">
-			</File>
-			<File
-				RelativePath="..\src\strlcat.c">
-			</File>
-			<File
-				RelativePath="..\src\strlcpy.c">
-			</File>
-			<File
-				RelativePath="..\src\strtonum.c">
-			</File>
-			<File
-				RelativePath="..\src\util.c">
-			</File>
-			<File
-				RelativePath="..\src\xalloc.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl">
-			<File
-				RelativePath="..\src\compat.h">
-			</File>
-			<File
-				RelativePath=".\config.h">
-			</File>
-			<File
-				RelativePath="..\src\configfile.h">
-			</File>
-			<File
-				RelativePath="..\src\getopt.h">
-			</File>
-			<File
-				RelativePath="..\src\metadata.h">
-			</File>
-			<File
-				RelativePath="..\src\playlist.h">
-			</File>
-			<File
-				RelativePath="..\src\strfctns.h">
-			</File>
-			<File
-				RelativePath="..\src\util.h">
-			</File>
-			<File
-				RelativePath="..\src\xalloc.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="ezstream"
+	ProjectGUID="{4C27B249-0C17-4007-9D51-2ED145DF06C2}"
+	RootNamespace="ezstream"
+	SccProjectName=""
+	SccLocalPath="">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;../../taglib;.;../compat"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;HAVE_TAGLIB"
+				StringPooling="TRUE"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="0"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="FALSE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WS2_32.lib WinMM.lib"
+				OutputFile=".\Release/ezstream.exe"
+				LinkIncremental="0"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
+				ProgramDatabaseFile=".\Release/ezstream.pdb"
+				SubSystem="1"
+				LargeAddressAware="2"
+				SetChecksum="TRUE"
+				TargetMachine="0"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Release/ezstream.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="1"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				ImproveFloatingPointConsistency="TRUE"
+				AdditionalIncludeDirectories="../../ogg/include;../../vorbis/include;../../shout/include;../src;../../libxml2/include;../../libiconv/include;../../taglib;.;../compat"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;HAVE_ICONV;HAVE_TAGLIB;XALLOC_DEBUG"
+				ExceptionHandling="FALSE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				BufferSecurityCheck="TRUE"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="0"
+				PrecompiledHeaderThrough=""
+				PrecompiledHeaderFile=""
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="TRUE"
+				DebugInformationFormat="4"
+				CompileAs="0"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="WS2_32.lib WinMM.lib"
+				OutputFile=".\Debug/ezstream.exe"
+				LinkIncremental="0"
+				SuppressStartupBanner="TRUE"
+				AdditionalLibraryDirectories=""
+				IgnoreAllDefaultLibraries="FALSE"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/ezstream.pdb"
+				SubSystem="1"
+				LargeAddressAware="2"
+				TargetMachine="0"/>
+			<Tool
+				Name="VCMIDLTool"
+				TypeLibraryName=".\Debug/ezstream.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="..\src\compat.c">
+			</File>
+			<File
+				RelativePath="..\src\configfile.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\ezstream.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\getopt.c">
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions=""
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\metadata.c">
+			</File>
+			<File
+				RelativePath="..\src\playlist.c">
+			</File>
+			<File
+				RelativePath="..\src\strlcat.c">
+			</File>
+			<File
+				RelativePath="..\src\strlcpy.c">
+			</File>
+			<File
+				RelativePath="..\src\strtonum.c">
+			</File>
+			<File
+				RelativePath="..\src\util.c">
+			</File>
+			<File
+				RelativePath="..\src\xalloc.c">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="..\src\compat.h">
+			</File>
+			<File
+				RelativePath=".\config.h">
+			</File>
+			<File
+				RelativePath="..\src\configfile.h">
+			</File>
+			<File
+				RelativePath="..\src\getopt.h">
+			</File>
+			<File
+				RelativePath="..\src\metadata.h">
+			</File>
+			<File
+				RelativePath="..\src\playlist.h">
+			</File>
+			<File
+				RelativePath="..\src\strfctns.h">
+			</File>
+			<File
+				RelativePath="..\src\util.h">
+			</File>
+			<File
+				RelativePath="..\src\xalloc.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>