diff --git a/libs/jrtp4c/configure.in b/libs/jrtp4c/configure.in
index 3f9f13fce4..dbcf39821f 100644
--- a/libs/jrtp4c/configure.in
+++ b/libs/jrtp4c/configure.in
@@ -16,7 +16,6 @@ AC_PROG_INSTALL
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
-#AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/ioctl.h sys/socket.h sys/time.h unistd.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -30,7 +29,6 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-#AC_CHECK_FUNCS([gethostname gettimeofday localtime_r memmove memset socket strcasecmp strchr strdup strncasecmp strstr])
 
 AC_CONFIG_FILES([Makefile])
 
diff --git a/libs/jrtp4c/w32/jrtp4c.sln b/libs/jrtp4c/w32/jrtp4c.sln
index ba6a0beacd..b44614bd57 100644
--- a/libs/jrtp4c/w32/jrtp4c.sln
+++ b/libs/jrtp4c/w32/jrtp4c.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "jrtp4c.vcproj", "
 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-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
+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
diff --git a/libs/jrtp4c/w32/jrtp4c.vcproj b/libs/jrtp4c/w32/jrtp4c.vcproj
index 097cc3dfb4..c62a9fd0bc 100644
--- a/libs/jrtp4c/w32/jrtp4c.vcproj
+++ b/libs/jrtp4c/w32/jrtp4c.vcproj
@@ -40,6 +40,7 @@
 				AdditionalOptions="/D WIN32"
 				Optimization="0"
 				AdditionalIncludeDirectories=""$(ProjectDir)..\..\jthread-1.1.2\src";"$(ProjectDir)..\..\jrtplib\src";"$(ProjectDir)..\src""
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;"
 				RuntimeLibrary="1"
 			/>
 			<Tool
@@ -74,7 +75,7 @@
 			Name="Release|Win32"
 			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
+			ConfigurationType="4"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -94,6 +95,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\..\jthread-1.1.2\src&quot;;&quot;$(ProjectDir)..\..\jrtplib\src&quot;;&quot;$(ProjectDir)..\src&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -105,14 +107,11 @@
 				Name="VCPreLinkEventTool"
 			/>
 			<Tool
-				Name="VCLinkerTool"
+				Name="VCLibrarianTool"
 			/>
 			<Tool
 				Name="VCALinkTool"
 			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
 			<Tool
 				Name="VCXDCMakeTool"
 			/>
@@ -122,12 +121,6 @@
 			<Tool
 				Name="VCFxCopTool"
 			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 			/>
diff --git a/w32/vsnet/FreeSwitchCore.vcproj b/w32/vsnet/FreeSwitchCore.vcproj
index ae6f31498f..c543f45edb 100644
--- a/w32/vsnet/FreeSwitchCore.vcproj
+++ b/w32/vsnet/FreeSwitchCore.vcproj
@@ -94,7 +94,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Debug\*.dll $(Outdir)"
+				CommandLine="copy $(Projectdir)..\..\libs\apr\Debug\*.dll $(Outdir)&#x0D;&#x0A;xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y"
 			/>
 		</Configuration>
 		<Configuration
@@ -174,7 +174,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy $(Projectdir)..\..\libs\apr-1.2.2\Release\*.dll $(Outdir)"
+				CommandLine="copy $(Projectdir)..\..\libs\apr\Release\*.dll $(Outdir)&#x0D;&#x0A;xcopy $(Projectdir)..\..\conf\*.* $(Outdir)\conf\ /C /D /Y"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln
index 5d61c0fe6a..335cfae0b4 100644
--- a/w32/vsnet/Freeswitch.sln
+++ b/w32/vsnet/Freeswitch.sln
@@ -63,7 +63,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_woomerachan", "mod_woom
 		{13860EB7-038A-438F-898F-1032E42A5574} = {13860EB7-038A-438F-898F-1032E42A5574}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr-1.2.2\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libapr", "..\..\libs\apr\libapr.vcproj", "{13860EB7-038A-438F-898F-1032E42A5574}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osip2", "..\..\libs\osip\platform\vsnet\osip2.vcproj", "{85255507-5D16-4218-85E2-F683BB2F04DA}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -81,7 +81,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtp4c", "..\..\libs\jrtp4c
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jthread", "..\..\libs\jthread-1.1.2\jthread.vcproj", "{96A714AE-BE53-4EFF-8569-C3809AD4F3B6}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib-3.3.0\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jrtplib", "..\..\libs\jrtplib\jrtplib.vcproj", "{4009F58A-E333-424B-A868-7E82804DD055}"
 	ProjectSection(ProjectDependencies) = postProject
 		{96A714AE-BE53-4EFF-8569-C3809AD4F3B6} = {96A714AE-BE53-4EFF-8569-C3809AD4F3B6}
 	EndProjectSection
