diff --git a/src/Filelists.mk b/src/Filelists.mk
index 94b72bca..828b9f2a 100644
--- a/src/Filelists.mk
+++ b/src/Filelists.mk
@@ -29,28 +29,101 @@
 # Author: Adam Dunkels <adam@sics.se>
 #
 
-LWIP_VERSION_MAJOR=2
-LWIP_VERSION_MINOR=0
-LWIP_VERSION_REVISION=3
+# COREFILES, CORE4FILES: The minimum set of files needed for lwIP.
+COREFILES=$(LWIPDIR)/core/init.c \
+	$(LWIPDIR)/core/def.c \
+	$(LWIPDIR)/core/dns.c \
+	$(LWIPDIR)/core/inet_chksum.c \
+	$(LWIPDIR)/core/ip.c \
+	$(LWIPDIR)/core/mem.c \
+	$(LWIPDIR)/core/memp.c \
+	$(LWIPDIR)/core/netif.c \
+	$(LWIPDIR)/core/pbuf.c \
+	$(LWIPDIR)/core/raw.c \
+	$(LWIPDIR)/core/stats.c \
+	$(LWIPDIR)/core/sys.c \
+	$(LWIPDIR)/core/altcp.c \
+	$(LWIPDIR)/core/altcp_alloc.c \
+	$(LWIPDIR)/core/altcp_tcp.c \
+	$(LWIPDIR)/core/tcp.c \
+	$(LWIPDIR)/core/tcp_in.c \
+	$(LWIPDIR)/core/tcp_out.c \
+	$(LWIPDIR)/core/timeouts.c \
+	$(LWIPDIR)/core/udp.c
 
-# COREFILES: The minimum set of files needed for lwIP.
-COREFILES=$(LWIPDIR)/core/init.c $(LWIPDIR)/core/def.c $(LWIPDIR)/core/dns.c $(LWIPDIR)/core/inet_chksum.c $(LWIPDIR)/core/ip.c $(LWIPDIR)/core/mem.c $(LWIPDIR)/core/memp.c $(LWIPDIR)/core/netif.c $(LWIPDIR)/core/pbuf.c $(LWIPDIR)/core/raw.c $(LWIPDIR)/core/stats.c $(LWIPDIR)/core/sys.c $(LWIPDIR)/core/altcp.c $(LWIPDIR)/core/altcp_alloc.c $(LWIPDIR)/core/altcp_tcp.c $(LWIPDIR)/core/tcp.c $(LWIPDIR)/core/tcp_in.c $(LWIPDIR)/core/tcp_out.c $(LWIPDIR)/core/timeouts.c $(LWIPDIR)/core/udp.c 
+CORE4FILES=$(LWIPDIR)/core/ipv4/autoip.c \
+	$(LWIPDIR)/core/ipv4/dhcp.c \
+	$(LWIPDIR)/core/ipv4/etharp.c \
+	$(LWIPDIR)/core/ipv4/icmp.c \
+	$(LWIPDIR)/core/ipv4/igmp.c \
+	$(LWIPDIR)/core/ipv4/ip4_frag.c \
+	$(LWIPDIR)/core/ipv4/ip4.c \
+	$(LWIPDIR)/core/ipv4/ip4_addr.c
 
-CORE4FILES=$(LWIPDIR)/core/ipv4/autoip.c $(LWIPDIR)/core/ipv4/dhcp.c $(LWIPDIR)/core/ipv4/etharp.c $(LWIPDIR)/core/ipv4/icmp.c $(LWIPDIR)/core/ipv4/igmp.c $(LWIPDIR)/core/ipv4/ip4_frag.c $(LWIPDIR)/core/ipv4/ip4.c $(LWIPDIR)/core/ipv4/ip4_addr.c 
-
-CORE6FILES=$(LWIPDIR)/core/ipv6/dhcp6.c $(LWIPDIR)/core/ipv6/ethip6.c $(LWIPDIR)/core/ipv6/icmp6.c $(LWIPDIR)/core/ipv6/inet6.c $(LWIPDIR)/core/ipv6/ip6.c $(LWIPDIR)/core/ipv6/ip6_addr.c $(LWIPDIR)/core/ipv6/ip6_frag.c $(LWIPDIR)/core/ipv6/mld6.c $(LWIPDIR)/core/ipv6/nd6.c 
+CORE6FILES=$(LWIPDIR)/core/ipv6/dhcp6.c \
+	$(LWIPDIR)/core/ipv6/ethip6.c \
+	$(LWIPDIR)/core/ipv6/icmp6.c \
+	$(LWIPDIR)/core/ipv6/inet6.c \
+	$(LWIPDIR)/core/ipv6/ip6.c \
+	$(LWIPDIR)/core/ipv6/ip6_addr.c \
+	$(LWIPDIR)/core/ipv6/ip6_frag.c \
+	$(LWIPDIR)/core/ipv6/mld6.c \
+	$(LWIPDIR)/core/ipv6/nd6.c
 
 # APIFILES: The files which implement the sequential and socket APIs.
