win32: remove obsolete vs9 build files

Windows users should just use Meson for building libnice.

18 files changed, 0 insertions, 3312 deletions

diff --git a/Makefile.am b/Makefile.am
index 8ffaa48..37c3a9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,14 +26,11 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-assert -enable-gtk-doc --enable-introspect
 EXTRA_DIST = \
 	COPYING.LGPL \
 	COPYING.MPL \
-	README.win32 \
 	autogen.sh \
 	common.mk \
 	scripts/lcov.mk \
 	scripts/lcov.sh \
 	scripts/valgrind-test-driver \
-	win32 \
-	win32/vs9/libnice.def \
 	m4/introspection.m4 \
 	meson.build \
 	meson_options.txt
@@ -44,23 +41,6 @@ dist_check_SCRIPTS = \
 	scripts/check-symbols.sh \
 	scripts/make-symbol-list.sh
 
-# Generate the win32 DLL symbol export file.
-# The stun_*() symbols at the end have historically been exported on Windows
-# but not Linux, for no particular reason. They can’t be removed without
-# breaking ABI. FIXME: Remove them when we next break ABI.
-win32/vs9/libnice.def: nice/libnice.sym
-	$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)(echo "LIBRARY libnice"; \
-	            echo ""; \
-	            echo "EXPORTS"; \
-	            echo ""; \
-	            cat $<; \
-	            echo "stun_debug"; \
-	            echo "stun_debug_bytes"; \
-	            echo "stun_hash_creds") > $@
-
-CLEANFILES += win32/vs9/libnice.def
-
 lcov:
 	find -name '*.gcda' -delete
 	$(MAKE) $(AM_MAKEFLAGS) check
diff --git a/README b/README
index cbd2dd0..7eccc63 100644
--- a/README
+++ b/README
@@ -32,9 +32,6 @@ Please refer to the INSTALL file for more details.
 If you are building from git, you must first run the ./autogen.sh script
 to generate the configure file for you.
 
-To build on Windows, please refer to the README.win32 file for build instructions
-using Microsoft Visual Studio.
-
 Structure
 ---------
 
diff --git a/README.win32 b/README.win32
deleted file mode 100644
index 1461b55..0000000
--- a/README.win32
+++ /dev/null
@@ -1,62 +0,0 @@
-Microsoft Visual Studio v9.0 (aka Microsoft Visual Studio 2008)
----------------------------------------------------------------
-1) Download prerequisites (glib, zlib and gettext-runtime)
-Go to http://www.gtk.org/download/win32.php
-Download GLib Run-time and Dev packages. At time of writing GLib current version is 2.28.8.
-Links are
-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib_2.28.8-1_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/glib/2.28/glib-dev_2.28.8-1_win32.zip
-Download zlib and gettext-runtime Run-time package. At time of writing zlib current version is 1.2.5
-and gettext-runtime current version is 0.18.1.1
-Links are
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/zlib_1.2.5-2_win32.zip
-http://ftp.gnome.org/pub/gnome/binaries/win32/dependencies/gettext-runtime_0.18.1.1-2_win32.zip
-
-Please not: these packages are no longer supported by libnice and newer packages are not provided.
-You could use a gstreamer windows build for a current GLib build. Install the devel and runtime installer
-and copy the glib directory over to your libnice source file as described below
-
-http://gstreamer.freedesktop.org/data/pkg/windows/
-
-libnice compiles fine with the version 1.4.5
-
-2) Put glib in the correct path
-Create a folder glib under libnice root as in the following picture:
-
-libnice
-    |--- agent
-    |--- docs
-    |--- glib       <--------------
-    |--- gst
-    | ...
-    |--- tests
-    |--- win32
-    | AUTHORS
-    | ...
-    | TODO
-
-Expand glib_<current-version>_win32.zip, glib-dev_<current-version>_win32.zip,
-zlib_<current-version>_win32.zip and gettext-runtime_<current-version>_win32.zip under glib
-folder.
-The tree should be like the following picture:
-
-libnice
-    |--- ...
-    |--- glib
-    |-------- bin
-    |-------- etc
-    |-------- include
-    |-------- lib
-    |-------- manifest
-    |-------- share
-    |-------- src
-    |--- ...
-
-3) Open win32/libnice.sln with Microsoft Visual Studio 2008
-
-Build solution, output will be on libnice/win32/vs9/libnice/bin/Win32_Debug or libnice/win32/vs9/libnice/bin/Win32_Release
-depending on the configuration chosen.
-
-
-
-
diff --git a/win32/vs9/config.h b/win32/vs9/config.h
deleted file mode 100644
index 9d87c2d..0000000
--- a/win32/vs9/config.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <arpa/inet.h> header file. */
-/* #undef HAVE_ARPA_INET_H */
-
-/* Define to 1 if C supports variable-length arrays. */
-#define HAVE_C_VARARRAYS 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* \
 Whether getifaddrs() is available on the system */
