diff --git a/contrib/ports/win32/msvc/libcheck.vcxproj b/contrib/ports/win32/msvc/libcheck.vcxproj
index 6cad78b8..e63731e8 100644
--- a/contrib/ports/win32/msvc/libcheck.vcxproj
+++ b/contrib/ports/win32/msvc/libcheck.vcxproj
@@ -44,7 +44,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\check;..\..\..\..\check\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\check;..\..\..\..\..\check\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -57,7 +57,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\check;..\..\..\..\check\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\check;..\..\..\..\..\check\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -66,33 +66,33 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\check\lib\libcompat.h" />
+    <ClInclude Include="..\..\..\..\..\check\lib\libcompat.h" />
     <ClInclude Include="..\check\config.h" />
     <ClInclude Include="..\check\unistd.h" />
     <ClInclude Include="..\check\sys\time.h" />
-    <ClInclude Include="..\..\..\..\check\src\check.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_error.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_impl.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_list.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_log.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_msg.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_pack.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_print.h" />
-    <ClInclude Include="..\..\..\..\check\src\check_str.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_error.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_impl.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_list.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_log.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_msg.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_pack.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_print.h" />
+    <ClInclude Include="..\..\..\..\..\check\src\check_str.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\check\lib\clock_gettime.c" />
-    <ClCompile Include="..\..\..\..\check\lib\libcompat.c" />
+    <ClCompile Include="..\..\..\..\..\check\lib\clock_gettime.c" />
+    <ClCompile Include="..\..\..\..\..\check\lib\libcompat.c" />
     <ClCompile Include="..\check\time.c" />
-    <ClCompile Include="..\..\..\..\check\src\check.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_error.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_list.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_log.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_msg.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_pack.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_print.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_run.c" />
-    <ClCompile Include="..\..\..\..\check\src\check_str.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_error.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_list.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_log.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_msg.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_pack.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_print.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_run.c" />
+    <ClCompile Include="..\..\..\..\..\check\src\check_str.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/contrib/ports/win32/msvc/libcheck.vcxproj.filters b/contrib/ports/win32/msvc/libcheck.vcxproj.filters
index 9be370e7..d8bfdfce 100644
--- a/contrib/ports/win32/msvc/libcheck.vcxproj.filters
+++ b/contrib/ports/win32/msvc/libcheck.vcxproj.filters
@@ -24,34 +24,34 @@
     <ClInclude Include="..\check\sys\time.h">
       <Filter>Win32\sys</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_error.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_error.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_impl.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_impl.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_list.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_list.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_log.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_log.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_msg.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_msg.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_pack.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_pack.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_print.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_print.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\src\check_str.h">
+    <ClInclude Include="..\..\..\..\..\check\src\check_str.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\check\lib\libcompat.h">
+    <ClInclude Include="..\..\..\..\..\check\lib\libcompat.h">
       <Filter>libcompat</Filter>
     </ClInclude>
   </ItemGroup>
@@ -59,37 +59,37 @@
     <ClCompile Include="..\check\time.c">
       <Filter>Win32</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_error.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_error.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_list.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_list.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_log.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_log.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_msg.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_msg.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_pack.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_pack.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_print.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_print.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_run.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_run.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\src\check_str.c">
+    <ClCompile Include="..\..\..\..\..\check\src\check_str.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\lib\libcompat.c">
+    <ClCompile Include="..\..\..\..\..\check\lib\libcompat.c">
       <Filter>libcompat</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\check\lib\clock_gettime.c">
+    <ClCompile Include="..\..\..\..\..\check\lib\clock_gettime.c">
       <Filter>libcompat</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/contrib/ports/win32/msvc/lwIP.vcxproj b/contrib/ports/win32/msvc/lwIP.vcxproj
index 7ffc2afe..3da3f6eb 100644
--- a/contrib/ports/win32/msvc/lwIP.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP.vcxproj
@@ -77,7 +77,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -100,7 +100,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -124,7 +124,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LWIP_NORAND;_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -149,7 +149,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>LWIP_NORAND;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -170,51 +170,51 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\contrib.txt">
+    <CustomBuildStep Include="..\..\..\..\doc\contrib.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\FILES">
+    <CustomBuildStep Include="..\..\..\..\doc\FILES">
       <FileType>Document</FileType>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\rawapi.txt">
+    <CustomBuildStep Include="..\..\..\..\doc\rawapi.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\savannah.txt">
+    <CustomBuildStep Include="..\..\..\..\doc\savannah.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\snmp_agent.txt">
+    <CustomBuildStep Include="..\..\..\..\doc\snmp_agent.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\doc\sys_arch.txt">
+    <CustomBuildStep Include="..\..\..\..\doc\sys_arch.txt">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\src\core\ipv6\README">
+    <CustomBuildStep Include="..\..\..\..\src\core\ipv6\README">
       <FileType>Document</FileType>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <CustomBuildStep Include="..\..\..\..\lwip\src\netif\FILES">
+    <CustomBuildStep Include="..\..\..\..\src\netif\FILES">
       <FileType>Document</FileType>
     </CustomBuildStep>
     <CustomBuildStep Include="..\lwipcfg_msvc.h.example">
@@ -224,19 +224,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </CustomBuildStep>
-    <None Include="..\..\..\..\lwip\CHANGELOG" />
-    <None Include="..\..\..\..\lwip\COPYING" />
-    <None Include="..\..\..\..\lwip\doc\contrib.txt" />
-    <None Include="..\..\..\..\lwip\doc\doxygen\generate.bat" />
-    <None Include="..\..\..\..\lwip\doc\doxygen\generate.sh" />
-    <None Include="..\..\..\..\lwip\doc\doxygen\lwip.Doxyfile" />
-    <None Include="..\..\..\..\lwip\doc\FILES" />
-    <None Include="..\..\..\..\lwip\doc\mdns.txt" />
-    <None Include="..\..\..\..\lwip\doc\ppp.txt" />
-    <None Include="..\..\..\..\lwip\doc\savannah.txt" />
-    <None Include="..\..\..\..\lwip\FILES" />
-    <None Include="..\..\..\..\lwip\README" />
-    <None Include="..\..\..\..\lwip\UPGRADING" />
+    <None Include="..\..\..\..\CHANGELOG" />
+    <None Include="..\..\..\..\COPYING" />
+    <None Include="..\..\..\..\doc\contrib.txt" />
+    <None Include="..\..\..\..\doc\doxygen\generate.bat" />
+    <None Include="..\..\..\..\doc\doxygen\generate.sh" />
+    <None Include="..\..\..\..\doc\doxygen\lwip.Doxyfile" />
+    <None Include="..\..\..\..\doc\FILES" />
+    <None Include="..\..\..\..\doc\mdns.txt" />
+    <None Include="..\..\..\..\doc\ppp.txt" />
+    <None Include="..\..\..\..\doc\savannah.txt" />
+    <None Include="..\..\..\..\FILES" />
+    <None Include="..\..\..\..\README" />
+    <None Include="..\..\..\..\UPGRADING" />
     <None Include="..\..\..\examples\example_app\lwipcfg.h.example">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -245,149 +245,149 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\doc\NO_SYS_SampleCode.c">
