Minor changes (but in lot of files): add #if/#endif for options where they could miss. #if LWIP_xxx if always put after #include "lwip/opt.h" (note this one indirectly include cc.h). Move others includes inside #if/#endif block.

src/include/ipv6/lwip/icmp.h

@@ -32,15 +32,13 @@
 #ifndef __LWIP_ICMP_H__
 #define __LWIP_ICMP_H__
 
-#include "lwip/arch.h"
-
 #include "lwip/opt.h"
-#include "lwip/pbuf.h"
-
-#include "lwip/netif.h"
 
 #if LWIP_ICMP /* don't build if not configured for use in lwipopts.h */
 
+#include "lwip/pbuf.h"
+#include "lwip/netif.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/include/ipv6/lwip/inet.h

@@ -32,8 +32,6 @@
 #ifndef __LWIP_INET_H__
 #define __LWIP_INET_H__
 
-#include "lwip/arch.h"
-
 #include "lwip/opt.h"
 #include "lwip/pbuf.h"
 #include "lwip/ip_addr.h"

src/include/ipv6/lwip/ip_addr.h

@@ -32,7 +32,7 @@
 #ifndef __LWIP_IP_ADDR_H__
 #define __LWIP_IP_ADDR_H__
 
-#include "lwip/arch.h"
+#include "lwip/opt.h"
 
 #ifdef __cplusplus
 extern "C" {