diff --git a/w32/Library/FreeSwitchCore.2008.vcproj b/w32/Library/FreeSwitchCore.2008.vcproj
index c50b511aeb..026c2e8233 100644
--- a/w32/Library/FreeSwitchCore.2008.vcproj
+++ b/w32/Library/FreeSwitchCore.2008.vcproj
@@ -48,7 +48,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -141,7 +141,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -233,7 +233,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="switch.h"
@@ -322,7 +322,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="switch.h"
@@ -742,6 +742,42 @@
 				RelativePath="..\..\src\switch_log.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\switch_nat.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\src\switch_odbc.c"
 				>
@@ -786,6 +822,516 @@
 				RelativePath="..\..\src\switch_xml_config.c"
 				>
 			</File>
+			<Filter
+				Name="miniupnpc"
+				>
+				<File
+					RelativePath="..\..\libs\miniupnpc\declspec.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\igd_desc_parse.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minisoap.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minissdpc.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\miniupnpc.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\miniwget.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minixml.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnpcommands.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnperrors.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnpreplyparse.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="natpmp"
+				>
+				<File
+					RelativePath="..\..\libs\libnatpmp\getgateway.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\libnatpmp\natpmp.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Debug|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|x64"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
diff --git a/w32/Library/FreeSwitchCore.vcproj b/w32/Library/FreeSwitchCore.vcproj
index 50444cccf8..415ffbedae 100644
--- a/w32/Library/FreeSwitchCore.vcproj
+++ b/w32/Library/FreeSwitchCore.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;PCRE_STATIC;STATICLIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -136,7 +136,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\win32\sqlite;..\..\libs\pcre;..\..\libs\stfu;..\..\libs\speex\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;CRASH_PROT;PCRE_STATIC"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;PCRE_STATIC"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				PrecompiledHeaderThrough="switch.h"
@@ -444,6 +444,26 @@
 				RelativePath="..\..\src\switch_log.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\switch_nat.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						DisableSpecificWarnings="4389;4127"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\..\src\switch_odbc.c"
 				>
@@ -508,6 +528,322 @@
 				RelativePath="..\..\src\switch_xml_config.c"
 				>
 			</File>
+			<Filter
+				Name="miniupnpc"
+				>
+				<File
+					RelativePath="..\..\libs\miniupnpc\declspec.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\igd_desc_parse.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minisoap.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minissdpc.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\miniupnpc.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127;4389;4706"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\miniwget.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\minixml.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnpcommands.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnperrors.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\miniupnpc\upnpreplyparse.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;STATICLIB"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100;4127"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
+			<Filter
+				Name="natpmp"
+				>
+				<File
+					RelativePath="..\..\libs\libnatpmp\getgateway.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\libs\libnatpmp\natpmp.c"
+					>
+					<FileConfiguration
+						Name="Debug|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+							PrecompiledHeaderThrough=""
+							PrecompiledHeaderFile=""
+							DisableSpecificWarnings="4100"
+						/>
+					</FileConfiguration>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"