+    <ClCompile Include="..\..\..\..\doc\NO_SYS_SampleCode.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\api_lib.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\api_msg.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\err.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\if_api.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\netbuf.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\netdb.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\netifapi.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\sockets.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\api\tcpip.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    <ClCompile Include="..\..\..\..\src\api\api_lib.c" />
+    <ClCompile Include="..\..\..\..\src\api\api_msg.c" />
+    <ClCompile Include="..\..\..\..\src\api\err.c" />
+    <ClCompile Include="..\..\..\..\src\api\if_api.c" />
+    <ClCompile Include="..\..\..\..\src\api\netbuf.c" />
+    <ClCompile Include="..\..\..\..\src\api\netdb.c" />
+    <ClCompile Include="..\..\..\..\src\api\netifapi.c" />
+    <ClCompile Include="..\..\..\..\src\api\sockets.c" />
+    <ClCompile Include="..\..\..\..\src\api\tcpip.c" />
+    <ClCompile Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_mem.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    <ClCompile Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_mem.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\altcp_proxyconnect.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\http_client.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\lwiperf\lwiperf.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\mqtt\mqtt.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\netbiosns\netbiosns.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\smtp\smtp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_snmpv2_framework.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_snmpv2_usm.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\sntp\sntp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\tftp\tftp_server.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp_alloc.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp_tcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\def.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\dns.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\inet_chksum.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\init.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\mem.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\memp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\netif.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\pbuf.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\raw.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\stats.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\sys.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp_in.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp_out.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\udp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\autoip.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\dhcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\etharp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\icmp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\igmp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4_addr.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\dhcp6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ethip6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\icmp6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\inet6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6_addr.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6_frag.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\mld6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\nd6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\bridgeif.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\bridgeif_fdb.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ethernet.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6_ble.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6_common.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\slipif.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\auth.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ccp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap-md5.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap-new.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap_ms.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\demand.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\eap.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ecp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\eui64.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\fsm.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ipcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ipv6cp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\lcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\magic.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\mppe.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\multilink.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ppp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppcrypt.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppoe.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppol2tp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppos.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\upap.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\utils.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\vj.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\arc4.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\des.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\md4.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\md5.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\sha1.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\fs.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\fsdata.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\altcp_proxyconnect.c" />
+    <ClCompile Include="..\..\..\..\src\apps\http\http_client.c" />
+    <ClCompile Include="..\..\..\..\src\apps\lwiperf\lwiperf.c" />
+    <ClCompile Include="..\..\..\..\src\apps\mqtt\mqtt.c" />
+    <ClCompile Include="..\..\..\..\src\apps\netbiosns\netbiosns.c" />
+    <ClCompile Include="..\..\..\..\src\apps\smtp\smtp.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_snmpv2_framework.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_snmpv2_usm.c" />
+    <ClCompile Include="..\..\..\..\src\apps\sntp\sntp.c" />
+    <ClCompile Include="..\..\..\..\src\apps\tftp\tftp_server.c" />
+    <ClCompile Include="..\..\..\..\src\core\altcp.c" />
+    <ClCompile Include="..\..\..\..\src\core\altcp_alloc.c" />
+    <ClCompile Include="..\..\..\..\src\core\altcp_tcp.c" />
+    <ClCompile Include="..\..\..\..\src\core\def.c" />
+    <ClCompile Include="..\..\..\..\src\core\dns.c" />
+    <ClCompile Include="..\..\..\..\src\core\inet_chksum.c" />
+    <ClCompile Include="..\..\..\..\src\core\init.c" />
+    <ClCompile Include="..\..\..\..\src\core\mem.c" />
+    <ClCompile Include="..\..\..\..\src\core\memp.c" />
+    <ClCompile Include="..\..\..\..\src\core\netif.c" />
+    <ClCompile Include="..\..\..\..\src\core\pbuf.c" />
+    <ClCompile Include="..\..\..\..\src\core\raw.c" />
+    <ClCompile Include="..\..\..\..\src\core\stats.c" />
+    <ClCompile Include="..\..\..\..\src\core\sys.c" />
+    <ClCompile Include="..\..\..\..\src\core\tcp.c" />
+    <ClCompile Include="..\..\..\..\src\core\tcp_in.c" />
+    <ClCompile Include="..\..\..\..\src\core\tcp_out.c" />
+    <ClCompile Include="..\..\..\..\src\core\udp.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\autoip.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\dhcp.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\etharp.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\icmp.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\igmp.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4_addr.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\dhcp6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ethip6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\icmp6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\inet6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6_addr.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6_frag.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\mld6.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv6\nd6.c" />
+    <ClCompile Include="..\..\..\..\src\netif\bridgeif.c" />
+    <ClCompile Include="..\..\..\..\src\netif\bridgeif_fdb.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ethernet.c" />
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6.c" />
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6_ble.c" />
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6_common.c" />
+    <ClCompile Include="..\..\..\..\src\netif\slipif.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\auth.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ccp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap-md5.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap-new.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap_ms.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\demand.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\eap.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ecp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\eui64.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\fsm.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ipcp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ipv6cp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\lcp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\magic.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\mppe.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\multilink.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ppp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppcrypt.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppoe.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppol2tp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppos.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\upap.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\utils.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\vj.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\arc4.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\des.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\md4.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\md5.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\sha1.c" />
+    <ClCompile Include="..\..\..\..\src\apps\http\fs.c" />
+    <ClCompile Include="..\..\..\..\src\apps\http\fsdata.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release unittests|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\httpd.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_asn1.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_core.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_msg.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_netconn.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_pbuf_stream.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_raw.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_scalar.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_table.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_threadsync.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_traps.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ip.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmpv3.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_icmp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_interfaces.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_ip.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_snmp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_system.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_tcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_udp.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppapi.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4_frag.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\core\timeouts.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\mdns\mdns.c" />
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmpv3_mbedtls.c">
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    <ClCompile Include="..\..\..\..\src\apps\http\httpd.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_asn1.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_core.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_msg.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_netconn.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_pbuf_stream.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_raw.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_scalar.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_table.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_threadsync.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_traps.c" />
+    <ClCompile Include="..\..\..\..\src\core\ip.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmpv3.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_icmp.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_interfaces.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_ip.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_snmp.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_system.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_tcp.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_udp.c" />
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppapi.c" />
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4_frag.c" />
+    <ClCompile Include="..\..\..\..\src\core\timeouts.c" />
+    <ClCompile Include="..\..\..\..\src\apps\mdns\mdns.c" />
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmpv3_mbedtls.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\..\mbedtls\include;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;..\..\..\apps\snmp_private_mib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\zepif.c" />
+    <ClCompile Include="..\..\..\..\src\netif\zepif.c" />
     <ClCompile Include="..\sio.c" />
     <ClCompile Include="..\sys_arch.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug unittests|Win32'">true</ExcludedFromBuild>