-/* #undef HAVE_GETIFADDRS */
-
-/* Have the GUPnP IGD library */
-/* #undef HAVE_GUPNP */
-
-/* Define to 1 if you have the <ifaddrs.h> header file. */
-/* #undef HAVE_IFADDRS_H */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <net/in.h> header file. */
-/* #undef HAVE_NET_IN_H */
-
-/* Define to 1 if you have the `poll' function. */
-/* #undef HAVE_POLL */
-
-/* Define to 1 if stdbool.h conforms to C99. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-#define HAVE__BOOL 1
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#define LT_OBJDIR ".libs/"
-
-/* Define to 1 if assertions should be disabled. */
-/* #undef NDEBUG */
-
-/* Public library function implementation */
-#define NICEAPI_EXPORT 
-
-/* Name of package */
-#define PACKAGE "libnice"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "libnice"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libnice 0.1.1.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libnice"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.1.1.1"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "0.1.1.1"
-
-/* Define to `2' to get GNU/libc warnings. */
-#define _FORTIFY_SOURCE 2
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-/*#define restrict __restrict*/
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
diff --git a/win32/vs9/glib.vcproj b/win32/vs9/glib.vcproj
deleted file mode 100644
index b06a3f7..0000000
--- a/win32/vs9/glib.vcproj
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="glib"
-	ProjectGUID="{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}"
-	RootNamespace="glib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="10"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="10"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath="..\..\glib\bin\libgio-2.0-0.dll"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\glib\bin\libglib-2.0-0.dll"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\glib\bin\libgmodule-2.0-0.dll"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\glib\bin\libgobject-2.0-0.dll"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath="..\..\glib\bin\libgthread-2.0-0.dll"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCustomBuildTool"
-					Description="copying $(InputFileName) to OutDir"
-					CommandLine="copy /y $(InputPath) $(OutDir) &gt;NUL&#x0D;&#x0A;"
-					Outputs="$(OutDir)\$(InputFileName)"
-				/>
-			</FileConfiguration>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/libnice.sln b/win32/vs9/libnice.sln
deleted file mode 100644
index 80d37c1..0000000
--- a/win32/vs9/libnice.sln
+++ /dev/null
@@ -1,143 +0,0 @@
-

-Microsoft Visual Studio Solution File, Format Version 10.00

-# Visual Studio 2008

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnice", "libnice.vcproj", "{550C7FB8-DBFE-4364-B26A-DAF7158CD878}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test.vcproj", "{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-dribble", "test-dribble.vcproj", "{4E64F83D-4AE9-468A-867A-CB42A8B89150}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-fullmode", "test-fullmode.vcproj", "{60EC66A2-FE1F-413E-8FEE-204386D62617}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "glib.vcproj", "{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-pseudotcp", "test-pseudotcp.vcproj", "{619723EB-D355-46DC-AF8F-0A04F44AC581}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dependencies", "dependencies", "{D3264B88-D38F-41E4-A2CB-C53644913D75}"

-EndProject

-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{46508783-E794-4688-B045-DE02A626B078}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-parse", "test-parse.vcproj", "{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-bind", "test-bind.vcproj", "{07645BAF-F78D-413C-B257-E348B2CEA18A}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-restart", "test-restart.vcproj", "{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-fallback", "test-fallback.vcproj", "{751C43C2-5987-4C4E-AD74-2737814890F0}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-address", "test-address.vcproj", "{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-add-remove-stream", "test-add-remove-stream.vcproj", "{065B91A4-2024-486F-A338-53C31FFC9580}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-thread", "test-thread.vcproj", "{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}"

-	ProjectSection(ProjectDependencies) = postProject

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878} = {550C7FB8-DBFE-4364-B26A-DAF7158CD878}

-	EndProjectSection

-EndProject

-Global

-	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug|Win32 = Debug|Win32

-		Release|Win32 = Release|Win32

-	EndGlobalSection

-	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878}.Debug|Win32.ActiveCfg = Debug|Win32

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878}.Debug|Win32.Build.0 = Debug|Win32

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878}.Release|Win32.ActiveCfg = Release|Win32

