diff --git a/libs/jrtp4c/w32/jrtp4c.sln b/libs/jrtp4c/w32/jrtp4c.sln
deleted file mode 100644
index b44614bd57..0000000000
--- a/libs/jrtp4c/w32/jrtp4c.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
-	ProjectSection(ProjectDependencies) = postProject
-		{4009F58A-E333-424B-A868-7E82804DD055} = {4009F58A-E333-424B-A868-7E82804DD055}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
-	ProjectSection(ProjectDependencies) = postProject
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Debug|Win32.Build.0 = Debug|Win32
-		{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.ActiveCfg = Release|Win32
-		{E85B3E1F-B671-4E84-9F09-90F61A27D783}.Release|Win32.Build.0 = Release|Win32
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Debug|Win32.Build.0 = Debug|Win32
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.ActiveCfg = Release|Win32
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}.Release|Win32.Build.0 = Release|Win32
-		{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.ActiveCfg = Debug|Win32
-		{4009F58A-E333-424B-A868-7E82804DD055}.Debug|Win32.Build.0 = Debug|Win32
-		{4009F58A-E333-424B-A868-7E82804DD055}.Release|Win32.ActiveCfg = Release|Win32
-		{4009F58A-E333-424B-A868-7E82804DD055}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index f8d711e5cb..2e3bd8d2ce 100644
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+# Visual C++ Express 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeSwitchConsole", "FreeSwitchConsole.vcproj", "{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
 	ProjectSection(ProjectDependencies) = postProject
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
@@ -48,8 +48,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom
 		{202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF}
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mod", "Mod", "{AC923B27-D665-490E-94F5-FA40E1607FB6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
diff --git a/w32/vsnet/GetLibs.vbs b/w32/vsnet/GetLibs.vbs
index 375f92b9bf..65d1d9a5b1 100644
--- a/w32/vsnet/GetLibs.vbs
+++ b/w32/vsnet/GetLibs.vbs
@@ -5,19 +5,19 @@ Set WshSysEnv = WshShell.Environment("SYSTEM")
 Set xml = CreateObject("Microsoft.XMLHTTP")
 Set oStream = createobject("Adodb.Stream")
 Set objArgs = WScript.Arguments
-Dim vcver, DevEnv
+Dim vcver, DevEnv, VCBuild
 BuildRelease=False
 BuildDebug=False
 BuildCore=False
 BuildModExosip=false
-
+quote=Chr(34)
 ScriptDir=Left(WScript.ScriptFullName,Len(WScript.ScriptFullName)-Len(WScript.ScriptName))
 
 LibDestDir=Showpath(ScriptDir & "..\..\libs")
 UtilsDir=Showpath(ScriptDir & "Tools")
 GetTarGZObjects UtilsDir
-GetDevEnv
-Wscript.echo "Detected Visual Studio DevEnv: " & DevEnv
+GetVCBuild
+Wscript.echo "Detected VCBuild: " & VCBuild
 
 If objArgs.Count >=2 Then
 	Select Case objArgs(1)
@@ -65,18 +65,20 @@ Sub BuildLibs_Core(BuildDebug, BuildRelease)
 			WgetUnTarGz "http://www.sofaswitch.org/mikej/apr-1.2.2.tar.gz", LibDestDir
 		End If
 		RenameFolder LibDestDir & "apr-1.2.2", "apr"
-		Unix2dos LibDestDir & "apr\libapr.dsp"
-		Upgrade LibDestDir & "apr\libapr.dsp", LibDestDir & "apr\libapr.vcproj"
+		FSO.CopyFile Utilsdir & "libapr.vcproj", LibDestDir & "apr\", True
+		FindReplaceInFile LibDestDir & "apr\libapr.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
+		FindReplaceInFile LibDestDir & "apr\file_io\unix\fullrw.c", "int i;", "unsigned int i;"
+'		Upgrade LibDestDir & "apr\libapr.dsp", LibDestDir & "apr\libapr.vcproj"
 	End If 
 	If FSO.FolderExists(LibDestDir & "apr") Then 
 		If BuildDebug Then
 			If Not FSO.FileExists(LibDestDir & "apr\Debug\libapr-1.lib") Then 
-				BuildViaDevEnv LibDestDir & "apr\libapr.vcproj", "Debug"
+				BuildViaVCBuild LibDestDir & "apr\libapr.vcproj", "Debug"
 			End If
 		End If
 		If BuildRelease Then
 			If Not FSO.FileExists(LibDestDir & "apr\Release\libapr-1.lib") Then 
-				BuildViaDevEnv LibDestDir & "apr\libapr.vcproj", "Release"
+				BuildViaVCBuild LibDestDir & "apr\libapr.vcproj", "Release"
 			End If
 		End If
 	Else
@@ -91,19 +93,20 @@ Sub BuildLibs_Core(BuildDebug, BuildRelease)
 		End If
 		RenameFolder LibDestDir & "sqlite-source-3_2_7", "sqlite"
 		FSO.CopyFile Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\", True
+		FindReplaceInFile LibDestDir & "sqlite\sqlite.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
 	'	Upgrade Utilsdir & "sqlite.vcproj", LibDestDir & "sqlite\sqlite.vcproj"
 	End If
 	If FSO.FolderExists(LibDestDir & "sqlite") Then 
 		If BuildDebug Then
 			If Not FSO.FileExists(LibDestDir & "sqlite\Debug\sqlite.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj"
-				BuildViaDevEnv LibDestDir & "sqlite\sqlite.vcproj", "Debug"
+'				UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj"
+				BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Debug"
 			End If
 		End If
 		If BuildRelease Then
 			If Not FSO.FileExists(LibDestDir & "sqlite\Release\sqlite.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj"
-				BuildViaDevEnv LibDestDir & "sqlite\sqlite.vcproj", "Release"
+'				UpgradeViaDevEnv LibDestDir & "sqlite\sqlite.vcproj"
+				BuildViaVCBuild LibDestDir & "sqlite\sqlite.vcproj", "Release"
 			End If
 		End If
 	Else
@@ -120,20 +123,24 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
 			WgetUnTarGz "http://www.sofaswitch.org/mikej/libosip2-2.2.2.tar.gz", LibDestDir
 		End If
 		RenameFolder LibDestDir & "libosip2-2.2.2", "osip"
-		FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True
-		FSO.CopyFile Utilsdir & "osip2.vcproj", LibDestDir & "osip\platform\vsnet\", True
+'		FSO.CopyFile Utilsdir & "osipparser2.vcproj", LibDestDir & "osip\platform\vsnet\", True
+'		FSO.CopyFile Utilsdir & "osip2.vcproj", LibDestDir & "osip\platform\vsnet\", True
+		FindReplaceInFile LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
+		FindReplaceInFile LibDestDir & "osip\platform\vsnet\osip2.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
 	End If
 	If FSO.FolderExists(LibDestDir & "osip") Then 
 		If BuildDebug Then
 			If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Debug\osip2.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
-				BuildViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln", "Debug"
+'				UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
+				BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Debug"
+				BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Debug"
 			End If
 		End If
 		If BuildRelease Then
 			If Not FSO.FileExists(LibDestDir & "osip\platform\vsnet\Release\osip2.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
-				BuildViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln", "Release"
+'				UpgradeViaDevEnv LibDestDir & "osip\platform\vsnet\osip.sln"
+				BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osip2.vcproj", "Release"
+				BuildViaVCBuild LibDestDir & "osip\platform\vsnet\osipparser2.vcproj", "Release"
 			End If
 		End If
 	Else
@@ -147,19 +154,20 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
 			WgetUnTarGz "http://www.sofaswitch.org/mikej/libeXosip2-2.2.2.tar.gz", LibDestDir
 		End If
 		RenameFolder LibDestDir & "libeXosip2-2.2.2", "libeXosip2"
+		FindReplaceInFile LibDestDir & "libeXosip2\platform\vsnet\eXosip.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
 '		FSO.CopyFile Utilsdir & "eXosip.vcproj", LibDestDir & "libeXosip2\platform\vsnet\", True
 	End If
 	If FSO.FolderExists(LibDestDir & "libeXosip2") Then 
 		If BuildDebug Then
 			If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Debug\exosip.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
-				BuildViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Debug"
+'				UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
+				BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Debug"
 			End If
 		End If
 		If BuildRelease Then
 			If Not FSO.FileExists(LibDestDir & "libeXosip2\platform\vsnet\Release\exosip.lib") Then 
-				UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
-				BuildViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Release"
+'				UpgradeViaDevEnv LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj"
+				BuildViaVCBuild LibDestDir & "libeXosip2\platform\vsnet\exosip.vcproj", "Release"
 			End If
 		End If
 	Else
@@ -172,6 +180,7 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
 			Wscript.echo "Unable to get JThread from default download location, Trying backup location:"
 			WgetUnTarGz "http://www.sofaswitch.org/mikej/jthread-1.1.2.tar.gz", LibDestDir
 		End If
+		FindReplaceInFile LibDestDir & "jthread-1.1.2\jthread.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
 	End If
 	
 	If Not FSO.FolderExists(LibDestDir & "jrtplib") Then 
@@ -181,18 +190,24 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
 			WgetUnTarGz "http://www.sofaswitch.org/mikej/jrtplib-3.3.0.tar.gz", LibDestDir
 		End If
 		RenameFolder LibDestDir & "jrtplib-3.3.0", "jrtplib"
+		FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WIN32;", "_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32;"
+		FindReplaceInFile LibDestDir & "jrtplib\jrtplib.vcproj", "WarningLevel=" & quote & "3" & quote, "WarningLevel=" & quote & "0" & quote
 	End If
 	If FSO.FolderExists(LibDestDir & "jrtplib") And FSO.FolderExists(LibDestDir & "jthread-1.1.2") And FSO.FolderExists(LibDestDir & "jrtp4c")Then 
 		If BuildDebug Then
 			If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Debug\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Debug\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Debug\jthread.lib")) Then 
-				UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
-				BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Debug"
+'				UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
+				BuildViaVCBuild LibDestDir & "jrtp4c\w32\jrtp4c.vcproj", "Debug"
+				BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Debug"
+				BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Debug"
 			End If
 		End If
 		If BuildRelease Then
 			If (Not FSO.FileExists(LibDestDir & "jrtp4c\w32\Release\jrtp4c.lib")) Or (Not FSO.FileExists(LibDestDir & "jrtplib\Release\jrtplib.lib")) Or (Not FSO.FileExists(LibDestDir & "jthread-1.1.2\Release\jthread.lib")) Then 
-				UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
-				BuildViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln", "Release"
+'				UpgradeViaDevEnv LibDestDir & "jrtp4c\w32\jrtp4c.sln"
+				BuildViaVCBuild LibDestDir & "jrtp4c\w32\jrtp4c.vcproj", "Release"
+				BuildViaVCBuild LibDestDir & "jrtplib\jrtplib.vcproj", "Release"
+				BuildViaVCBuild LibDestDir & "jthread-1.1.2\jthread.vcproj", "Release"
 			End If
 		End If
 	Else
@@ -203,7 +218,7 @@ Sub BuildLibs_ModExosip(BuildDebug, BuildRelease)
 End Sub
 
 Sub UpgradeViaDevEnv(ProjectFile)
-	Set oExec = WshShell.Exec(Chr(34) & DevEnv & Chr(34) & " " & Chr(34) & ProjectFile & Chr(34) & " /Upgrade ")
+	Set oExec = WshShell.Exec(quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Upgrade ")
 	Do While oExec.Status <> 1
 	WScript.Sleep 100
 	Loop
@@ -211,7 +226,7 @@ End Sub
 
 Sub BuildViaDevEnv(ProjectFile, BuildType)
 	Wscript.echo "Building : " & ProjectFile & " Config type: " & BuildType
-	BuildCmd=Chr(34) & DevEnv & Chr(34) & " " & Chr(34) & ProjectFile & Chr(34) & " /Build " & BuildType
+	BuildCmd=quote & DevEnv & quote & " " & quote & ProjectFile & quote & " /Build " & BuildType
 	Set MyFile = fso.CreateTextFile(UtilsDir & "tmpBuild.Bat", True)
 	MyFile.WriteLine("@" & BuildCmd)
 	MyFile.Close
@@ -223,6 +238,34 @@ Sub BuildViaDevEnv(ProjectFile, BuildType)
 	Loop While Not OExec.StdOut.atEndOfStream
 End Sub
 
+Sub BuildViaVCBuild(ProjectFile, BuildType)
+	Wscript.echo "Building : " & ProjectFile & " Config type: " & BuildType
+	BuildCmd=quote & VCBuild & quote & " /nologo /nocolor " & quote & ProjectFile & quote & " " & BuildType
+	Set MyFile = fso.CreateTextFile(UtilsDir & "tmpBuild.Bat", True)
+	MyFile.WriteLine("@" & BuildCmd)
+	MyFile.Close
+
+	Set oExec = WshShell.Exec(UtilsDir & "tmpBuild.Bat")
+	Do
+		strFromProc = OExec.StdOut.ReadLine()
+		WScript.Echo  strFromProc
+	Loop While Not OExec.StdOut.atEndOfStream
+End Sub
+
+Sub GetVCBuild()
+	If WshSysEnv("VS80COMNTOOLS")<> "" Then 
+		vcver = "8"
+		VCBuild=Showpath(WshSysEnv("VS80COMNTOOLS")&"..\..\VC\vcpackages\") & "vcbuild.exe"
+	Else If WshSysEnv("VS71COMNTOOLS")<> "" Then
+		vcver = "7"
+		VCBuild=Showpath(WshSysEnv("VS71COMNTOOLS")&"..\..\VC\vcpackages\") & "vcbuild.exe"
+	Else
+		Wscript.Echo("Did not find any Visual Studio .net 2003 or 2005 on your machine")
+		WScript.Quit(1)
+	End If
+	End If
+End Sub
+
 Sub GetDevEnv()
 	If WshSysEnv("VS80COMNTOOLS")<> "" Then 
 		vcver = "8"
@@ -239,17 +282,20 @@ End Sub
 
 
 Sub RenameFolder(FolderName, NewFolderName)
-On Error Resume Next
+'On Error Resume Next
 	Set Folder=FSO.GetFolder(FolderName)
 	Folder.Name = NewFolderName
-On Error GoTo 0
+'On Error GoTo 0
 End Sub
 
 Sub Upgrade(OldFileName, NewFileName)
-On Error Resume Next
+'On Error Resume Next
 	If WshSysEnv("VS80COMNTOOLS")<> "" Then 
+		Wscript.echo "8.0"
 		Set vcProj = CreateObject("VisualStudio.VCProjectEngine.8.0")
+		
 	Else If WshSysEnv("VS71COMNTOOLS")<> "" Then
+		Wscript.echo "7.1"
 		Set vcProj = CreateObject("VisualStudio.VCProjectEngine.7.1")
 	Else
 		Wscript.Echo("Did not find any Visual Studio .net 2003 or 2005 on your machine")
@@ -269,7 +315,7 @@ On Error Resume Next
 	vcProject.Save()
 	End If
 '	WScript.Echo("New Project Name: "+vcProject.ProjectFile+"")
-On Error GoTo 0
+'On Error GoTo 0
 End Sub
 
 
@@ -290,6 +336,24 @@ Sub Unix2dos(FileName)
 	fNewFile.WriteLine sText
 	fNewFile.Close
 End Sub
+
+Sub FindReplaceInFile(FileName, sFind, sReplace)
+	Const OpenAsASCII = 0  ' Opens the file as ASCII (TristateFalse) 
+	Const OpenAsUnicode = -1  ' Opens the file as Unicode (TristateTrue) 
+	Const OpenAsDefault = -2  ' Opens the file using the system default 
+	
+	Const OverwriteIfExist = -1 
+	Const FailIfNotExist   =  0 
+	Const ForReading       =  1 
+	
+	Set fOrgFile = FSO.OpenTextFile(FileName, ForReading, FailIfNotExist, OpenAsASCII)
+	sText = fOrgFile.ReadAll
+	fOrgFile.Close
+	sText = Replace(sText, sFind, sReplace)
+	Set fNewFile = FSO.CreateTextFile(FileName, OverwriteIfExist, OpenAsASCII)
+	fNewFile.WriteLine sText
+	fNewFile.Close
+End Sub
 	
 Sub WgetUnTarGZ(URL, DestFolder)
 	If Right(DestFolder, 1) <> "\" Then DestFolder = DestFolder & "\" End If
diff --git a/w32/vsnet/Tools/eXosip.vcproj b/w32/vsnet/Tools/eXosip.vcproj
deleted file mode 100644
index dd175b8a61..0000000000
--- a/w32/vsnet/Tools/eXosip.vcproj
+++ /dev/null
@@ -1,361 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="eXosip"
-	ProjectGUID="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
-	RootNamespace="eXosip"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\.libs/eXosip.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\osip\include,..\..\include"
-				PreprocessorDefinitions="EXOSIP_EXPORTS;_DEBUG;ENABLE_TRACE;WIN32;_WINDOWS;_USRDLL;OSIP_MT;_MT"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				AssemblerListingLocation="Debug/"
-				ObjectFile="Debug/"
-				ProgramDataBaseFileName="$(IntDir)/eXosip.pdb"
-				BrowseInformation="1"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\.libs/eXosip.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\osip\include,..\..\include"
-				PreprocessorDefinitions="NDEBUG;EXOSIP_EXPORTS;ENABLE_TRACE;WIN32;_WINDOWS;_USRDLL;OSIP_MT;USE_TMP_BUFFER"
-				StringPooling="false"
-				ExceptionHandling="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="false"
-				EnableFunctionLevelLinking="false"
-				UsePrecompiledHeader="0"
-				PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"
-				AssemblerListingLocation="Release/"
-				ObjectFile="Release/"
-				ProgramDataBaseFileName="$(IntDir)/eXosip.pdb"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				CompileAs="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1036"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\src\eXcall_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXconf.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXinsubscription_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXmessage_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXoptions_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXosip.c"
-				>
-			</File>
-			<File
-				RelativePath="eXosip.def"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXpublish_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXrefer_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXregister_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXsubscription_api.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXtransport.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXutils.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\inet_ntop.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jauth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jcall.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jcallback.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jdialog.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jevents.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jnotify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jpipe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jpublish.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jreg.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jrequest.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jresponse.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jsubscribe.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\sdp_offans.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\udp.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl"
-			>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_call.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_options.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_publish.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_refer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_register.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_setup.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eX_subscribe.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\include\eXosip2\eXosip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\eXosip2.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\inet_ntop.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\jpipe.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-			>
-		</Filter>
-	</Files>
-</VisualStudioProject>
diff --git a/w32/vsnet/Tools/osip2.vcproj b/w32/vsnet/Tools/osip2.vcproj
deleted file mode 100644
index 9a8ee9665e..0000000000
--- a/w32/vsnet/Tools/osip2.vcproj
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="osip2"
-	ProjectGUID="{85255507-5D16-4218-85E2-F683BB2F04DA}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_WIN32_WINNT;WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\osip2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_WIN32_WINNT;WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\osip2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_WIN32_WINNT;WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\windows\osip2.def"
-				GenerateDebugInformation="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="_WIN32_WINNT;WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\windows\osip2.def"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<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;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\..\src\osip2\fsm_misc.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\ict.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\ict_fsm.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\ist.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\ist_fsm.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\nict.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\nict_fsm.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\nist.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\nist_fsm.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip_dialog.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip_event.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip_negotiation.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip_time.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\osip_transaction.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\port_condv.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\port_fifo.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\port_sema.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\port_thread.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\..\src\osip2\fsm.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\internal.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip_condv.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip_dialog.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip_fifo.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip_mt.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osip2\osip_negotiation.h">
-			</File>
-			<File
-				RelativePath="..\..\src\osip2\xixt.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/w32/vsnet/Tools/osipparser2.vcproj b/w32/vsnet/Tools/osipparser2.vcproj
deleted file mode 100644
index 74f00acded..0000000000
--- a/w32/vsnet/Tools/osipparser2.vcproj
+++ /dev/null
@@ -1,435 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="osipparser2"
-	ProjectGUID="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
-	RootNamespace="osipparser2"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)\osipparser2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="4"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="$(OutDir)/osipparser2.lib"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Debug DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\windows\osipparser2.def"
-				GenerateDebugInformation="TRUE"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release DLL|Win32"
-			OutputDirectory="$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\include;..\..\src\osipparser2"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;OSIP_MT;ENABLE_TRACE;SYSTEM_LOGGER_ENABLED"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="$(OutDir)/$(ProjectName).pdb"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				ModuleDefinitionFile="..\windows\osipparser2.def"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<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;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\..\src\osipparser2\osip_accept.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_accept_encoding.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_accept_language.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_alert_info.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_allow.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_authentication_info.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_authorization.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_body.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_call_id.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_call_info.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_contact.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_content_disposition.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_content_encoding.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_content_length.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_content_type.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_cseq.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_error_info.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_from.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_header.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_list.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_md5c.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_message.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_message_parse.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_message_to_str.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_mime_version.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_parser_cfg.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_port.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_proxy_authenticate.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_proxy_authentication_info.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_proxy_authorization.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_record_route.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_rfc3264.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_route.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_to.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_uri.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_via.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_www_authenticate.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\sdp_accessor.c">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\sdp_message.c">
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_accept.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_accept_encoding.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_accept_language.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_alert_info.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_allow.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_authorization.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_body.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_call_id.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_call_info.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_const.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_contact.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_content_disposition.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_content_encoding.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_content_length.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_content_type.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_cseq.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_error_info.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_from.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_header.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_headers.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_list.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_md5.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_message.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_mime_version.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_parser.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_port.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_proxy_authenticate.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_proxy_authorization.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_record_route.h">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\osip_rfc3264i.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_route.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_to.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\osip_uri.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_via.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\headers\osip_www_authenticate.h">
-			</File>
-			<File
-				RelativePath="..\..\src\osipparser2\parser.h">
-			</File>
-			<File
-				RelativePath="..\..\include\osipparser2\sdp_message.h">
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/w32/vsnet/mod_exosip.vcproj b/w32/vsnet/mod_exosip.vcproj
index 79f35eb8e6..2b5a8be490 100644
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/w32/vsnet/mod_exosip.vcproj
@@ -43,7 +43,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src;..\..\libs\osip\src\osipparser2"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
@@ -130,7 +130,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"
+				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\apr\include;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src;..\..\libs\osip\src\osipparser2"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -198,12 +198,20 @@
 				RelativePath="..\..\src\mod\mod_exosip\mod_exosip.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\libs\osip\src\osipparser2\osip_rfc3264.c"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\libs\osip\src\osipparser2\osip_rfc3264i.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"