@@ -395,171 +395,171 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lwip\doc\doxygen\main_page.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_mem.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_structs.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_msg.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\stdc\errno.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\arpa\inet.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\netdb.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\net\if.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\sys\socket.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp_tcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp_tls.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\altcp_proxyconnect.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\altcp_tls_mbedtls_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\http_client.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\lwiperf.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\netbiosns.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\netbiosns_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\smtp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\smtp_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_snmpv2_framework.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_snmpv2_usm.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\sntp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\sntp_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\tftp_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\tftp_server.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\errno.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\if_api.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_zone.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\altcp_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\api_msg.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\memp_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\memp_std.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\mem_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\nd6_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\raw_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\sockets_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\tcpip_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\tcp_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\api.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\arch.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\autoip.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\debug.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\def.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dhcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dhcp6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dns.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\err.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ethip6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\icmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\icmp6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\igmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\inet.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\inet_chksum.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\init.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4_addr.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_addr.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_frag.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip_addr.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\mem.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\memp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\mld6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\nd6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netbuf.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netdb.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netif.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netifapi.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\opt.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\pbuf.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dhcp6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\etharp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\iana.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ieee.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\igmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\raw.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sio.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\snmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sockets.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\stats.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sys.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\tcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\tcpip.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\udp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\bridgeif.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\bridgeif_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\etharp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ethernet.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ieee802154.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_ble.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_common.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\slipif.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ccp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap-md5.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap-new.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap_ms.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\eap.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ecp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\eui64.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\fsm.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ipcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ipv6cp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\lcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\magic.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\mppe.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp_impl.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppcrypt.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppdebug.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppoe.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppol2tp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppos.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\upap.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\vj.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\arc4.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\des.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\md4.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\md5.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\sha1.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\http\fsdata.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\http\httpd_structs.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_asn1.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_core_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_pbuf_stream.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_core.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_mib2.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_scalar.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_table.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_threadsync.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppapi.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\fs.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\httpd.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\httpd_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmpv3.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\etharp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4_frag.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\timeouts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns_opts.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\autoip.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dhcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dns.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip4.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmpv3_priv.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ethernet.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\icmp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\icmp6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\mld6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\nd6.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\tcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\udp.h" />
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\zepif.h" />
+    <ClInclude Include="..\..\..\..\doc\doxygen\main_page.h" />
+    <ClInclude Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_mem.h" />
+    <ClInclude Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_structs.h" />
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_msg.h" />
+    <ClInclude Include="..\..\..\..\src\include\compat\stdc\errno.h" />
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\arpa\inet.h" />
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\netdb.h" />
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\net\if.h" />
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\sys\socket.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp_tcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp_tls.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\altcp_proxyconnect.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\altcp_tls_mbedtls_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\http_client.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\lwiperf.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\netbiosns.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\netbiosns_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\smtp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\smtp_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_snmpv2_framework.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_snmpv2_usm.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\sntp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\sntp_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\tftp_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\tftp_server.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\errno.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\if_api.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_zone.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\altcp_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\api_msg.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\memp_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\memp_std.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\mem_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\nd6_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\raw_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\sockets_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\tcpip_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\tcp_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\api.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\arch.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\autoip.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\debug.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\def.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\dhcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\dhcp6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\dns.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\err.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ethip6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\icmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\icmp6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\igmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\inet.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\inet_chksum.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\init.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4_addr.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_addr.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_frag.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip_addr.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\mem.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\memp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\mld6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\nd6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\netbuf.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\netdb.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\netif.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\netifapi.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\opt.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\pbuf.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dhcp6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\etharp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\iana.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ieee.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\igmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\raw.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\sio.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\snmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\sockets.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\stats.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\sys.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\tcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\tcpip.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\udp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\bridgeif.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\bridgeif_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\etharp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ethernet.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ieee802154.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_ble.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_common.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\slipif.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ccp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap-md5.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap-new.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap_ms.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\eap.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ecp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\eui64.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\fsm.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ipcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ipv6cp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\lcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\magic.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\mppe.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp_impl.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppcrypt.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppdebug.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppoe.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppol2tp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppos.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\upap.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\vj.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\arc4.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\des.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\md4.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\md5.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\sha1.h" />
+    <ClInclude Include="..\..\..\..\src\apps\http\fsdata.h" />
+    <ClInclude Include="..\..\..\..\src\apps\http\httpd_structs.h" />
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_asn1.h" />
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_core_priv.h" />
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_pbuf_stream.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_core.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_mib2.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_scalar.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_table.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_threadsync.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppapi.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\fs.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\httpd.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\httpd_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmpv3.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\etharp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4_frag.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\timeouts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns_opts.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\autoip.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dhcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dns.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip4.h" />
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmpv3_priv.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ethernet.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\icmp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\icmp6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\mld6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\nd6.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\tcp.h" />
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\udp.h" />
+    <ClInclude Include="..\..\..\..\src\include\netif\zepif.h" />
     <ClInclude Include="..\..\..\examples\example_app\default_netif.h" />
     <ClInclude Include="..\..\..\examples\example_app\lwipcfg.h" />
     <ClInclude Include="..\..\..\examples\example_app\lwipopts.h" />