-		{550C7FB8-DBFE-4364-B26A-DAF7158CD878}.Release|Win32.Build.0 = Release|Win32

-		{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}.Debug|Win32.Build.0 = Debug|Win32

-		{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}.Release|Win32.ActiveCfg = Release|Win32

-		{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}.Release|Win32.Build.0 = Release|Win32

-		{4E64F83D-4AE9-468A-867A-CB42A8B89150}.Debug|Win32.ActiveCfg = Debug|Win32

-		{4E64F83D-4AE9-468A-867A-CB42A8B89150}.Debug|Win32.Build.0 = Debug|Win32

-		{4E64F83D-4AE9-468A-867A-CB42A8B89150}.Release|Win32.ActiveCfg = Release|Win32

-		{4E64F83D-4AE9-468A-867A-CB42A8B89150}.Release|Win32.Build.0 = Release|Win32

-		{60EC66A2-FE1F-413E-8FEE-204386D62617}.Debug|Win32.ActiveCfg = Debug|Win32

-		{60EC66A2-FE1F-413E-8FEE-204386D62617}.Debug|Win32.Build.0 = Debug|Win32

-		{60EC66A2-FE1F-413E-8FEE-204386D62617}.Release|Win32.ActiveCfg = Release|Win32

-		{60EC66A2-FE1F-413E-8FEE-204386D62617}.Release|Win32.Build.0 = Release|Win32

-		{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}.Debug|Win32.ActiveCfg = Debug|Win32

-		{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}.Debug|Win32.Build.0 = Debug|Win32

-		{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}.Release|Win32.ActiveCfg = Release|Win32

-		{DD34FAC7-C1A2-4F29-8C96-3F053B47D714}.Release|Win32.Build.0 = Release|Win32

-		{619723EB-D355-46DC-AF8F-0A04F44AC581}.Debug|Win32.ActiveCfg = Debug|Win32

-		{619723EB-D355-46DC-AF8F-0A04F44AC581}.Debug|Win32.Build.0 = Debug|Win32

-		{619723EB-D355-46DC-AF8F-0A04F44AC581}.Release|Win32.ActiveCfg = Release|Win32

-		{619723EB-D355-46DC-AF8F-0A04F44AC581}.Release|Win32.Build.0 = Release|Win32

-		{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}.Debug|Win32.ActiveCfg = Debug|Win32

-		{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}.Debug|Win32.Build.0 = Debug|Win32

-		{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}.Release|Win32.ActiveCfg = Release|Win32

-		{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}.Release|Win32.Build.0 = Release|Win32

-		{07645BAF-F78D-413C-B257-E348B2CEA18A}.Debug|Win32.ActiveCfg = Debug|Win32

-		{07645BAF-F78D-413C-B257-E348B2CEA18A}.Debug|Win32.Build.0 = Debug|Win32

-		{07645BAF-F78D-413C-B257-E348B2CEA18A}.Release|Win32.ActiveCfg = Release|Win32

-		{07645BAF-F78D-413C-B257-E348B2CEA18A}.Release|Win32.Build.0 = Release|Win32

-		{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}.Debug|Win32.ActiveCfg = Debug|Win32

-		{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}.Debug|Win32.Build.0 = Debug|Win32

-		{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}.Release|Win32.ActiveCfg = Release|Win32

-		{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}.Release|Win32.Build.0 = Release|Win32

-		{751C43C2-5987-4C4E-AD74-2737814890F0}.Debug|Win32.ActiveCfg = Debug|Win32

-		{751C43C2-5987-4C4E-AD74-2737814890F0}.Debug|Win32.Build.0 = Debug|Win32

-		{751C43C2-5987-4C4E-AD74-2737814890F0}.Release|Win32.ActiveCfg = Release|Win32

-		{751C43C2-5987-4C4E-AD74-2737814890F0}.Release|Win32.Build.0 = Release|Win32

-		{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}.Debug|Win32.ActiveCfg = Debug|Win32

-		{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}.Debug|Win32.Build.0 = Debug|Win32

-		{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}.Release|Win32.ActiveCfg = Release|Win32

-		{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}.Release|Win32.Build.0 = Release|Win32

-		{065B91A4-2024-486F-A338-53C31FFC9580}.Debug|Win32.ActiveCfg = Debug|Win32

