diff --git a/ports/unix/check/Makefile b/ports/unix/check/Makefile
index f51cdec..9ca2b35 100644
--- a/ports/unix/check/Makefile
+++ b/ports/unix/check/Makefile
@@ -34,8 +34,7 @@ LWIPDIR=$(CODEDIR)/src
LDFLAGS:=$(LDFLAGS) -lcheck
CFLAGS:=$(CFLAGS) -DLWIP_UNIX_EMPTY_ASSERT -I/usr/include/check -I$(LWIPDIR)/../test/unit \
- -I$(LWIPDIR)/include -I$(LWIPDIR)/include/ipv4 \
- -I$(LWIPDIR)/include/ipv6 -Iunix/include -I. -I../include
+ -I$(LWIPDIR)/include -Iunix/include -I. -I../include
COREFILES=$(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c \
$(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c \
diff --git a/ports/unix/proj/lib/Makefile b/ports/unix/proj/lib/Makefile
index 5e7f730..4c61cce 100644
--- a/ports/unix/proj/lib/Makefile
+++ b/ports/unix/proj/lib/Makefile
@@ -46,8 +46,7 @@ CFLAGS=-g -Wall -DIPv4 -DLWIP_DEBUG -fPIC -pedantic -Werror \
-Wredundant-decls -Wnested-externs -Wno-address
CFLAGS:=$(CFLAGS) \
- -I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
- -I$(LWIPDIR)/include/ipv6 -I$(LWIPDIR) -I.
+ -I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR) -I.
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
COREFILES=$(LWIPDIR)/core/def.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/dns.c \
diff --git a/ports/unix/proj/minimal/Makefile b/ports/unix/proj/minimal/Makefile
index dfed669..b4020eb 100644
--- a/ports/unix/proj/minimal/Makefile
+++ b/ports/unix/proj/minimal/Makefile
@@ -50,8 +50,8 @@ LWIPARCH=$(CONTRIBDIR)/ports/unix
LWIPDIR=$(CONTRIBDIR)/../lwip/src
CFLAGS:=$(CFLAGS) \
- -I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
- -I$(LWIPDIR)/include/ipv6 -I. -I$(CONTRIBDIR)/apps/snmp_private_mib \
+ -I$(LWIPDIR)/include -I$(LWIPARCH)/include \
+ -I. -I$(CONTRIBDIR)/apps/snmp_private_mib \
-I$(CONTRIBDIR)/apps/tcpecho_raw
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
diff --git a/ports/unix/proj/unixsim/Makefile b/ports/unix/proj/unixsim/Makefile
index b0f6975..8a18fe6 100644
--- a/ports/unix/proj/unixsim/Makefile
+++ b/ports/unix/proj/unixsim/Makefile
@@ -57,8 +57,7 @@ LWIPDIR=$(CONTRIBDIR)/../lwip/src
CFLAGS:=$(CFLAGS) \
-I. -I$(CONTRIBDIR)/apps/httpserver_raw -I$(CONTRIBDIR)/apps/shell \
-I$(CONTRIBDIR)/apps/tcpecho -I$(CONTRIBDIR)/apps/udpecho \
- -I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)/include/ipv4 \
- -I$(LWIPDIR)/include/ipv6 -I$(LWIPDIR)
+ -I$(LWIPDIR)/include -I$(LWIPARCH)/include -I$(LWIPDIR)
# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
COREFILES=$(LWIPDIR)/core/def.c $(LWIPDIR)/core/dhcp.c $(LWIPDIR)/core/dns.c \
diff --git a/ports/win32/msvc/lwIP.vcproj b/ports/win32/msvc/lwIP.vcproj
index 25fbaab..8ba89c8 100644
--- a/ports/win32/msvc/lwIP.vcproj
+++ b/ports/win32/msvc/lwIP.vcproj
@@ -774,86 +774,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -869,6 +789,10 @@
RelativePath="$(LWIP_DIR)\src\include\lwip\arch.h"
>
+
+
@@ -881,6 +805,10 @@
RelativePath="$(LWIP_DIR)\src\include\lwip\dhcp.h"
>
+
+
@@ -889,6 +817,30 @@
RelativePath="$(LWIP_DIR)\src\include\lwip\err.h"
>
+
+
+
+
+
+
+
+
+
+
+
+
@@ -901,10 +853,30 @@
RelativePath="$(LWIP_DIR)\src\include\lwip\ip.h"
>
+
+
+
+
+
+
+
+
+
+
@@ -917,6 +889,14 @@
RelativePath="$(LWIP_DIR)\src\include\lwip\memp_std.h"
>
+
+
+
+
@@ -1005,37 +985,21 @@
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1044,6 +1008,10 @@
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\chap-new.h"
>
+
+
@@ -1108,19 +1076,35 @@
RelativePath="$(LWIP_DIR)\src\include\netif\ppp\vj.h"
>
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
@@ -1129,10 +1113,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1213,10 +1173,6 @@
RelativePath="$(LWIP_DIR)\src\netif\ppp\ccp.c"
>
-
-
@@ -1225,6 +1181,10 @@
RelativePath="$(LWIP_DIR)\src\netif\ppp\chap-new.c"
>
+
+
@@ -1293,6 +1253,26 @@
RelativePath="$(LWIP_DIR)\src\netif\ppp\vj.c"
>
+
+
+
+
+
+
+
+
+
+