diff --git a/contrib/ports/win32/msvc/lwIP.vcxproj.filters b/contrib/ports/win32/msvc/lwIP.vcxproj.filters
index 903c84ea..6392aaa4 100644
--- a/contrib/ports/win32/msvc/lwIP.vcxproj.filters
+++ b/contrib/ports/win32/msvc/lwIP.vcxproj.filters
@@ -114,33 +114,33 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\..\lwip\CHANGELOG" />
-    <None Include="..\..\..\..\lwip\COPYING" />
-    <None Include="..\..\..\..\lwip\FILES" />
-    <None Include="..\..\..\..\lwip\README" />
-    <None Include="..\..\..\..\lwip\UPGRADING" />
-    <None Include="..\..\..\..\lwip\doc\contrib.txt">
+    <None Include="..\..\..\..\CHANGELOG" />
+    <None Include="..\..\..\..\COPYING" />
+    <None Include="..\..\..\..\FILES" />
+    <None Include="..\..\..\..\README" />
+    <None Include="..\..\..\..\UPGRADING" />
+    <None Include="..\..\..\..\doc\contrib.txt">
       <Filter>doc</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\FILES">
+    <None Include="..\..\..\..\doc\FILES">
       <Filter>doc</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\mdns.txt">
+    <None Include="..\..\..\..\doc\mdns.txt">
       <Filter>doc</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\ppp.txt">
+    <None Include="..\..\..\..\doc\ppp.txt">
       <Filter>doc</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\savannah.txt">
+    <None Include="..\..\..\..\doc\savannah.txt">
       <Filter>doc</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\doxygen\generate.bat">
+    <None Include="..\..\..\..\doc\doxygen\generate.bat">
       <Filter>doc\doxygen</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\doxygen\generate.sh">
+    <None Include="..\..\..\..\doc\doxygen\generate.sh">
       <Filter>doc\doxygen</Filter>
     </None>
-    <None Include="..\..\..\..\lwip\doc\doxygen\lwip.Doxyfile">
+    <None Include="..\..\..\..\doc\doxygen\lwip.Doxyfile">
       <Filter>doc\doxygen</Filter>
     </None>
     <None Include="..\..\..\examples\example_app\lwipcfg.h.example">
@@ -148,223 +148,223 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\src\api\api_lib.c">
+    <ClCompile Include="..\..\..\..\src\api\api_lib.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\api_msg.c">
+    <ClCompile Include="..\..\..\..\src\api\api_msg.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\err.c">
+    <ClCompile Include="..\..\..\..\src\api\err.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\netbuf.c">
+    <ClCompile Include="..\..\..\..\src\api\netbuf.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\netdb.c">
+    <ClCompile Include="..\..\..\..\src\api\netdb.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\netifapi.c">
+    <ClCompile Include="..\..\..\..\src\api\netifapi.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\sockets.c">
+    <ClCompile Include="..\..\..\..\src\api\sockets.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\tcpip.c">
+    <ClCompile Include="..\..\..\..\src\api\tcpip.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\lwiperf\lwiperf.c">
+    <ClCompile Include="..\..\..\..\src\apps\lwiperf\lwiperf.c">
       <Filter>src\apps\lwiperf</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\netbiosns\netbiosns.c">
+    <ClCompile Include="..\..\..\..\src\apps\netbiosns\netbiosns.c">
       <Filter>src\apps\netbiosns</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\sntp\sntp.c">
+    <ClCompile Include="..\..\..\..\src\apps\sntp\sntp.c">
       <Filter>src\apps\sntp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\def.c">
+    <ClCompile Include="..\..\..\..\src\core\def.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\dns.c">
+    <ClCompile Include="..\..\..\..\src\core\dns.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\inet_chksum.c">
+    <ClCompile Include="..\..\..\..\src\core\inet_chksum.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\init.c">
+    <ClCompile Include="..\..\..\..\src\core\init.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\mem.c">
+    <ClCompile Include="..\..\..\..\src\core\mem.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\memp.c">
+    <ClCompile Include="..\..\..\..\src\core\memp.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\netif.c">
+    <ClCompile Include="..\..\..\..\src\core\netif.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\pbuf.c">
+    <ClCompile Include="..\..\..\..\src\core\pbuf.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\raw.c">
+    <ClCompile Include="..\..\..\..\src\core\raw.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\stats.c">
+    <ClCompile Include="..\..\..\..\src\core\stats.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\sys.c">
+    <ClCompile Include="..\..\..\..\src\core\sys.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp.c">
+    <ClCompile Include="..\..\..\..\src\core\tcp.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp_in.c">
+    <ClCompile Include="..\..\..\..\src\core\tcp_in.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\tcp_out.c">
+    <ClCompile Include="..\..\..\..\src\core\tcp_out.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\udp.c">
+    <ClCompile Include="..\..\..\..\src\core\udp.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\autoip.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\autoip.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\dhcp.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\dhcp.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\icmp.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\icmp.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\igmp.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\igmp.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4_addr.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4_addr.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\dhcp6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\dhcp6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ethip6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ethip6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\icmp6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\icmp6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\inet6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\inet6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6_addr.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6_addr.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\ip6_frag.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\ip6_frag.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\mld6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\mld6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv6\nd6.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv6\nd6.c">
       <Filter>src\core\ipv6</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ethernet.c">