-APIFILES=$(LWIPDIR)/api/api_lib.c $(LWIPDIR)/api/api_msg.c $(LWIPDIR)/api/err.c $(LWIPDIR)/api/if_api.c $(LWIPDIR)/api/netbuf.c $(LWIPDIR)/api/netdb.c $(LWIPDIR)/api/netifapi.c $(LWIPDIR)/api/sockets.c $(LWIPDIR)/api/tcpip.c 
+APIFILES=$(LWIPDIR)/api/api_lib.c \
+	$(LWIPDIR)/api/api_msg.c \
+	$(LWIPDIR)/api/err.c \
+	$(LWIPDIR)/api/if_api.c \
+	$(LWIPDIR)/api/netbuf.c \
+	$(LWIPDIR)/api/netdb.c \
+	$(LWIPDIR)/api/netifapi.c \
+	$(LWIPDIR)/api/sockets.c \
+	$(LWIPDIR)/api/tcpip.c
 
 # NETIFFILES: Files implementing various generic network interface functions
-NETIFFILES=$(LWIPDIR)/netif/ethernet.c $(LWIPDIR)/netif/bridgeif.c $(LWIPDIR)/netif/bridgeif_fdb.c $(LWIPDIR)/netif/slipif.c 
+NETIFFILES=$(LWIPDIR)/netif/ethernet.c \
+	$(LWIPDIR)/netif/bridgeif.c \
+	$(LWIPDIR)/netif/bridgeif_fdb.c \
+	$(LWIPDIR)/netif/slipif.c
 
 # SIXLOWPAN: 6LoWPAN
-SIXLOWPAN=$(LWIPDIR)/netif/lowpan6_common.c $(LWIPDIR)/netif/lowpan6.c $(LWIPDIR)/netif/lowpan6_ble.c $(LWIPDIR)/netif/zepif.c 
+SIXLOWPAN=$(LWIPDIR)/netif/lowpan6_common.c \
+        $(LWIPDIR)/netif/lowpan6.c \
+	$(LWIPDIR)/netif/lowpan6_ble.c \
+	$(LWIPDIR)/netif/zepif.c
 
 # PPPFILES: PPP