-		{065B91A4-2024-486F-A338-53C31FFC9580}.Debug|Win32.Build.0 = Debug|Win32

-		{065B91A4-2024-486F-A338-53C31FFC9580}.Release|Win32.ActiveCfg = Release|Win32

-		{065B91A4-2024-486F-A338-53C31FFC9580}.Release|Win32.Build.0 = Release|Win32

-		{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}.Debug|Win32.ActiveCfg = Debug|Win32

-		{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}.Debug|Win32.Build.0 = Debug|Win32

-		{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}.Release|Win32.ActiveCfg = Release|Win32

-		{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}.Release|Win32.Build.0 = Release|Win32

-	EndGlobalSection

-	GlobalSection(SolutionProperties) = preSolution

-		HideSolutionNode = FALSE

-	EndGlobalSection

-	GlobalSection(NestedProjects) = preSolution

-		{4E64F83D-4AE9-468A-867A-CB42A8B89150} = {46508783-E794-4688-B045-DE02A626B078}

-		{60EC66A2-FE1F-413E-8FEE-204386D62617} = {46508783-E794-4688-B045-DE02A626B078}

-		{619723EB-D355-46DC-AF8F-0A04F44AC581} = {46508783-E794-4688-B045-DE02A626B078}

-		{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8} = {46508783-E794-4688-B045-DE02A626B078}

-		{6E766AF4-4FFD-40AE-B425-54E4874E3AE4} = {46508783-E794-4688-B045-DE02A626B078}

-		{07645BAF-F78D-413C-B257-E348B2CEA18A} = {46508783-E794-4688-B045-DE02A626B078}

-		{A503EF24-EB17-44FA-ABB1-42DCF361F4EA} = {46508783-E794-4688-B045-DE02A626B078}

-		{751C43C2-5987-4C4E-AD74-2737814890F0} = {46508783-E794-4688-B045-DE02A626B078}

-		{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436} = {46508783-E794-4688-B045-DE02A626B078}

-		{065B91A4-2024-486F-A338-53C31FFC9580} = {46508783-E794-4688-B045-DE02A626B078}

-		{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E} = {46508783-E794-4688-B045-DE02A626B078}

-		{DD34FAC7-C1A2-4F29-8C96-3F053B47D714} = {D3264B88-D38F-41E4-A2CB-C53644913D75}

-	EndGlobalSection

-EndGlobal