+    <ClCompile Include="..\..\..\..\src\netif\ethernet.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6.c">
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\slipif.c">
+    <ClCompile Include="..\..\..\..\src\netif\slipif.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\auth.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\auth.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ccp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ccp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap-md5.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap-md5.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap-new.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap-new.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\chap_ms.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\chap_ms.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\demand.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\demand.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\eap.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\eap.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ecp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ecp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\eui64.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\eui64.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\fsm.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\fsm.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ipcp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ipcp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ipv6cp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ipv6cp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\lcp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\lcp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\magic.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\magic.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\mppe.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\mppe.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\multilink.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\multilink.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\ppp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\ppp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppcrypt.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppcrypt.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppoe.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppoe.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppol2tp.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppol2tp.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppos.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppos.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\upap.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\upap.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\utils.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\utils.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\vj.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\vj.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\arc4.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\arc4.c">
       <Filter>src\netif\ppp\polarssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\des.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\des.c">
       <Filter>src\netif\ppp\polarssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\md4.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\md4.c">
       <Filter>src\netif\ppp\polarssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\md5.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\md5.c">
       <Filter>src\netif\ppp\polarssl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\polarssl\sha1.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\polarssl\sha1.c">
       <Filter>src\netif\ppp\polarssl</Filter>
     </ClCompile>
     <ClCompile Include="..\sio.c">
@@ -373,396 +373,396 @@
     <ClCompile Include="..\sys_arch.c">
       <Filter>arch</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\httpd.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\httpd.c">
       <Filter>src\apps\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\fsdata.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\fsdata.c">
       <Filter>src\apps\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\fs.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\fs.c">
       <Filter>src\apps\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_asn1.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_asn1.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_core.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_core.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_msg.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_msg.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_netconn.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_netconn.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_pbuf_stream.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_pbuf_stream.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_raw.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_raw.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_scalar.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_scalar.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_table.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_table.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_threadsync.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_threadsync.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_traps.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_traps.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ip.c">
+    <ClCompile Include="..\..\..\..\src\core\ip.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_icmp.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_icmp.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_interfaces.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_interfaces.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_ip.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_ip.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_snmp.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_snmp.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_system.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_system.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_tcp.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_tcp.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_mib2_udp.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_mib2_udp.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmpv3.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmpv3.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\ppp\pppapi.c">
+    <ClCompile Include="..\..\..\..\src\netif\ppp\pppapi.c">
       <Filter>src\netif\ppp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\etharp.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\etharp.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\ipv4\ip4_frag.c">
+    <ClCompile Include="..\..\..\..\src\core\ipv4\ip4_frag.c">
       <Filter>src\core\ipv4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\timeouts.c">
+    <ClCompile Include="..\..\..\..\src\core\timeouts.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\mdns\mdns.c">
+    <ClCompile Include="..\..\..\..\src\apps\mdns\mdns.c">
       <Filter>src\apps\mdns</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmpv3_mbedtls.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmpv3_mbedtls.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\doc\NO_SYS_SampleCode.c">
+    <ClCompile Include="..\..\..\..\doc\NO_SYS_SampleCode.c">
       <Filter>doc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\tftp\tftp_server.c">
+    <ClCompile Include="..\..\..\..\src\apps\tftp\tftp_server.c">
       <Filter>src\apps\tftp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\mqtt\mqtt.c">
+    <ClCompile Include="..\..\..\..\src\apps\mqtt\mqtt.c">
       <Filter>src\apps\mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\api\if_api.c">
+    <ClCompile Include="..\..\..\..\src\api\if_api.c">
       <Filter>src\api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\bridgeif.c">
+    <ClCompile Include="..\..\..\..\src\netif\bridgeif.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_snmpv2_framework.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_snmpv2_framework.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\snmp\snmp_snmpv2_usm.c">
+    <ClCompile Include="..\..\..\..\src\apps\snmp\snmp_snmpv2_usm.c">
       <Filter>src\apps\snmp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp.c">
+    <ClCompile Include="..\..\..\..\src\core\altcp.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp_tcp.c">
+    <ClCompile Include="..\..\..\..\src\core\altcp_tcp.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls.c">
+    <ClCompile Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls.c">
       <Filter>src\apps\altcp_tls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_mem.c">
+    <ClCompile Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_mem.c">
       <Filter>src\apps\altcp_tls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\smtp\smtp.c">
+    <ClCompile Include="..\..\..\..\src\apps\smtp\smtp.c">
       <Filter>src\apps\smtp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\bridgeif_fdb.c">
+    <ClCompile Include="..\..\..\..\src\netif\bridgeif_fdb.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\http_client.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\http_client.c">
       <Filter>src\apps\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\core\altcp_alloc.c">
+    <ClCompile Include="..\..\..\..\src\core\altcp_alloc.c">
       <Filter>src\core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\altcp_proxyconnect.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\altcp_proxyconnect.c">
       <Filter>src\apps\http</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6_ble.c">
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6_ble.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\zepif.c">
+    <ClCompile Include="..\..\..\..\src\netif\zepif.c">
       <Filter>src\netif</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\src\netif\lowpan6_common.c">
+    <ClCompile Include="..\..\..\..\src\netif\lowpan6_common.c">
       <Filter>src\netif</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\lwiperf.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\lwiperf.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\netbiosns.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\netbiosns.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\netbiosns_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\netbiosns_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\sntp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\sntp.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\sntp_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\sntp_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\api.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\api.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\arch.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\arch.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\autoip.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\autoip.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\debug.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\debug.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\def.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\def.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dhcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\dhcp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dhcp6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\dhcp6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\dns.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\dns.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\err.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\err.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ethip6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ethip6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\icmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\icmp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\icmp6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\icmp6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\igmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\igmp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\inet.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\inet.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\inet_chksum.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\inet_chksum.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\init.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\init.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4_addr.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4_addr.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_addr.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_addr.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_frag.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_frag.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip_addr.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip_addr.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\mem.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\mem.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\memp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\memp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\mld6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\mld6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\nd6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\nd6.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netbuf.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\netbuf.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netdb.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\netdb.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netif.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\netif.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\netifapi.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\netifapi.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\opt.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\opt.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\pbuf.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\pbuf.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\raw.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\raw.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sio.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\sio.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\snmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\snmp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sockets.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\sockets.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\stats.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\stats.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\sys.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\sys.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\tcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\tcp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\tcpip.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\tcpip.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\udp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\udp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\etharp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\etharp.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ethernet.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ethernet.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_opts.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\slipif.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\slipif.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ccp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ccp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap-md5.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap-md5.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap-new.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap-new.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\chap_ms.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\chap_ms.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\eap.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\eap.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ecp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ecp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\eui64.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\eui64.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\fsm.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\fsm.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ipcp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ipcp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ipv6cp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ipv6cp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\lcp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\lcp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\magic.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\magic.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\mppe.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\mppe.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp_impl.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp_impl.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\ppp_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\ppp_opts.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppcrypt.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppcrypt.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppdebug.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppdebug.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppoe.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppoe.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppol2tp.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppol2tp.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppos.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppos.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\upap.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\upap.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\vj.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\vj.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\arc4.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\arc4.h">
       <Filter>src\include\netif\ppp\polarssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\des.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\des.h">
       <Filter>src\include\netif\ppp\polarssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\md4.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\md4.h">
       <Filter>src\include\netif\ppp\polarssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\md5.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\md5.h">
       <Filter>src\include\netif\ppp\polarssl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\polarssl\sha1.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\polarssl\sha1.h">
       <Filter>src\include\netif\ppp\polarssl</Filter>
     </ClInclude>
     <ClInclude Include="..\include\arch\bpstruct.h">
