diff --git a/src/include/ipv4/lwip/icmp.h b/src/include/ipv4/lwip/icmp.h
index bb7ac7c2..16c16cff 100644
--- a/src/include/ipv4/lwip/icmp.h
+++ b/src/include/ipv4/lwip/icmp.h
@@ -70,7 +70,9 @@ void icmp_input(struct pbuf *p, struct netif *inp);
 void icmp_dest_unreach(struct pbuf *p, enum icmp_dur_type t);
 void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct icmp_echo_hdr {
   PACK_STRUCT_FIELD(u16_t _type_code);
@@ -79,9 +81,13 @@ struct icmp_echo_hdr {
   PACK_STRUCT_FIELD(u16_t seqno);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct icmp_dur_hdr {
   PACK_STRUCT_FIELD(u16_t _type_code);
@@ -89,9 +95,13 @@ struct icmp_dur_hdr {
   PACK_STRUCT_FIELD(u32_t unused);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct icmp_te_hdr {
   PACK_STRUCT_FIELD(u16_t _type_code);
@@ -99,7 +109,9 @@ struct icmp_te_hdr {
   PACK_STRUCT_FIELD(u32_t unused);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
 #define ICMPH_TYPE(hdr) (NTOHS((hdr)->_type_code) >> 8)
 #define ICMPH_CODE(hdr) (NTOHS((hdr)->_type_code) & 0xff)
diff --git a/src/include/ipv4/lwip/ip.h b/src/include/ipv4/lwip/ip.h
index 1337231d..5064ddf6 100644
--- a/src/include/ipv4/lwip/ip.h
+++ b/src/include/ipv4/lwip/ip.h
@@ -66,7 +66,9 @@ err_t ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
 #endif /* IP_HDRINCL */
 #define IP_HDRINCL  NULL
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct ip_hdr {
   /* version / header length / type of service */
@@ -90,7 +92,9 @@ struct ip_hdr {
   PACK_STRUCT_FIELD(struct ip_addr dest); 
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
 #define IPH_V(hdr)  (NTOHS((hdr)->_v_hl_tos) >> 12)
 #define IPH_HL(hdr) ((NTOHS((hdr)->_v_hl_tos) >> 8) & 0x0f)
diff --git a/src/include/ipv4/lwip/ip_addr.h b/src/include/ipv4/lwip/ip_addr.h
index 0c414d6c..0288f12b 100644
--- a/src/include/ipv4/lwip/ip_addr.h
+++ b/src/include/ipv4/lwip/ip_addr.h
@@ -38,13 +38,17 @@
 
 #define IP_ADDR_BROADCAST (&ip_addr_broadcast)
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct ip_addr {
   PACK_STRUCT_FIELD(u32_t addr);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
 extern struct ip_addr ip_addr_broadcast;
 
diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h
index c7a5ab82..5f2bc534 100644
--- a/src/include/lwip/tcp.h
+++ b/src/include/lwip/tcp.h
@@ -151,7 +151,9 @@ void             tcp_rexmit  (struct tcp_pcb *pcb);
 
 #define TCP_MSL 60000  /* The maximum segment lifetime in microseconds */
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct tcp_hdr {
   PACK_STRUCT_FIELD(u16_t src);
@@ -164,7 +166,9 @@ struct tcp_hdr {
   PACK_STRUCT_FIELD(u16_t urgp);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
 #define TCPH_OFFSET(hdr) (NTOHS((hdr)->_offset_flags) >> 8)
 #define TCPH_FLAGS(hdr) (NTOHS((hdr)->_offset_flags) & 0xff)
diff --git a/src/include/netif/etharp.h b/src/include/netif/etharp.h
index f6b14765..86eb9e7b 100644
--- a/src/include/netif/etharp.h
+++ b/src/include/netif/etharp.h
@@ -44,15 +44,21 @@
 #include "lwip/ip_addr.h"
 #include "lwip/netif.h"
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct eth_addr {
   PACK_STRUCT_FIELD(u8_t addr[6]);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
-#include "arch/bpstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/bpstruct.h"
+#endif
 PACK_STRUCT_BEGIN
 struct eth_hdr {
   PACK_STRUCT_FIELD(struct eth_addr dest);
@@ -60,7 +66,9 @@ struct eth_hdr {
   PACK_STRUCT_FIELD(u16_t type);
 } PACK_STRUCT_STRUCT;
 PACK_STRUCT_END
-#include "arch/epstruct.h"
+#ifdef PACK_STRUCT_USE_INCLUDES
+#  include "arch/epstruct.h"
+#endif
 
 #define ARP_TMR_INTERVAL 10000