diff --git a/win32/vs9/libnice.vcproj b/win32/vs9/libnice.vcproj
deleted file mode 100644
index e875f62..0000000
--- a/win32/vs9/libnice.vcproj
+++ /dev/null
@@ -1,567 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="libnice"
-	ProjectGUID="{550C7FB8-DBFE-4364-B26A-DAF7158CD878}"
-	RootNamespace="libnice"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib ws2_32.lib glib-2.0.lib gobject-2.0.lib gio-2.0.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				ModuleDefinitionFile="libnice.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="2"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib ws2_32.lib glib-2.0.lib gobject-2.0.lib gio-2.0.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				ModuleDefinitionFile="libnice.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\agent\address.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\address.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\agent-priv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\agent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\agent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\iostream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\iostream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\inputstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\inputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\outputstream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\outputstream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\bind.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\bind.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\candidate.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\candidate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\component.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\component.h"
-				>
-			</File>
-			<File
-				RelativePath=".\config.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\conncheck.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\conncheck.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\constants.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\debug.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\debug-stun.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\debug-stun.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\agent\debug.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\debug.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\discovery.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\discovery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\http.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\http.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-active.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-active.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-passive.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-passive.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\ice.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\ice.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\interfaces.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\interfaces.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libnice.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\md5.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\pseudossl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\pseudossl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\pseudotcp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\pseudotcp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\discovery.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\discovery.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\rand.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\rand.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\random\random-glib.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\random\random-glib.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\random\random.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\random\random.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\sha1.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\sha1.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\socket.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\socket.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\socks5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\socks5.h"
-				>
-			</File>			
-			<File
-				RelativePath="..\..\socket\udp-turn-over-tcp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\udp-turn-over-tcp.h"
-				>
-			</File>			
-			<File
-				RelativePath="..\..\socket\udp-turn.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\udp-turn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\stream.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\agent\stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stun5389.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stun5389.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunagent.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunagent.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stuncrc32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stuncrc32.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunhmac.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunhmac.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunmessage.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\stunmessage.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-bsd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\tcp-bsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\timer.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\timer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\turn.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\turn-stun.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\turn-stun.obj"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\..\stun\usages\turn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\turn.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\udp-bsd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\socket\udp-bsd.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\utils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\utils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\stun\win32_common.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-add-remove-stream.vcproj b/win32/vs9/test-add-remove-stream.vcproj
deleted file mode 100644
index 2a5a91d..0000000
--- a/win32/vs9/test-add-remove-stream.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-add-remove-stream"
-	ProjectGUID="{065B91A4-2024-486F-A338-53C31FFC9580}"
-	RootNamespace="testaddremovestream"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-add-remove-stream.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-address.vcproj b/win32/vs9/test-address.vcproj
deleted file mode 100644
index ce4c2f7..0000000
--- a/win32/vs9/test-address.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-address"
-	ProjectGUID="{3E9D5FA3-F7C5-474E-8797-DFA3E6B2E436}"
-	RootNamespace="testaddress"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-address.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-bind.vcproj b/win32/vs9/test-bind.vcproj
deleted file mode 100644
index 2101151..0000000
--- a/win32/vs9/test-bind.vcproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-bind"
-	ProjectGUID="{07645BAF-F78D-413C-B257-E348B2CEA18A}"
-	RootNamespace="testbind"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\stun\tests\test-bind.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-dribble.vcproj b/win32/vs9/test-dribble.vcproj
deleted file mode 100644
index bb154b7..0000000
--- a/win32/vs9/test-dribble.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-dribble"
-	ProjectGUID="{4E64F83D-4AE9-468A-867A-CB42A8B89150}"
-	RootNamespace="testdribble"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-dribble.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-fallback.vcproj b/win32/vs9/test-fallback.vcproj
deleted file mode 100644
index 8be2d41..0000000
--- a/win32/vs9/test-fallback.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-fallback"
-	ProjectGUID="{751C43C2-5987-4C4E-AD74-2737814890F0}"
-	RootNamespace="testfallback"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-fallback.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-fullmode.vcproj b/win32/vs9/test-fullmode.vcproj
deleted file mode 100644
index 4b01e7a..0000000
--- a/win32/vs9/test-fullmode.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-fullmode"
-	ProjectGUID="{60EC66A2-FE1F-413E-8FEE-204386D62617}"
-	RootNamespace="testfullmode"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-fullmode.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-parse.vcproj b/win32/vs9/test-parse.vcproj
deleted file mode 100644
index ac5818b..0000000
--- a/win32/vs9/test-parse.vcproj
+++ /dev/null
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-parse"
-	ProjectGUID="{6E766AF4-4FFD-40AE-B425-54E4874E3AE4}"
-	RootNamespace="testparse"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\stun\tests\test-parse.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-pseudotcp.vcproj b/win32/vs9/test-pseudotcp.vcproj
deleted file mode 100644
index 654c954..0000000
--- a/win32/vs9/test-pseudotcp.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-pseudotcp"
-	ProjectGUID="{619723EB-D355-46DC-AF8F-0A04F44AC581}"
-	RootNamespace="testpseudotcp"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-pseudotcp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-restart.vcproj b/win32/vs9/test-restart.vcproj
deleted file mode 100644
index a8d43f2..0000000
--- a/win32/vs9/test-restart.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-restart"
-	ProjectGUID="{A503EF24-EB17-44FA-ABB1-42DCF361F4EA}"
-	RootNamespace="testrestart"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-restart.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test-thread.vcproj b/win32/vs9/test-thread.vcproj
deleted file mode 100644
index 79ef690..0000000
--- a/win32/vs9/test-thread.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test-thread"
-	ProjectGUID="{BA3039AD-5FD0-4A8F-A500-22FFBDB2088E}"
-	RootNamespace="testthread"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test-thread.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/win32/vs9/test.vcproj b/win32/vs9/test.vcproj
deleted file mode 100644
index 9df1843..0000000
--- a/win32/vs9/test.vcproj
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="test"
-	ProjectGUID="{3B5FCB79-8AAA-4388-926B-3AD3F8BBB5D8}"
-	RootNamespace="test"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(SolutionName)\bin\$(PlatformName)_$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)$(SolutionName)\obj\$(PlatformName)_$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\glib\include\glib-2.0;..\..\glib\lib\glib-2.0\include;..\..\socket;.;..\..\;..\..\stun;..\..\random;..\..\agent"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gthread-2.0.lib ws2_32.lib"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\..\glib\lib"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\..\tests\test.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>