@@ -780,253 +780,253 @@
     <ClInclude Include="..\include\arch\sys_arch.h">
       <Filter>arch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\tcp_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\tcp_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\tcpip_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\tcpip_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\memp_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\memp_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\memp_std.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\memp_std.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\api_msg.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\api_msg.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\http\httpd_structs.h">
+    <ClInclude Include="..\..\..\..\src\apps\http\httpd_structs.h">
       <Filter>src\apps\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\http\fsdata.h">
+    <ClInclude Include="..\..\..\..\src\apps\http\fsdata.h">
       <Filter>src\apps\http</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_asn1.h">
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_asn1.h">
       <Filter>src\apps\snmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_core_priv.h">
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_core_priv.h">
       <Filter>src\apps\snmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_pbuf_stream.h">
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_pbuf_stream.h">
       <Filter>src\apps\snmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_core.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_core.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_mib2.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_mib2.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_scalar.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_scalar.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_table.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_table.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_threadsync.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_threadsync.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmp_msg.h">
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmp_msg.h">
       <Filter>src\apps\snmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ppp\pppapi.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ppp\pppapi.h">
       <Filter>src\include\netif\ppp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\fs.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\fs.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\httpd.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\httpd.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\httpd_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\httpd_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmpv3.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmpv3.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\etharp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\etharp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip4_frag.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip4_frag.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\timeouts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\timeouts.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\autoip.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\autoip.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dhcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dhcp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dns.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dns.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip4.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip4.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\snmp\snmpv3_priv.h">
+    <ClInclude Include="..\..\..\..\src\apps\snmp\snmpv3_priv.h">
       <Filter>src\apps\snmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ethernet.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ethernet.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\icmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\icmp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\icmp6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\icmp6.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ip6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ip6.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\mld6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\mld6.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\nd6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\nd6.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\tcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\tcp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\udp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\udp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mdns_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mdns_priv.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\igmp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\igmp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\etharp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\etharp.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\doc\doxygen\main_page.h">
+    <ClInclude Include="..\..\..\..\doc\doxygen\main_page.h">
       <Filter>doc\doxygen</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\tftp_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\tftp_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\tftp_server.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\tftp_server.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\errno.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\errno.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\nd6_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\nd6_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\if_api.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\if_api.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\ip6_zone.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\ip6_zone.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\sockets_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\sockets_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\bridgeif.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\bridgeif.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\bridgeif_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\bridgeif_opts.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp_tcp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp_tcp.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_mem.h">
+    <ClInclude Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_mem.h">
       <Filter>src\apps\altcp_tls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\apps\altcp_tls\altcp_tls_mbedtls_structs.h">
+    <ClInclude Include="..\..\..\..\src\apps\altcp_tls\altcp_tls_mbedtls_structs.h">
       <Filter>src\apps\altcp_tls</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\altcp_tls.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\altcp_tls.h">
       <Filter>src\include\lwip</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\altcp_tls_mbedtls_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\altcp_tls_mbedtls_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_snmpv2_framework.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_snmpv2_framework.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\snmp_snmpv2_usm.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\snmp_snmpv2_usm.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\smtp.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\smtp.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\smtp_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\smtp_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\altcp_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\altcp_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt_priv.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\mqtt_opts.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\mqtt_opts.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\sys\socket.h">
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\sys\socket.h">
       <Filter>src\include\compat\posix\sys</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\netdb.h">
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\netdb.h">
       <Filter>src\include\compat\posix</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\net\if.h">
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\net\if.h">
       <Filter>src\include\compat\posix\net</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\posix\arpa\inet.h">
+    <ClInclude Include="..\..\..\..\src\include\compat\posix\arpa\inet.h">
       <Filter>src\include\compat\posix\arpa</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\compat\stdc\errno.h">
+    <ClInclude Include="..\..\..\..\src\include\compat\stdc\errno.h">
       <Filter>src\include\compat\stdc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\iana.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\iana.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\ieee.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\ieee.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\raw_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\raw_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\priv\mem_priv.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\priv\mem_priv.h">
       <Filter>src\include\lwip\priv</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\http_client.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\http_client.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\apps\altcp_proxyconnect.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\apps\altcp_proxyconnect.h">
       <Filter>src\include\lwip\apps</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\lwip\prot\dhcp6.h">
+    <ClInclude Include="..\..\..\..\src\include\lwip\prot\dhcp6.h">
       <Filter>src\include\lwip\prot</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_ble.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_ble.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\ieee802154.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\ieee802154.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\zepif.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\zepif.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\src\include\netif\lowpan6_common.h">
+    <ClInclude Include="..\..\..\..\src\include\netif\lowpan6_common.h">
       <Filter>src\include\netif</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\examples\example_app\default_netif.h">
