From d5897787556d95da51422b89f48b35d7c2e17d70 Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Sun, 20 Nov 2005 00:45:09 +0000
Subject: [PATCH] More win32 build cleanups

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@57 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 libs/jrtp4c/w32/jrtp4c.vcproj      |   4 +-
 src/mod/mod_exosip/mod_exosip.c    |   2 +-
 w32/vsnet/FreeSwitchConsole.vcproj |   5 +-
 w32/vsnet/FreeSwitchCore.vcproj    |   4 +-
 w32/vsnet/Freeswitch.sln           |  34 +--
 w32/vsnet/GetLibs.bat              |  54 ++--
 w32/vsnet/Tools/osipparser2.vcproj | 476 +++++++++++++++++++++++++++++
 w32/vsnet/mod_bridgecall.vcproj    |   4 +-
 w32/vsnet/mod_dialplan_demo.vcproj |   5 +-
 w32/vsnet/mod_exosip.vcproj        |  10 +-
 w32/vsnet/mod_g711codec.vcproj     |   5 +-
 w32/vsnet/mod_playback.vcproj      |   5 +-
 w32/vsnet/mod_rawaudio.vcproj      |   5 +-
 w32/vsnet/mod_softtimer.vcproj     |   5 +-
 w32/vsnet/mod_woomerachan.vcproj   |   5 +-
 15 files changed, 545 insertions(+), 78 deletions(-)
 create mode 100644 w32/vsnet/Tools/osipparser2.vcproj

diff --git a/libs/jrtp4c/w32/jrtp4c.vcproj b/libs/jrtp4c/w32/jrtp4c.vcproj
index d9858e7c75..097cc3dfb4 100644
--- a/libs/jrtp4c/w32/jrtp4c.vcproj
+++ b/libs/jrtp4c/w32/jrtp4c.vcproj
@@ -39,7 +39,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D WIN32"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib-3.3.0\src&quot;;&quot;$(ProjectDir)..\src&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;"
 				RuntimeLibrary="1"
 			/>
 			<Tool
@@ -93,7 +93,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib-3.3.0\src&quot;;&quot;$(ProjectDir)..\src&quot;"
+				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
diff --git a/src/mod/mod_exosip/mod_exosip.c b/src/mod/mod_exosip/mod_exosip.c
index 31c097107e..6beda2d980 100644
--- a/src/mod/mod_exosip/mod_exosip.c
+++ b/src/mod/mod_exosip/mod_exosip.c
@@ -34,7 +34,7 @@
 #define HAVE_APR
 #include <switch.h>
 #include <jrtp4c.h>
-#include <eXosip/eXosip.h>
+#include <eXosip2/eXosip.h>
 #include <osip2/osip_mt.h>
 #include <osipparser2/osip_rfc3264.h>
 #include <osipparser2/osip_port.h>
diff --git a/w32/vsnet/FreeSwitchConsole.vcproj b/w32/vsnet/FreeSwitchConsole.vcproj
index a181ce866e..9a62c3ff18 100644
--- a/w32/vsnet/FreeSwitchConsole.vcproj
+++ b/w32/vsnet/FreeSwitchConsole.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="FreeSwitchConsole"
 	ProjectGUID="{1AF3A893-F7BE-43DD-B697-8AB2397C0D67}"
