diff --git a/ports/win32/msvc8/lwIP.vcproj b/ports/win32/msvc8/lwIP.vcproj
index c1eed0d..657eb3a 100644
--- a/ports/win32/msvc8/lwIP.vcproj
+++ b/ports/win32/msvc8/lwIP.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,.."
+				AdditionalIncludeDirectories=""$(LWIP_DIR)\src\include";"$(LWIP_DIR)\src\include\ipv4";"$(LWIP_DIR)\src\include\ipv6";..\include;.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -113,7 +113,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,.."
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include;.."
 				PreprocessorDefinitions="_LIB;WIN32;_DEBUG;LWIP_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -465,6 +465,10 @@
 					RelativePath="$(LWIP_DIR)\src\core\dns.c"
 					>
 				</File>
+				<File
+					RelativePath="$(LWIP_DIR)\src\core\inet_chksum.c"
+					>
+				</File>
 				<File
 					RelativePath="$(LWIP_DIR)\src\core\init.c"
 					>
@@ -533,19 +537,11 @@
 						>
 					</File>
 					<File
-						RelativePath="$(LWIP_DIR)\src\core\ipv4\inet.c"
+						RelativePath="$(LWIP_DIR)\src\core\ipv4\ip4.c"
 						>
 					</File>
 					<File
-						RelativePath="$(LWIP_DIR)\src\core\ipv4\inet_chksum.c"
-						>
-					</File>
-					<File
-						RelativePath="$(LWIP_DIR)\src\core\ipv4\ip.c"
-						>
-					</File>
-					<File
-						RelativePath="$(LWIP_DIR)\src\core\ipv4\ip_addr.c"
+						RelativePath="$(LWIP_DIR)\src\core\ipv4\ip4_addr.c"
 						>
 					</File>
 					<File
@@ -556,85 +552,41 @@
 				<Filter
 					Name="ipv6"
 					>
+					<File
+						RelativePath="$(LWIP_DIR)\src\core\ipv6\dhcp6.c"
+						>
+					</File>
+					<File
+						RelativePath="$(LWIP_DIR)\src\core\ipv6\ethip6.c"
+						>
+					</File>
 					<File
 						RelativePath="$(LWIP_DIR)\src\core\ipv6\icmp6.c"
 						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="$(LWIP_DIR)\src\core\ipv6\inet6.c"
 						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="$(LWIP_DIR)\src\core\ipv6\ip6.c"
 						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="$(LWIP_DIR)\src\core\ipv6\ip6_addr.c"
 						>
-						<FileConfiguration
-							Name="Release|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
-						<FileConfiguration
-							Name="Debug|Win32"
-							ExcludedFromBuild="true"
-							>
-							<Tool
-								Name="VCCLCompilerTool"
-							/>
-						</FileConfiguration>
+					</File>
+					<File
+						RelativePath="$(LWIP_DIR)\src\core\ipv6\ip6_frag.c"
+						>
+					</File>
+					<File
+						RelativePath="$(LWIP_DIR)\src\core\ipv6\mld6.c"
+						>
+					</File>
+					<File
+						RelativePath="$(LWIP_DIR)\src\core\ipv6\nd6.c"
+						>
 					</File>
 					<File
 						RelativePath="$(LWIP_DIR)\src\core\ipv6\README"
@@ -862,84 +814,40 @@
 						Name="lwip"
 						>
 						<File
-							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\icmp.h"
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\dhcp6.h"
 							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\inet.h"
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ethip6.h"
 							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip.h"
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\icmp6.h"
 							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
 						</File>
 						<File
-							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip_addr.h"
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\inet6.h"
+							>
+						</File>
+						<File
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6.h"
+							>
+						</File>
+						<File
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6_addr.h"
+							>
+						</File>
+						<File
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\ip6_frag.h"
+							>
+						</File>
+						<File
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\mld6.h"
+							>
+						</File>
+						<File
+							RelativePath="$(LWIP_DIR)\src\include\ipv6\lwip\nd6.h"
 							>
-							<FileConfiguration
-								Name="Release|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
-							<FileConfiguration
-								Name="Debug|Win32"
-								ExcludedFromBuild="true"
-								>
-								<Tool
-									Name="VCCustomBuildTool"
-								/>
-							</FileConfiguration>
 						</File>
 					</Filter>
 				</Filter>
@@ -1457,11 +1365,11 @@
 				</FileConfiguration>
 			</File>
 			<File
-				RelativePath="..\lwippools.h"
+				RelativePath="..\include\lwipopts.h"
 				>
 			</File>
 			<File
-				RelativePath="..\include\lwipopts.h"
+				RelativePath="..\lwippools.h"
 				>
 			</File>
 			<File
diff --git a/ports/win32/msvc8/lwIP_Test.vcproj b/ports/win32/msvc8/lwIP_Test.vcproj
index b90d7e5..0a66c58 100644
--- a/ports/win32/msvc8/lwIP_Test.vcproj
+++ b/ports/win32/msvc8/lwIP_Test.vcproj
@@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,..,..\..\.."
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include;..;..\..\.."
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -135,7 +135,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,..,..\..\.."
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include;..;..\..\.."
 				PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG;LWIP_DEBUG;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/ports/win32/msvc8/lwIP_pcapif.vcproj b/ports/win32/msvc8/lwIP_pcapif.vcproj
index 1bf1359..3c21819 100644
--- a/ports/win32/msvc8/lwIP_pcapif.vcproj
+++ b/ports/win32/msvc8/lwIP_pcapif.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,..,.\;$(PCAP_DIR)\Include"
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include;..;.\;&quot;$(PCAP_DIR)\Include&quot;"
 				PreprocessorDefinitions="_LIB;WIN32;_DEBUG;LWIP_DEBUG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -114,7 +114,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include,..,.\;$(PCAP_DIR)\Include"
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include;..;.\;&quot;$(PCAP_DIR)\Include&quot;"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				StringPooling="true"
 				RuntimeLibrary="0"
diff --git a/ports/win32/msvc8/makefsdata.vcproj b/ports/win32/msvc8/makefsdata.vcproj
index 6f509cd..77875aa 100644
--- a/ports/win32/msvc8/makefsdata.vcproj
+++ b/ports/win32/msvc8/makefsdata.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include"
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -118,7 +118,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="$(LWIP_DIR)\src\include,$(LWIP_DIR)\src\include\ipv4,..\include"
+				AdditionalIncludeDirectories="&quot;$(LWIP_DIR)\src\include&quot;;&quot;$(LWIP_DIR)\src\include\ipv4&quot;;&quot;$(LWIP_DIR)\src\include\ipv6&quot;;..\include"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"