diff --git a/contrib/ports/win32/msvc/lwIP_Test.vcxproj b/contrib/ports/win32/msvc/lwIP_Test.vcxproj
index 8af03826..dd59a2c5 100644
--- a/contrib/ports/win32/msvc/lwIP_Test.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP_Test.vcxproj
@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -93,7 +93,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CONSOLE;WIN32;_DEBUG;LWIP_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
diff --git a/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj b/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
index db8948a7..193c9ca4 100644
--- a/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
+++ b/contrib/ports/win32/msvc/lwIP_pcapif.vcxproj
@@ -46,7 +46,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -69,7 +69,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;.\;$(PCAP_DIR)\Include;..\..\..\..\..\winpcap\WpdPack\Include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/contrib/ports/win32/msvc/lwip_unittests.vcxproj b/contrib/ports/win32/msvc/lwip_unittests.vcxproj
index 4dccb92b..f859eaf8 100644
--- a/contrib/ports/win32/msvc/lwip_unittests.vcxproj
+++ b/contrib/ports/win32/msvc/lwip_unittests.vcxproj
@@ -42,7 +42,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\check;..\..\..\..\check\src;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\check;..\..\..\..\..\check\src;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_LIB;WIN32;_DEBUG;LWIP_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -63,7 +63,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\check;..\..\..\..\check\src;..\..\..\..\lwip\test\unit;..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\check;..\..\..\..\..\check\src;..\..\..\..\test\unit;..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -81,45 +81,45 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\api\test_sockets.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\arch\sys_arch.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_def.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_mem.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_netif.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_pbuf.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_timers.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\ip4\test_ip4.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\ip6\test_ip6.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\mdns\test_mdns.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\mqtt\test_mqtt.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\tcp_helper.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\test_tcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\udp\test_udp.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\etharp\test_etharp.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\dhcp\test_dhcp.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\lwip_unittests.c" />
+    <ClCompile Include="..\..\..\..\test\unit\api\test_sockets.c" />
+    <ClCompile Include="..\..\..\..\test\unit\arch\sys_arch.c" />
+    <ClCompile Include="..\..\..\..\test\unit\core\test_def.c" />
+    <ClCompile Include="..\..\..\..\test\unit\core\test_mem.c" />
+    <ClCompile Include="..\..\..\..\test\unit\core\test_netif.c" />
+    <ClCompile Include="..\..\..\..\test\unit\core\test_pbuf.c" />
+    <ClCompile Include="..\..\..\..\test\unit\core\test_timers.c" />
+    <ClCompile Include="..\..\..\..\test\unit\ip4\test_ip4.c" />
+    <ClCompile Include="..\..\..\..\test\unit\ip6\test_ip6.c" />
+    <ClCompile Include="..\..\..\..\test\unit\mdns\test_mdns.c" />
+    <ClCompile Include="..\..\..\..\test\unit\mqtt\test_mqtt.c" />
+    <ClCompile Include="..\..\..\..\test\unit\tcp\tcp_helper.c" />
+    <ClCompile Include="..\..\..\..\test\unit\tcp\test_tcp.c" />
+    <ClCompile Include="..\..\..\..\test\unit\tcp\test_tcp_oos.c" />
+    <ClCompile Include="..\..\..\..\test\unit\udp\test_udp.c" />
+    <ClCompile Include="..\..\..\..\test\unit\etharp\test_etharp.c" />
+    <ClCompile Include="..\..\..\..\test\unit\dhcp\test_dhcp.c" />
+    <ClCompile Include="..\..\..\..\test\unit\lwip_unittests.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\api\test_sockets.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\arch\sys_arch.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_def.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_mem.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_netif.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_pbuf.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_timers.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\ip4\test_ip4.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\ip6\test_ip6.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\mdns\test_mdns.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\mqtt\test_mqtt.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\tcp_helper.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\test_tcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\udp\test_udp.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\etharp\test_etharp.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\dhcp\test_dhcp.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\lwip_check.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\lwipopts.h" />
+    <ClInclude Include="..\..\..\..\test\unit\api\test_sockets.h" />
+    <ClInclude Include="..\..\..\..\test\unit\arch\sys_arch.h" />
+    <ClInclude Include="..\..\..\..\test\unit\core\test_def.h" />
+    <ClInclude Include="..\..\..\..\test\unit\core\test_mem.h" />
+    <ClInclude Include="..\..\..\..\test\unit\core\test_netif.h" />
+    <ClInclude Include="..\..\..\..\test\unit\core\test_pbuf.h" />
+    <ClInclude Include="..\..\..\..\test\unit\core\test_timers.h" />
+    <ClInclude Include="..\..\..\..\test\unit\ip4\test_ip4.h" />
+    <ClInclude Include="..\..\..\..\test\unit\ip6\test_ip6.h" />
+    <ClInclude Include="..\..\..\..\test\unit\mdns\test_mdns.h" />
+    <ClInclude Include="..\..\..\..\test\unit\mqtt\test_mqtt.h" />
+    <ClInclude Include="..\..\..\..\test\unit\tcp\tcp_helper.h" />
+    <ClInclude Include="..\..\..\..\test\unit\tcp\test_tcp.h" />
+    <ClInclude Include="..\..\..\..\test\unit\tcp\test_tcp_oos.h" />
+    <ClInclude Include="..\..\..\..\test\unit\udp\test_udp.h" />
+    <ClInclude Include="..\..\..\..\test\unit\etharp\test_etharp.h" />
+    <ClInclude Include="..\..\..\..\test\unit\dhcp\test_dhcp.h" />
+    <ClInclude Include="..\..\..\..\test\unit\lwip_check.h" />
+    <ClInclude Include="..\..\..\..\test\unit\lwipopts.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="libcheck.vcxproj">
diff --git a/contrib/ports/win32/msvc/lwip_unittests.vcxproj.filters b/contrib/ports/win32/msvc/lwip_unittests.vcxproj.filters
index 79cc8618..09455da9 100644
--- a/contrib/ports/win32/msvc/lwip_unittests.vcxproj.filters
+++ b/contrib/ports/win32/msvc/lwip_unittests.vcxproj.filters
@@ -36,111 +36,111 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_mem.c">
+    <ClCompile Include="..\..\..\..\test\unit\core\test_mem.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_pbuf.c">
+    <ClCompile Include="..\..\..\..\test\unit\core\test_pbuf.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\tcp_helper.c">
+    <ClCompile Include="..\..\..\..\test\unit\tcp\tcp_helper.c">
       <Filter>tcp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\test_tcp.c">