-PPPFILES=$(LWIPDIR)/netif/ppp/auth.c $(LWIPDIR)/netif/ppp/ccp.c $(LWIPDIR)/netif/ppp/chap-md5.c $(LWIPDIR)/netif/ppp/chap_ms.c $(LWIPDIR)/netif/ppp/chap-new.c $(LWIPDIR)/netif/ppp/demand.c $(LWIPDIR)/netif/ppp/eap.c $(LWIPDIR)/netif/ppp/ecp.c $(LWIPDIR)/netif/ppp/eui64.c $(LWIPDIR)/netif/ppp/fsm.c $(LWIPDIR)/netif/ppp/ipcp.c $(LWIPDIR)/netif/ppp/ipv6cp.c $(LWIPDIR)/netif/ppp/lcp.c $(LWIPDIR)/netif/ppp/magic.c $(LWIPDIR)/netif/ppp/mppe.c $(LWIPDIR)/netif/ppp/multilink.c $(LWIPDIR)/netif/ppp/ppp.c $(LWIPDIR)/netif/ppp/pppapi.c $(LWIPDIR)/netif/ppp/pppcrypt.c $(LWIPDIR)/netif/ppp/pppoe.c $(LWIPDIR)/netif/ppp/pppol2tp.c $(LWIPDIR)/netif/ppp/pppos.c $(LWIPDIR)/netif/ppp/upap.c $(LWIPDIR)/netif/ppp/utils.c $(LWIPDIR)/netif/ppp/vj.c $(LWIPDIR)/netif/ppp/polarssl/arc4.c $(LWIPDIR)/netif/ppp/polarssl/des.c $(LWIPDIR)/netif/ppp/polarssl/md4.c $(LWIPDIR)/netif/ppp/polarssl/md5.c $(LWIPDIR)/netif/ppp/polarssl/sha1.c 
+PPPFILES=$(LWIPDIR)/netif/ppp/auth.c \
+	$(LWIPDIR)/netif/ppp/ccp.c \
+	$(LWIPDIR)/netif/ppp/chap-md5.c \
+	$(LWIPDIR)/netif/ppp/chap_ms.c \
+	$(LWIPDIR)/netif/ppp/chap-new.c \
+	$(LWIPDIR)/netif/ppp/demand.c \
+	$(LWIPDIR)/netif/ppp/eap.c \
+	$(LWIPDIR)/netif/ppp/ecp.c \
+	$(LWIPDIR)/netif/ppp/eui64.c \
+	$(LWIPDIR)/netif/ppp/fsm.c \
+	$(LWIPDIR)/netif/ppp/ipcp.c \
+	$(LWIPDIR)/netif/ppp/ipv6cp.c \
+	$(LWIPDIR)/netif/ppp/lcp.c \
+	$(LWIPDIR)/netif/ppp/magic.c \
+	$(LWIPDIR)/netif/ppp/mppe.c \
+	$(LWIPDIR)/netif/ppp/multilink.c \
+	$(LWIPDIR)/netif/ppp/ppp.c \
+	$(LWIPDIR)/netif/ppp/pppapi.c \
+	$(LWIPDIR)/netif/ppp/pppcrypt.c \
+	$(LWIPDIR)/netif/ppp/pppoe.c \
+	$(LWIPDIR)/netif/ppp/pppol2tp.c \
+	$(LWIPDIR)/netif/ppp/pppos.c \
+	$(LWIPDIR)/netif/ppp/upap.c \
+	$(LWIPDIR)/netif/ppp/utils.c \
+	$(LWIPDIR)/netif/ppp/vj.c \
+	$(LWIPDIR)/netif/ppp/polarssl/arc4.c \
+	$(LWIPDIR)/netif/ppp/polarssl/des.c \
+	$(LWIPDIR)/netif/ppp/polarssl/md4.c \
+	$(LWIPDIR)/netif/ppp/polarssl/md5.c \
+	$(LWIPDIR)/netif/ppp/polarssl/sha1.c
 
 # LWIPNOAPPSFILES: All LWIP files without apps
 LWIPNOAPPSFILES=$(COREFILES) \
@@ -61,38 +134,63 @@ LWIPNOAPPSFILES=$(COREFILES) \
 	$(PPPFILES) \
 	$(SIXLOWPAN)
 
-# SNMPFILES: SNMPv3 agent
-SNMPFILES=$(LWIPDIR)/apps/snmp/snmp_asn1.c $(LWIPDIR)/apps/snmp/snmp_core.c $(LWIPDIR)/apps/snmp/snmp_mib2.c $(LWIPDIR)/apps/snmp/snmp_mib2_icmp.c $(LWIPDIR)/apps/snmp/snmp_mib2_interfaces.c $(LWIPDIR)/apps/snmp/snmp_mib2_ip.c $(LWIPDIR)/apps/snmp/snmp_mib2_snmp.c $(LWIPDIR)/apps/snmp/snmp_mib2_system.c $(LWIPDIR)/apps/snmp/snmp_mib2_tcp.c $(LWIPDIR)/apps/snmp/snmp_mib2_udp.c $(LWIPDIR)/apps/snmp/snmp_snmpv2_framework.c $(LWIPDIR)/apps/snmp/snmp_snmpv2_usm.c $(LWIPDIR)/apps/snmp/snmp_msg.c $(LWIPDIR)/apps/snmp/snmpv3.c $(LWIPDIR)/apps/snmp/snmp_netconn.c $(LWIPDIR)/apps/snmp/snmp_pbuf_stream.c $(LWIPDIR)/apps/snmp/snmp_raw.c $(LWIPDIR)/apps/snmp/snmp_scalar.c $(LWIPDIR)/apps/snmp/snmp_table.c $(LWIPDIR)/apps/snmp/snmp_threadsync.c $(LWIPDIR)/apps/snmp/snmp_traps.c 
+# SNMPFILES: SNMPv2c agent
+SNMPFILES=$(LWIPDIR)/apps/snmp/snmp_asn1.c \
+	$(LWIPDIR)/apps/snmp/snmp_core.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_icmp.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_interfaces.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_ip.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_snmp.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_system.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_tcp.c \
+	$(LWIPDIR)/apps/snmp/snmp_mib2_udp.c \
+	$(LWIPDIR)/apps/snmp/snmp_snmpv2_framework.c \
+	$(LWIPDIR)/apps/snmp/snmp_snmpv2_usm.c \
+	$(LWIPDIR)/apps/snmp/snmp_msg.c \
+	$(LWIPDIR)/apps/snmp/snmpv3.c \
+	$(LWIPDIR)/apps/snmp/snmp_netconn.c \
+	$(LWIPDIR)/apps/snmp/snmp_pbuf_stream.c \
+	$(LWIPDIR)/apps/snmp/snmp_raw.c \
+	$(LWIPDIR)/apps/snmp/snmp_scalar.c \
+	$(LWIPDIR)/apps/snmp/snmp_table.c \
+	$(LWIPDIR)/apps/snmp/snmp_threadsync.c \
+	$(LWIPDIR)/apps/snmp/snmp_traps.c
 
 # HTTPFILES: HTTP server + client