+	RootNamespace="FreeSwitchConsole"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +119,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)include;$(InputDir)..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index 5d40162268..ae6f31498f 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"
+				AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr\include&quot;"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -122,7 +122,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr-1.2.2\include&quot;"
+				AdditionalIncludeDirectories="..\..\src\include;&quot;..\..\libs\apr\include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 5e4aecd9ea..5d61c0fe6a 100644
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -65,14 +65,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr-1.2.2\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {44F46B7E-0E51-4304-9735-330DFBAB41E5}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osipparser2", "..\..\libs\osip\platform\vsnet\osipparser2.vcproj", "{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "eXosip", "..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj", "{4EA67539-9EE9-4065-BD39-87E517FD8262}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c\w32\jrtp4c.vcproj", "{E85B3E1F-B671-4E84-9F09-90F61A27D783}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -337,8 +337,8 @@ Global
 		{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release IPv6 XP|Win32.Build.0 = Release|Win32
 		{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.ActiveCfg = Release|Win32
 		{44F46B7E-0E51-4304-9735-330DFBAB41E5}.Release|Win32.Build.0 = Release|Win32
-		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32
-		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.Build.0 = Debug DLL|Win32
+		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.ActiveCfg = Debug|Win32
+		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug DLL|Win32.Build.0 = Debug|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 MSR|Win32.ActiveCfg = Debug|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 MSR|Win32.Build.0 = Debug|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 Musica|Win32.ActiveCfg = Debug|Win32
@@ -347,8 +347,8 @@ Global
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug IPv6 Win2000|Win32.Build.0 = Debug|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.ActiveCfg = Debug|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Debug|Win32.Build.0 = Debug|Win32
-		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.ActiveCfg = Release DLL|Win32
-		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.Build.0 = Release DLL|Win32
+		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.ActiveCfg = Release|Win32
+		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release DLL|Win32.Build.0 = Release|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 Win2000|Win32.ActiveCfg = Release|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 Win2000|Win32.Build.0 = Release|Win32
 		{4EA67539-9EE9-4065-BD39-87E517FD8262}.Release IPv6 XP|Win32.ActiveCfg = Release|Win32
@@ -414,20 +414,20 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{85255507-5D16-4218-85E2-F683BB2F04DA} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{E85B3E1F-B671-4E84-9F09-90F61A27D783} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{4009F58A-E333-424B-A868-7E82804DD055} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{4EA67539-9EE9-4065-BD39-87E517FD8262} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
-		{40D9233D-E463-4DD6-AB34-47BC3BFBED19} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
-		{E1794405-29D4-466D-9BE3-DD2344C2A663} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
-		{FE3540C5-3303-46E0-A69E-D92F775687F1} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+		{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
 		{2988EB83-785F-45D4-8731-8E1E4345177E} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
 		{45DF84ED-D24A-4FF6-B5B0-0A9A5FDB9552} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
 		{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
 		{78100236-7CEA-4948-96CC-E8ED3160329C} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
 		{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
-		{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+		{FE3540C5-3303-46E0-A69E-D92F775687F1} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+		{40D9233D-E463-4DD6-AB34-47BC3BFBED19} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+		{E1794405-29D4-466D-9BE3-DD2344C2A663} = {AC923B27-D665-490E-94F5-FA40E1607FB6}
+		{44F46B7E-0E51-4304-9735-330DFBAB41E5} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+		{4EA67539-9EE9-4065-BD39-87E517FD8262} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+		{E85B3E1F-B671-4E84-9F09-90F61A27D783} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+		{4009F58A-E333-424B-A868-7E82804DD055} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
+		{85255507-5D16-4218-85E2-F683BB2F04DA} = {40D9233D-E463-4DD6-AB34-47BC3BFBED19}
 	EndGlobalSection
 EndGlobal
diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat
index 97902fa5b5..7c8dce04b9 100644
--- a/w32/vsnet/GetLibs.bat
+++ b/w32/vsnet/GetLibs.bat
@@ -19,23 +19,23 @@ set UNIX2DOS=%UTILSDIR%\unix2dos.vbs
 set APRDIR=apr-1.2.2
 set APRTAR=%APRDIR%.tar.gz
 set APRURL=ftp://ftp.wayne.edu/apache/apr/
-set APRDESTDIR=%APRDIR%
+set APRDESTDIR=apr
 set JRTPDIR=jrtplib-3.3.0
 set JRTPTAR=%JRTPDIR%.tar.gz
 set JRTPURL=http://research.edm.luc.ac.be/jori/jrtplib/
-set JRTPDESTDIR=%JRTPDIR%
+set JRTPDESTDIR=jrtplib
 set JTHREADDIR=jthread-1.1.2
 set JTHREADTAR=%JTHREADDIR%.tar.gz
 set JTHREADURL=http://research.edm.luc.ac.be/jori/jthread/
 set JTHREADDESTDIR=%JTHREADDIR%
-set EXOSIPDIR=libeXosip-0.9.0
+set EXOSIPDIR=libeXosip2-1.9.1-pre17
 set EXOSIPTAR=%EXOSIPDIR%.tar.gz
 set EXOSIPURL=http://www.antisip.com/download/
-set EXOSIPDESTDIR=%EXOSIPDIR%
+set EXOSIPDESTDIR=libeXosip2
 set OSIPDIR=libosip2-2.2.1
 set OSIPTAR=%OSIPDIR%.tar.gz
 set OSIPURL=http://www.antisip.com/download/
-set OSIPDESTDIR=libosip2-2.2.0
+set OSIPDESTDIR=osip
 
 IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%
 IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%
@@ -51,12 +51,11 @@ IF NOT EXIST %TAR% %WGET% %TARURL2% %UTILSDIR%
 IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL% %UTILSDIR%
 IF NOT EXIST %GUNZIP% %WGET% %GUNZIPURL2% %UTILSDIR%
 
-cd %LIBSRCDIR%
-IF NOT EXIST %APRTAR% IF NOT EXIST %APRDESTDIR% %WGET% %APRURL%%APRTAR% & %GUNZIP% < %APRTAR% | %TAR% xvf - & ren %APRDIR% %APRDESTDIR% & del %APRTAR%
-IF NOT EXIST %EXOSIPTAR% IF NOT EXIST %EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% & %GUNZIP% < %EXOSIPTAR% | %TAR% xvf - & ren %EXOSIPDIR% %EXOSIPDESTDIR% & del %EXOSIPTAR%
-IF NOT EXIST %OSIPTAR% IF NOT EXIST %OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% & %GUNZIP% < %OSIPTAR% | %TAR% xvf - & ren %OSIPDIR% %OSIPDESTDIR% & del %OSIPTAR%
-IF NOT EXIST %JTHREADTAR% IF NOT EXIST %JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% & %GUNZIP% < %JTHREADTAR% | %TAR% xvf - & ren %JTHREADDIR% %JTHREADDESTDIR% & del %JTHREADTAR%
-IF NOT EXIST %JRTPTAR% IF NOT EXIST %JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% & %GUNZIP% < %JRTPTAR% | %TAR% xvf - & ren %JRTPDIR% %JRTPDESTDIR% & del %JRTPTAR%
+IF NOT EXIST %LIBSRCDIR%\%APRTAR% IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR% %WGET% %APRURL%%APRTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%APRTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%APRDIR% %APRDESTDIR% & del %LIBSRCDIR%\%APRTAR%
+IF NOT EXIST %LIBSRCDIR%\%EXOSIPTAR% IF NOT EXIST %LIBSRCDIR%\%EXOSIPDESTDIR% %WGET% %EXOSIPURL%%EXOSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%EXOSIPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%EXOSIPDIR% %EXOSIPDESTDIR% & del %LIBSRCDIR%\%EXOSIPTAR%
+IF NOT EXIST %LIBSRCDIR%\%OSIPTAR% IF NOT EXIST %LIBSRCDIR%\%OSIPDESTDIR% %WGET% %OSIPURL%%OSIPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%OSIPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%OSIPDIR% %OSIPDESTDIR% & del %LIBSRCDIR%\%OSIPTAR%
+IF NOT EXIST %LIBSRCDIR%\%JTHREADTAR% IF NOT EXIST %LIBSRCDIR%\%JTHREADDESTDIR% %WGET% %JTHREADURL%%JTHREADTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JTHREADTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%JTHREADDIR% %JTHREADDESTDIR% & del %LIBSRCDIR%\%JTHREADTAR%
+IF NOT EXIST %LIBSRCDIR%\%JRTPTAR% IF NOT EXIST %LIBSRCDIR%\%JRTPDESTDIR% %WGET% %JRTPURL%%JRTPTAR% %LIBSRCDIR% & %GUNZIP% < %LIBSRCDIR%\%JRTPTAR% | %TAR% xvf - & ren %LIBSRCDIR%\%JRTPDIR% %JRTPDESTDIR% & del %LIBSRCDIR%\%JRTPTAR%
 
 
 ECHO ****************************************************************
@@ -84,48 +83,33 @@ ECHO ****************************************************************
 ECHO **************             APR BUILD           *****************
 ECHO ****************************************************************
 
-cd %APRDESTDIR%
-IF NOT EXIST %INCLUDEDIR%\apr.h copy %LIBSRCDIR%\%APRDESTDIR%\include\*.h %INCLUDEDIR%
-IF NOT EXIST %INCLUDEDIR%\apr.h copy %LIBSRCDIR%\%APRDESTDIR%\include\apr.hw %INCLUDEDIR%\apr.h
-IF NOT EXIST libapr.vcproj %UNIX2DOS% libapr.dsp
-IF NOT EXIST libapr.vcproj cscript %UTILSDIR%\upgrade.vbs libapr.dsp libapr.vcproj
-%DEVENV% libapr.vcproj /build Debug
-REM %DEVENV% libapr.vcproj /build Release
-copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.lib %DEBUGLIBBINDIR%
-copy %LIBSRCDIR%\%APRDESTDIR%\debug\*.dll %DEBUGLIBBINDIR%
-cd %LIBSRCDIR%
+IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj %UNIX2DOS% %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp
+IF NOT EXIST %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj cscript %UTILSDIR%\upgrade.vbs %LIBSRCDIR%\%APRDESTDIR%\libapr.dsp %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj
+%DEVENV% %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj /build Debug
+
 
 ECHO ****************************************************************
 ECHO **************            OSIP BUILD           *****************
 ECHO ****************************************************************
 
-IF NOT EXIST %INCLUDEDIR%\osip2 md %INCLUDEDIR%\osip2
-IF NOT EXIST %INCLUDEDIR%\osipparser2 md %INCLUDEDIR%\osipparser2
-IF NOT EXIST %INCLUDEDIR%\osip2\osip.h copy %LIBSRCDIR%\%OSIPDESTDIR%\include\osip2\*.h %INCLUDEDIR%\osip2
-IF NOT EXIST %INCLUDEDIR%\osipparser2\osip_parser.h copy %LIBSRCDIR%\%OSIPDESTDIR%\include\osipparser2\*.h %INCLUDEDIR%\osipparser2
+del %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osipparser2.vcproj
+copy %UTILSDIR%\osipparser2.vcproj %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\
 %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /Upgrade
 %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Debug
-REM %DEVENV% %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\osip.sln /build Release
-copy %LIBSRCDIR%\%OSIPDESTDIR%\platform\vsnet\debug\*.lib %DEBUGLIBBINDIR%
 
 
 ECHO ****************************************************************
 ECHO **************          EXOSIP BUILD           *****************
 ECHO ****************************************************************
 
-IF NOT EXIST "%INCLUDEDIR%\eXosip" md "%INCLUDEDIR%\eXosip"
-IF NOT EXIST %INCLUDEDIR%\eXosip copy "%LIBSRCDIR%\%EXOSIPDESTDIR%\include\eXosip\*.h" "%INCLUDEDIR%\eXosip"
-%UNIX2DOS% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /Upgrade
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Debug
-REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\eXosip.vcproj /build Release
-copy %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\windows\debug\*.lib %DEBUGLIBBINDIR%
+%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade
+%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug
 
 ECHO ****************************************************************
 ECHO **************           JRTP BUILD            *****************
 ECHO ****************************************************************
 
-%DEVENV% %LIBSRCDIR%\jrtp4c\jrtp4c.sln /build Debug
+%DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug
 
 :END
 cd %UTILSDIR%\..
diff --git a/w32/vsnet/Tools/osipparser2.vcproj b/w32/vsnet/Tools/osipparser2.vcproj
new file mode 100644
index 0000000000..50474c5841
--- /dev/null
+++ b/w32/vsnet/Tools/osipparser2.vcproj
@@ -0,0 +1,476 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="osipparser2"
+	ProjectGUID="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
+	RootNamespace="osipparser2"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<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="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\osipparser2.lib"
+			/>
+			<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"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<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="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/osipparser2.lib"
+			/>
+			<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;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_bridgecall.vcproj b/w32/vsnet/mod_bridgecall.vcproj
index 374b04e1da..05b93fa9d4 100644
--- a/w32/vsnet/mod_bridgecall.vcproj
+++ b/w32/vsnet/mod_bridgecall.vcproj
@@ -41,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_dialplan_demo.vcproj b/w32/vsnet/mod_dialplan_demo.vcproj
index 0c7ae3aa01..a32d7b257d 100644
--- a/w32/vsnet/mod_dialplan_demo.vcproj
+++ b/w32/vsnet/mod_dialplan_demo.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_dialplan_demo"
 	ProjectGUID="{2988EB83-785F-45D4-8731-8E1E4345177E}"
+	RootNamespace="mod_dialplan_demo"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_exosip.vcproj b/w32/vsnet/mod_exosip.vcproj
index 7d902f3eb0..c0cb8b1f43 100644
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/w32/vsnet/mod_exosip.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/D _CRT_SECURE_NO_DEPRECATE"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;&quot;..\..\libs\libeXosip-0.9.0\include&quot;;&quot;..\..\libs\libosip2-2.2.0\include&quot;;..\..\libs\jrtp4c\src"
+				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				GeneratePreprocessedFile="0"
 				MinimalRebuild="true"
@@ -128,7 +128,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr-1.2.2\include&quot;;&quot;..\..\libs\libeXosip-0.9.0\include&quot;;&quot;..\..\libs\libosip2-2.2.0\include&quot;;..\..\libs\jrtp4c\src"
+				AdditionalIncludeDirectories="..\..\src\include;&quot;$(InputDir)..\..\..\libs\apr\include&quot;;..\..\libs\libeXosip2\include;..\..\libs\osip\include;..\..\libs\jrtp4c\src"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -189,15 +189,15 @@
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
-			RelativePathToProject="..\..\libs\libeXosip-0.9.0\platform\windows\eXosip.vcproj"
+			RelativePathToProject="..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"
-			RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osip2.vcproj"
+			RelativePathToProject="..\..\libs\osip\platform\vsnet\osip2.vcproj"
 		/>
 		<ProjectReference
 			ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
-			RelativePathToProject="..\..\libs\libosip2-2.2.0\platform\vsnet\osipparser2.vcproj"
+			RelativePathToProject="..\..\libs\osip\platform\vsnet\osipparser2.vcproj"
 		/>
 	</References>
 	<Files>
diff --git a/w32/vsnet/mod_g711codec.vcproj b/w32/vsnet/mod_g711codec.vcproj
index 08ea808a52..9d74fd6b97 100644
--- a/w32/vsnet/mod_g711codec.vcproj
+++ b/w32/vsnet/mod_g711codec.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_g711codec"
 	ProjectGUID="{B1FE4613-3F4B-4DAF-9714-2472BF8F56AE}"
+	RootNamespace="mod_g711codec"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_playback.vcproj b/w32/vsnet/mod_playback.vcproj
index 19ed73c5a3..dde2d9924f 100644
--- a/w32/vsnet/mod_playback.vcproj
+++ b/w32/vsnet/mod_playback.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_playback"
 	ProjectGUID="{78100236-7CEA-4948-96CC-E8ED3160329C}"
+	RootNamespace="mod_playback"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_rawaudio.vcproj b/w32/vsnet/mod_rawaudio.vcproj
index 6d84a5d59b..a537ab2c6c 100644
--- a/w32/vsnet/mod_rawaudio.vcproj
+++ b/w32/vsnet/mod_rawaudio.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_rawaudio"
 	ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"
+	RootNamespace="mod_rawaudio"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_softtimer.vcproj b/w32/vsnet/mod_softtimer.vcproj
index c5134fd54a..48dd71d89b 100644
--- a/w32/vsnet/mod_softtimer.vcproj
+++ b/w32/vsnet/mod_softtimer.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_softtimer"
 	ProjectGUID="{DCC13474-28DF-47CA-A8EB-72F8CE9A78C5}"
+	RootNamespace="mod_softtimer"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
diff --git a/w32/vsnet/mod_woomerachan.vcproj b/w32/vsnet/mod_woomerachan.vcproj
index b67917281e..189148c042 100644
--- a/w32/vsnet/mod_woomerachan.vcproj
+++ b/w32/vsnet/mod_woomerachan.vcproj
@@ -4,6 +4,7 @@
 	Version="8.00"
 	Name="mod_woomerachan"
 	ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"
+	RootNamespace="mod_woomerachan"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@@ -40,7 +41,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -119,7 +120,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr-1.2.2\include"
+				AdditionalIncludeDirectories="$(InputDir)..\..\include;$(InputDir)include;$(InputDir)..\..\..\libs\apr\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"