diff --git a/w32/vsnet/GetLibs.bat b/w32/vsnet/GetLibs.bat
index 24a50a67ae..cb7ee17d8e 100644
--- a/w32/vsnet/GetLibs.bat
+++ b/w32/vsnet/GetLibs.bat
@@ -1,4 +1,4 @@
-REM @echo off
+@echo off
 ECHO ****************************************************************
 ECHO **************          VARIABLE SETUP         *****************
 ECHO ****************************************************************
@@ -37,8 +37,6 @@ set OSIPTAR=%OSIPDIR%.tar.gz
 set OSIPURL=http://www.antisip.com/download/
 set OSIPDESTDIR=osip
 
-IF NOT EXIST %INCLUDEDIR% md %INCLUDEDIR%
-IF NOT EXIST %DEBUGLIBBINDIR% md %DEBUGLIBBINDIR%
 IF NOT EXIST %LIBSRCDIR% md %LIBSRCDIR%
 
 
@@ -86,7 +84,7 @@ ECHO ****************************************************************
 
 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
+REM %DEVENV% %LIBSRCDIR%\%APRDESTDIR%\libapr.vcproj /build Debug
 
 
 ECHO ****************************************************************
@@ -96,7 +94,7 @@ ECHO ****************************************************************
 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 Debug
 
 
 ECHO ****************************************************************
@@ -104,13 +102,13 @@ ECHO **************          EXOSIP BUILD           *****************
 ECHO ****************************************************************
 
 %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /Upgrade
-%DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug
+REM %DEVENV% %LIBSRCDIR%\%EXOSIPDESTDIR%\platform\vsnet\eXosip.vcproj /build Debug
 
 ECHO ****************************************************************
 ECHO **************           JRTP BUILD            *****************
 ECHO ****************************************************************
 
-%DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug
+REM %DEVENV% %LIBSRCDIR%\jrtp4c\w32\jrtp4c.sln /build Debug
 
 :END
 cd %UTILSDIR%\..
diff --git a/w32/vsnet/mod_exosip.vcproj b/w32/vsnet/mod_exosip.vcproj
index c0cb8b1f43..491e4fdb79 100644
--- a/w32/vsnet/mod_exosip.vcproj
+++ b/w32/vsnet/mod_exosip.vcproj
@@ -184,21 +184,6 @@
 		</Configuration>
 	</Configurations>
 	<References>
-		<ProjectReference
-			ReferencedProjectIdentifier="{E3B37452-127D-4C22-BB33-3B08E23721DF}"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{4EA67539-9EE9-4065-BD39-87E517FD8262}"
-			RelativePathToProject="..\..\libs\libeXosip2\platform\vsnet\eXosip.vcproj"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{85255507-5D16-4218-85E2-F683BB2F04DA}"
-			RelativePathToProject="..\..\libs\osip\platform\vsnet\osip2.vcproj"
-		/>
-		<ProjectReference
-			ReferencedProjectIdentifier="{44F46B7E-0E51-4304-9735-330DFBAB41E5}"
-			RelativePathToProject="..\..\libs\osip\platform\vsnet\osipparser2.vcproj"
-		/>
 	</References>
 	<Files>
 		<Filter