-HTTPFILES=$(LWIPDIR)/apps/http/altcp_proxyconnect.c $(LWIPDIR)/apps/http/fs.c $(LWIPDIR)/apps/http/http_client.c $(LWIPDIR)/apps/http/httpd.c 
+HTTPFILES=$(LWIPDIR)/apps/http/altcp_proxyconnect.c \
+	$(LWIPDIR)/apps/http/fs.c \
+	$(LWIPDIR)/apps/http/http_client.c \
+	$(LWIPDIR)/apps/http/httpd.c
 
 # MAKEFSDATA: MAKEFSDATA HTTP server host utility
-MAKEFSDATAFILES=$(LWIPDIR)/apps/http/makefsdata/makefsdata.c 
+MAKEFSDATAFILES=$(LWIPDIR)/apps/http/makefsdata/makefsdata.c
 
 # LWIPERFFILES: IPERF server
-LWIPERFFILES=$(LWIPDIR)/apps/lwiperf/lwiperf.c 
+LWIPERFFILES=$(LWIPDIR)/apps/lwiperf/lwiperf.c
 
 # SMTPFILES: SMTP client
-SMTPFILES=$(LWIPDIR)/apps/smtp/smtp.c 
+SMTPFILES=$(LWIPDIR)/apps/smtp/smtp.c
 
 # SNTPFILES: SNTP client
-SNTPFILES=$(LWIPDIR)/apps/sntp/sntp.c 
+SNTPFILES=$(LWIPDIR)/apps/sntp/sntp.c
 
 # MDNSFILES: MDNS responder
-MDNSFILES=$(LWIPDIR)/apps/mdns/mdns.c 
+MDNSFILES=$(LWIPDIR)/apps/mdns/mdns.c
 
 # NETBIOSNSFILES: NetBIOS name server
-NETBIOSNSFILES=$(LWIPDIR)/apps/netbiosns/netbiosns.c 
+NETBIOSNSFILES=$(LWIPDIR)/apps/netbiosns/netbiosns.c
 
 # TFTPFILES: TFTP server files
-TFTPFILES=$(LWIPDIR)/apps/tftp/tftp_server.c 
+TFTPFILES=$(LWIPDIR)/apps/tftp/tftp_server.c
 
 # MQTTFILES: MQTT client files
-MQTTFILES=$(LWIPDIR)/apps/mqtt/mqtt.c 
+MQTTFILES=$(LWIPDIR)/apps/mqtt/mqtt.c
 
 # MBEDTLS_FILES: MBEDTLS related files of lwIP rep
-MBEDTLS_FILES=$(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls.c $(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls_mem.c $(LWIPDIR)/apps/snmp/snmpv3_mbedtls.c 
+MBEDTLS_FILES=$(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls.c \
+	$(LWIPDIR)/apps/altcp_tls/altcp_tls_mbedtls_mem.c \
+	$(LWIPDIR)/apps/snmp/snmpv3_mbedtls.c
 
 # LWIPAPPFILES: All LWIP APPs
 LWIPAPPFILES=$(SNMPFILES) \