+    <ClCompile Include="..\..\..\..\test\unit\tcp\test_tcp.c">
       <Filter>tcp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.c">
+    <ClCompile Include="..\..\..\..\test\unit\tcp\test_tcp_oos.c">
       <Filter>tcp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\udp\test_udp.c">
+    <ClCompile Include="..\..\..\..\test\unit\udp\test_udp.c">
       <Filter>udp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\etharp\test_etharp.c">
+    <ClCompile Include="..\..\..\..\test\unit\etharp\test_etharp.c">
       <Filter>etharp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\dhcp\test_dhcp.c">
+    <ClCompile Include="..\..\..\..\test\unit\dhcp\test_dhcp.c">
       <Filter>dhcp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\lwip_unittests.c" />
-    <ClCompile Include="..\..\..\..\lwip\test\unit\mdns\test_mdns.c">
+    <ClCompile Include="..\..\..\..\test\unit\lwip_unittests.c" />
+    <ClCompile Include="..\..\..\..\test\unit\mdns\test_mdns.c">
       <Filter>mdns</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\api\test_sockets.c">
+    <ClCompile Include="..\..\..\..\test\unit\api\test_sockets.c">
       <Filter>api</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\arch\sys_arch.c">
+    <ClCompile Include="..\..\..\..\test\unit\arch\sys_arch.c">
       <Filter>arch</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\mqtt\test_mqtt.c">
+    <ClCompile Include="..\..\..\..\test\unit\mqtt\test_mqtt.c">
       <Filter>mqtt</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\ip4\test_ip4.c">
+    <ClCompile Include="..\..\..\..\test\unit\ip4\test_ip4.c">
       <Filter>ip4</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_def.c">
+    <ClCompile Include="..\..\..\..\test\unit\core\test_def.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_timers.c">
+    <ClCompile Include="..\..\..\..\test\unit\core\test_timers.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\core\test_netif.c">
+    <ClCompile Include="..\..\..\..\test\unit\core\test_netif.c">
       <Filter>core</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\lwip\test\unit\ip6\test_ip6.c">
+    <ClCompile Include="..\..\..\..\test\unit\ip6\test_ip6.c">
       <Filter>ipv6</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_mem.h">
+    <ClInclude Include="..\..\..\..\test\unit\core\test_mem.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_pbuf.h">
+    <ClInclude Include="..\..\..\..\test\unit\core\test_pbuf.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\tcp_helper.h">
+    <ClInclude Include="..\..\..\..\test\unit\tcp\tcp_helper.h">
       <Filter>tcp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\test_tcp.h">
+    <ClInclude Include="..\..\..\..\test\unit\tcp\test_tcp.h">
       <Filter>tcp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\tcp\test_tcp_oos.h">
+    <ClInclude Include="..\..\..\..\test\unit\tcp\test_tcp_oos.h">
       <Filter>tcp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\udp\test_udp.h">
+    <ClInclude Include="..\..\..\..\test\unit\udp\test_udp.h">
       <Filter>udp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\etharp\test_etharp.h">
+    <ClInclude Include="..\..\..\..\test\unit\etharp\test_etharp.h">
       <Filter>etharp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\dhcp\test_dhcp.h">
+    <ClInclude Include="..\..\..\..\test\unit\dhcp\test_dhcp.h">
       <Filter>dhcp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\lwip_check.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\lwipopts.h" />
-    <ClInclude Include="..\..\..\..\lwip\test\unit\mdns\test_mdns.h">
+    <ClInclude Include="..\..\..\..\test\unit\lwip_check.h" />
+    <ClInclude Include="..\..\..\..\test\unit\lwipopts.h" />
+    <ClInclude Include="..\..\..\..\test\unit\mdns\test_mdns.h">
       <Filter>mdns</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\api\test_sockets.h">
+    <ClInclude Include="..\..\..\..\test\unit\api\test_sockets.h">
       <Filter>api</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\arch\sys_arch.h">
+    <ClInclude Include="..\..\..\..\test\unit\arch\sys_arch.h">
       <Filter>arch</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\mqtt\test_mqtt.h">
+    <ClInclude Include="..\..\..\..\test\unit\mqtt\test_mqtt.h">
       <Filter>mqtt</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\ip4\test_ip4.h">
+    <ClInclude Include="..\..\..\..\test\unit\ip4\test_ip4.h">
       <Filter>ip4</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_def.h">
+    <ClInclude Include="..\..\..\..\test\unit\core\test_def.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_timers.h">
+    <ClInclude Include="..\..\..\..\test\unit\core\test_timers.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\core\test_netif.h">
+    <ClInclude Include="..\..\..\..\test\unit\core\test_netif.h">
       <Filter>core</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\..\lwip\test\unit\ip6\test_ip6.h">
+    <ClInclude Include="..\..\..\..\test\unit\ip6\test_ip6.h">
       <Filter>ipv6</Filter>
     </ClInclude>
   </ItemGroup>
diff --git a/contrib/ports/win32/msvc/makefsdata.vcxproj b/contrib/ports/win32/msvc/makefsdata.vcxproj
index 1b45aff4..adb1d7e2 100644
--- a/contrib/ports/win32/msvc/makefsdata.vcxproj
+++ b/contrib/ports/win32/msvc/makefsdata.vcxproj
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\makefsdata\makefsdata.c" />
+    <ClCompile Include="..\..\..\..\src\apps\http\makefsdata\makefsdata.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}</ProjectGuid>
@@ -48,7 +48,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -72,7 +72,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\..\..\lwip\src\include;..\..\..\..\lwip\src\include\ipv4;..\..\..\..\lwip\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\..\src\include;..\..\..\..\src\include\ipv4;..\..\..\..\src\include\ipv6;..\include;..\..\..\examples\example_app;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
diff --git a/contrib/ports/win32/msvc/makefsdata.vcxproj.filters b/contrib/ports/win32/msvc/makefsdata.vcxproj.filters
index e94f2b5b..0f0210dc 100644
--- a/contrib/ports/win32/msvc/makefsdata.vcxproj.filters
+++ b/contrib/ports/win32/msvc/makefsdata.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\..\lwip\src\apps\http\makefsdata\makefsdata.c">
+    <ClCompile Include="..\..\..\..\src\apps\http\makefsdata\makefsdata.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>