diff --git a/CHANGELOG b/CHANGELOG
index 8736ecc5..3545252d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -100,6 +100,10 @@ HISTORY
 
  ++ Bugfixes:
 
+  2014-05-19: Simon Goldschmidt
+  * *.h: Fixed bug #35874 reserved identifier violation (removed leading underscores
+    from header include guards)
+
   2014-04-08: Simon Goldschmidt
   * tcp.c: Fixed bug #36167 tcp server crash when client closes (maximum window)
 
diff --git a/src/include/ipv4/lwip/autoip.h b/src/include/ipv4/lwip/autoip.h
index b9f18733..03023131 100644
--- a/src/include/ipv4/lwip/autoip.h
+++ b/src/include/ipv4/lwip/autoip.h
@@ -41,8 +41,8 @@
  * <kontakt@dspies.de>
  */
  
-#ifndef __LWIP_AUTOIP_H__
-#define __LWIP_AUTOIP_H__
+#ifndef LWIP_HDR_AUTOIP_H__
+#define LWIP_HDR_AUTOIP_H__
 
 #include "lwip/opt.h"
 
@@ -118,4 +118,4 @@ void autoip_network_changed(struct netif *netif);
 
 #endif /* LWIP_AUTOIP */
 
-#endif /* __LWIP_AUTOIP_H__ */
+#endif /* LWIP_HDR_AUTOIP_H__ */
diff --git a/src/include/ipv4/lwip/icmp.h b/src/include/ipv4/lwip/icmp.h
index fa893b6b..0ee1e929 100644
--- a/src/include/ipv4/lwip/icmp.h
+++ b/src/include/ipv4/lwip/icmp.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_ICMP_H__
-#define __LWIP_ICMP_H__
+#ifndef LWIP_HDR_ICMP_H__
+#define LWIP_HDR_ICMP_H__
 
 #include "lwip/opt.h"
 #include "lwip/pbuf.h"
@@ -122,4 +122,4 @@ void icmp_time_exceeded(struct pbuf *p, enum icmp_te_type t);
 }
 #endif
 
-#endif /* __LWIP_ICMP_H__ */
+#endif /* LWIP_HDR_ICMP_H__ */
diff --git a/src/include/ipv4/lwip/igmp.h b/src/include/ipv4/lwip/igmp.h
index 8aabac24..2365e10a 100644
--- a/src/include/ipv4/lwip/igmp.h
+++ b/src/include/ipv4/lwip/igmp.h
@@ -32,8 +32,8 @@
  * source code.
 */
 
-#ifndef __LWIP_IGMP_H__
-#define __LWIP_IGMP_H__
+#ifndef LWIP_HDR_IGMP_H__
+#define LWIP_HDR_IGMP_H__
 
 #include "lwip/opt.h"
 #include "lwip/ip_addr.h"
@@ -103,4 +103,4 @@ void   igmp_tmr(void);
 
 #endif /* LWIP_IGMP */
 
-#endif /* __LWIP_IGMP_H__ */
+#endif /* LWIP_HDR_IGMP_H__ */
diff --git a/src/include/ipv4/lwip/inet.h b/src/include/ipv4/lwip/inet.h
index a6d2eda4..af73ff7b 100644
--- a/src/include/ipv4/lwip/inet.h
+++ b/src/include/ipv4/lwip/inet.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_INET_H__
-#define __LWIP_INET_H__
+#ifndef LWIP_HDR_INET_H__
+#define LWIP_HDR_INET_H__
 
 #include "lwip/opt.h"
 #include "lwip/def.h"
@@ -118,4 +118,4 @@ struct in_addr {
 }
 #endif
 
-#endif /* __LWIP_INET_H__ */
+#endif /* LWIP_HDR_INET_H__ */
diff --git a/src/include/ipv4/lwip/ip4.h b/src/include/ipv4/lwip/ip4.h
index e1728357..a1f7194c 100644
--- a/src/include/ipv4/lwip/ip4.h
+++ b/src/include/ipv4/lwip/ip4.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_IP4_H__
-#define __LWIP_IP4_H__
+#ifndef LWIP_HDR_IP4_H__
+#define LWIP_HDR_IP4_H__
 
 #include "lwip/opt.h"
 
@@ -145,6 +145,6 @@ void ip_debug_print(struct pbuf *p);
 }
 #endif
 
-#endif /* __LWIP_IP_H__ */
+#endif /* LWIP_HDR_IP_H__ */
 
 
diff --git a/src/include/ipv4/lwip/ip4_addr.h b/src/include/ipv4/lwip/ip4_addr.h
index af76856c..8df648c0 100644
--- a/src/include/ipv4/lwip/ip4_addr.h
+++ b/src/include/ipv4/lwip/ip4_addr.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_IP4_ADDR_H__
-#define __LWIP_IP4_ADDR_H__
+#ifndef LWIP_HDR_IP4_ADDR_H__
+#define LWIP_HDR_IP4_ADDR_H__
 
 #include "lwip/opt.h"
 #include "lwip/def.h"
@@ -244,4 +244,4 @@ char *ipaddr_ntoa_r(const ip_addr_t *addr, char *buf, int buflen);
 }
 #endif
 
-#endif /* __LWIP_IP_ADDR_H__ */
+#endif /* LWIP_HDR_IP_ADDR_H__ */
diff --git a/src/include/ipv4/lwip/ip_frag.h b/src/include/ipv4/lwip/ip_frag.h
index 47eca9f4..452e4293 100644
--- a/src/include/ipv4/lwip/ip_frag.h
+++ b/src/include/ipv4/lwip/ip_frag.h
@@ -30,8 +30,8 @@
  *
  */
 
-#ifndef __LWIP_IP_FRAG_H__
-#define __LWIP_IP_FRAG_H__
+#ifndef LWIP_HDR_IP_FRAG_H__
+#define LWIP_HDR_IP_FRAG_H__
 
 #include "lwip/opt.h"
 #include "lwip/err.h"
@@ -70,15 +70,15 @@ struct pbuf * ip_reass(struct pbuf *p);
 /** A custom pbuf that holds a reference to another pbuf, which is freed
  * when this custom pbuf is freed. This is used to create a custom PBUF_REF
  * that points into the original pbuf. */
-#ifndef __LWIP_PBUF_CUSTOM_REF__
-#define __LWIP_PBUF_CUSTOM_REF__
+#ifndef LWIP_PBUF_CUSTOM_REF_DEFINED
+#define LWIP_PBUF_CUSTOM_REF_DEFINED
 struct pbuf_custom_ref {
   /** 'base class' */
   struct pbuf_custom pc;
   /** pointer to the original pbuf that is referenced */
   struct pbuf *original;
 };
-#endif /* __LWIP_PBUF_CUSTOM_REF__ */
+#endif /* LWIP_PBUF_CUSTOM_REF_DEFINED */
 #endif /* !IP_FRAG_USES_STATIC_BUF && !LWIP_NETIF_TX_SINGLE_PBUF */
 
 err_t ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest);
@@ -88,4 +88,4 @@ err_t ip_frag(struct pbuf *p, struct netif *netif, ip_addr_t *dest);
 }
 #endif
 
-#endif /* __LWIP_IP_FRAG_H__ */
+#endif /* LWIP_HDR_IP_FRAG_H__ */
diff --git a/src/include/ipv6/lwip/dhcp6.h b/src/include/ipv6/lwip/dhcp6.h
index 4b905c54..35590227 100644
--- a/src/include/ipv6/lwip/dhcp6.h
+++ b/src/include/ipv6/lwip/dhcp6.h
@@ -40,8 +40,8 @@
  * <delamer@inicotech.com>
  */
 
-#ifndef __LWIP_IP6_DHCP6_H__
-#define __LWIP_IP6_DHCP6_H__
+#ifndef LWIP_HDR_IP6_DHCP6_H__
+#define LWIP_HDR_IP6_DHCP6_H__
 
 #include "lwip/opt.h"
 
@@ -55,4 +55,4 @@ struct dhcp6
 
 #endif /* LWIP_IPV6_DHCP6 */
 
-#endif /* __LWIP_IP6_DHCP6_H__ */
+#endif /* LWIP_HDR_IP6_DHCP6_H__ */
diff --git a/src/include/ipv6/lwip/ethip6.h b/src/include/ipv6/lwip/ethip6.h
index e7f412b4..1bbe3e66 100644
--- a/src/include/ipv6/lwip/ethip6.h
+++ b/src/include/ipv6/lwip/ethip6.h
@@ -39,8 +39,8 @@
  * <delamer@inicotech.com>
  */
 
-#ifndef __LWIP_ETHIP6_H__
-#define __LWIP_ETHIP6_H__
+#ifndef LWIP_HDR_ETHIP6_H__
+#define LWIP_HDR_ETHIP6_H__
 
 #include "lwip/opt.h"
 
@@ -65,4 +65,4 @@ err_t ethip6_output(struct netif *netif, struct pbuf *q, ip6_addr_t *ip6addr);
 
 #endif /* LWIP_IPV6 && LWIP_ETHERNET */
 
-#endif /* __LWIP_ETHIP6_H__ */
+#endif /* LWIP_HDR_ETHIP6_H__ */
diff --git a/src/include/ipv6/lwip/icmp6.h b/src/include/ipv6/lwip/icmp6.h
index 74bfdbe0..d5f5e92f 100644
--- a/src/include/ipv6/lwip/icmp6.h
+++ b/src/include/ipv6/lwip/icmp6.h
@@ -38,8 +38,8 @@
  * Please coordinate changes and requests with Ivan Delamer
  * <delamer@inicotech.com>
  */
-#ifndef __LWIP_ICMP6_H__
-#define __LWIP_ICMP6_H__
+#ifndef LWIP_HDR_ICMP6_H__
+#define LWIP_HDR_ICMP6_H__
 
 #include "lwip/opt.h"
 #include "lwip/pbuf.h"
@@ -149,4 +149,4 @@ void icmp6_param_problem(struct pbuf *p, enum icmp6_pp_code c, u32_t pointer);
 #endif
 
 
-#endif /* __LWIP_ICMP6_H__ */
+#endif /* LWIP_HDR_ICMP6_H__ */
diff --git a/src/include/ipv6/lwip/inet6.h b/src/include/ipv6/lwip/inet6.h
index 8359521b..5a0fa801 100644
--- a/src/include/ipv6/lwip/inet6.h
+++ b/src/include/ipv6/lwip/inet6.h
@@ -38,8 +38,8 @@
  * Please coordinate changes and requests with Ivan Delamer
  * <delamer@inicotech.com>
  */
-#ifndef __LWIP_INET6_H__
-#define __LWIP_INET6_H__
+#ifndef LWIP_HDR_INET6_H__
+#define LWIP_HDR_INET6_H__
 
 #include "lwip/opt.h"
 
@@ -88,5 +88,5 @@ struct in6_addr {
 
 #endif /* LWIP_IPV6 */
 
-#endif /* __LWIP_INET6_H__ */
+#endif /* LWIP_HDR_INET6_H__ */
 
diff --git a/src/include/ipv6/lwip/ip6.h b/src/include/ipv6/lwip/ip6.h
index 5ab61c3c..43f65c6b 100644
--- a/src/include/ipv6/lwip/ip6.h
+++ b/src/include/ipv6/lwip/ip6.h
@@ -38,8 +38,8 @@
  * Please coordinate changes and requests with Ivan Delamer
  * <delamer@inicotech.com>
  */
-#ifndef __LWIP_IP6_H__
-#define __LWIP_IP6_H__
+#ifndef LWIP_HDR_IP6_H__
+#define LWIP_HDR_IP6_H__
 
 #include "lwip/opt.h"
 
@@ -195,4 +195,4 @@ void ip6_debug_print(struct pbuf *p);
 
 #endif /* LWIP_IPV6 */
 
-#endif /* __LWIP_IP6_H__ */
+#endif /* LWIP_HDR_IP6_H__ */
diff --git a/src/include/ipv6/lwip/ip6_addr.h b/src/include/ipv6/lwip/ip6_addr.h
index 4e5f4a25..3911c133 100644
--- a/src/include/ipv6/lwip/ip6_addr.h
+++ b/src/include/ipv6/lwip/ip6_addr.h
@@ -39,8 +39,8 @@
  * Please coordinate changes and requests with Ivan Delamer
  * <delamer@inicotech.com>
  */
-#ifndef __LWIP_IP6_ADDR_H__
-#define __LWIP_IP6_ADDR_H__
+#ifndef LWIP_HDR_IP6_ADDR_H__
+#define LWIP_HDR_IP6_ADDR_H__
 
 #include "lwip/opt.h"
 
@@ -286,4 +286,4 @@ char *ip6addr_ntoa_r(const ip6_addr_t *addr, char *buf, int buflen);
 
 #endif /* LWIP_IPV6 */
 
-#endif /* __LWIP_IP6_ADDR_H__ */
+#endif /* LWIP_HDR_IP6_ADDR_H__ */
diff --git a/src/include/ipv6/lwip/ip6_frag.h b/src/include/ipv6/lwip/ip6_frag.h
index 75898b8f..af40af09 100644
--- a/src/include/ipv6/lwip/ip6_frag.h
+++ b/src/include/ipv6/lwip/ip6_frag.h
@@ -38,8 +38,8 @@
  * Please coordinate changes and requests with Ivan Delamer
  * <delamer@inicotech.com>
  */
-#ifndef __LWIP_IP6_FRAG_H__
-#define __LWIP_IP6_FRAG_H__
+#ifndef LWIP_HDR_IP6_FRAG_H__
+#define LWIP_HDR_IP6_FRAG_H__
 
 #include "lwip/opt.h"
 #include "lwip/pbuf.h"
@@ -80,15 +80,15 @@ struct pbuf * ip6_reass(struct pbuf *p);
 /** A custom pbuf that holds a reference to another pbuf, which is freed
  * when this custom pbuf is freed. This is used to create a custom PBUF_REF
  * that points into the original pbuf. */
-#ifndef __LWIP_PBUF_CUSTOM_REF__
-#define __LWIP_PBUF_CUSTOM_REF__
+#ifndef LWIP_PBUF_CUSTOM_REF_DEFINED
+#define LWIP_PBUF_CUSTOM_REF_DEFINED
 struct pbuf_custom_ref {
   /** 'base class' */
   struct pbuf_custom pc;
   /** pointer to the original pbuf that is referenced */
   struct pbuf *original;
 };
-#endif /* __LWIP_PBUF_CUSTOM_REF__ */
+#endif /* LWIP_PBUF_CUSTOM_REF_DEFINED */
 
 err_t ip6_frag(struct pbuf *p, struct netif *netif, ip6_addr_t *dest);
 
@@ -99,4 +99,4 @@ err_t ip6_frag(struct pbuf *p, struct netif *netif, ip6_addr_t *dest);
 }
 #endif
 
-#endif /* __LWIP_IP6_FRAG_H__ */
+#endif /* LWIP_HDR_IP6_FRAG_H__ */
diff --git a/src/include/ipv6/lwip/mld6.h b/src/include/ipv6/lwip/mld6.h
index abd86e55..55d44973 100644
--- a/src/include/ipv6/lwip/mld6.h
+++ b/src/include/ipv6/lwip/mld6.h
@@ -40,8 +40,8 @@
  * <delamer@inicotech.com>
  */
 
-#ifndef __LWIP_MLD6_H__
-#define __LWIP_MLD6_H__
+#ifndef LWIP_HDR_MLD6_H__
+#define LWIP_HDR_MLD6_H__
 
 #include "lwip/opt.h"
 
@@ -115,4 +115,4 @@ err_t  mld6_leavegroup(ip6_addr_t *srcaddr, ip6_addr_t *groupaddr);
 
 #endif /* LWIP_IPV6_MLD && LWIP_IPV6 */
 
-#endif /* __LWIP_MLD6_H__ */
+#endif /* LWIP_HDR_MLD6_H__ */
diff --git a/src/include/ipv6/lwip/nd6.h b/src/include/ipv6/lwip/nd6.h
index 193788fb..6efae5de 100644
--- a/src/include/ipv6/lwip/nd6.h
+++ b/src/include/ipv6/lwip/nd6.h
@@ -41,8 +41,8 @@
  * <delamer@inicotech.com>
  */
 
-#ifndef __LWIP_ND6_H__
-#define __LWIP_ND6_H__
+#ifndef LWIP_HDR_ND6_H__
+#define LWIP_HDR_ND6_H__
 
 #include "lwip/opt.h"
 
@@ -359,4 +359,4 @@ void nd6_reachability_hint(ip6_addr_t * ip6addr);
 
 #endif /* LWIP_IPV6 */
 
-#endif /* __LWIP_ND6_H__ */
+#endif /* LWIP_HDR_ND6_H__ */
diff --git a/src/include/lwip/api.h b/src/include/lwip/api.h
index 78bf0c52..8028133b 100644
--- a/src/include/lwip/api.h
+++ b/src/include/lwip/api.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_API_H__
-#define __LWIP_API_H__
+#ifndef LWIP_HDR_API_H__
+#define LWIP_HDR_API_H__
 
 #include "lwip/opt.h"
 
@@ -335,4 +335,4 @@ err_t   netconn_gethostbyname(const char *name, ip_addr_t *addr);
 
 #endif /* LWIP_NETCONN */
 
-#endif /* __LWIP_API_H__ */
+#endif /* LWIP_HDR_API_H__ */
diff --git a/src/include/lwip/api_msg.h b/src/include/lwip/api_msg.h
index f9a195ae..37a60055 100644
--- a/src/include/lwip/api_msg.h
+++ b/src/include/lwip/api_msg.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_API_MSG_H__
-#define __LWIP_API_MSG_H__
+#ifndef LWIP_HDR_API_MSG_H__
+#define LWIP_HDR_API_MSG_H__
 
 #include "lwip/opt.h"
 
@@ -184,4 +184,4 @@ void netconn_free(struct netconn *conn);
 
 #endif /* LWIP_NETCONN */
 
-#endif /* __LWIP_API_MSG_H__ */
+#endif /* LWIP_HDR_API_MSG_H__ */
diff --git a/src/include/lwip/arch.h b/src/include/lwip/arch.h
index 4d6df773..5c456f57 100644
--- a/src/include/lwip/arch.h
+++ b/src/include/lwip/arch.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_ARCH_H__
-#define __LWIP_ARCH_H__
+#ifndef LWIP_HDR_ARCH_H__
+#define LWIP_HDR_ARCH_H__
 
 #ifndef LITTLE_ENDIAN
 #define LITTLE_ENDIAN 1234
@@ -214,4 +214,4 @@ extern int errno;
 }
 #endif
 
-#endif /* __LWIP_ARCH_H__ */
+#endif /* LWIP_HDR_ARCH_H__ */
diff --git a/src/include/lwip/debug.h b/src/include/lwip/debug.h
index 0fe04139..777bd6b6 100644
--- a/src/include/lwip/debug.h
+++ b/src/include/lwip/debug.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_DEBUG_H__
-#define __LWIP_DEBUG_H__
+#ifndef LWIP_HDR_DEBUG_H__
+#define LWIP_HDR_DEBUG_H__
 
 #include "lwip/arch.h"
 #include "lwip/opt.h"
@@ -95,5 +95,5 @@
 #define LWIP_DEBUGF(debug, message) 
 #endif /* LWIP_DEBUG */
 
-#endif /* __LWIP_DEBUG_H__ */
+#endif /* LWIP_HDR_DEBUG_H__ */
 
diff --git a/src/include/lwip/def.h b/src/include/lwip/def.h
index 73a1b560..117acd62 100644
--- a/src/include/lwip/def.h
+++ b/src/include/lwip/def.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_DEF_H__
-#define __LWIP_DEF_H__
+#ifndef LWIP_HDR_DEF_H__
+#define LWIP_HDR_DEF_H__
 
 /* arch.h might define NULL already */
 #include "lwip/arch.h"
@@ -119,5 +119,5 @@ u32_t lwip_ntohl(u32_t x);
 }
 #endif
 
-#endif /* __LWIP_DEF_H__ */
+#endif /* LWIP_HDR_DEF_H__ */
 
diff --git a/src/include/lwip/dhcp.h b/src/include/lwip/dhcp.h
index 32d93381..e8ce859a 100644
--- a/src/include/lwip/dhcp.h
+++ b/src/include/lwip/dhcp.h
@@ -1,8 +1,8 @@
 /** @file
  */
 
-#ifndef __LWIP_DHCP_H__
-#define __LWIP_DHCP_H__
+#ifndef LWIP_HDR_DHCP_H__
+#define LWIP_HDR_DHCP_H__
 
 #include "lwip/opt.h"
 
@@ -239,4 +239,4 @@ void dhcp_fine_tmr(void);
 
 #endif /* LWIP_DHCP */
 
-#endif /*__LWIP_DHCP_H__*/
+#endif /*LWIP_HDR_DHCP_H__*/
diff --git a/src/include/lwip/dns.h b/src/include/lwip/dns.h
index 6c7d9b07..f5770428 100644
--- a/src/include/lwip/dns.h
+++ b/src/include/lwip/dns.h
@@ -31,8 +31,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef __LWIP_DNS_H__
-#define __LWIP_DNS_H__
+#ifndef LWIP_HDR_DNS_H__
+#define LWIP_HDR_DNS_H__
 
 #include "lwip/opt.h"
 
@@ -121,4 +121,4 @@ err_t          dns_local_addhost(const char *hostname, const ip_addr_t *addr);
 
 #endif /* LWIP_DNS */
 
-#endif /* __LWIP_DNS_H__ */
+#endif /* LWIP_HDR_DNS_H__ */
diff --git a/src/include/lwip/err.h b/src/include/lwip/err.h
index ac907729..3f88bb3d 100644
--- a/src/include/lwip/err.h
+++ b/src/include/lwip/err.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_ERR_H__
-#define __LWIP_ERR_H__
+#ifndef LWIP_HDR_ERR_H__
+#define LWIP_HDR_ERR_H__
 
 #include "lwip/opt.h"
 #include "lwip/arch.h"
@@ -82,4 +82,4 @@ extern const char *lwip_strerr(err_t err);
 }
 #endif
 
-#endif /* __LWIP_ERR_H__ */
+#endif /* LWIP_HDR_ERR_H__ */
diff --git a/src/include/lwip/inet_chksum.h b/src/include/lwip/inet_chksum.h
index e1687888..0a7e04bc 100644
--- a/src/include/lwip/inet_chksum.h
+++ b/src/include/lwip/inet_chksum.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_INET_CHKSUM_H__
-#define __LWIP_INET_CHKSUM_H__
+#ifndef LWIP_HDR_INET_CHKSUM_H__
+#define LWIP_HDR_INET_CHKSUM_H__
 
 #include "lwip/opt.h"
 
@@ -108,5 +108,5 @@ u16_t ip6_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
 }
 #endif
 
-#endif /* __LWIP_INET_H__ */
+#endif /* LWIP_HDR_INET_H__ */
 
diff --git a/src/include/lwip/init.h b/src/include/lwip/init.h
index 4e2e2856..3817dc07 100644
--- a/src/include/lwip/init.h
+++ b/src/include/lwip/init.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_INIT_H__
-#define __LWIP_INIT_H__
+#ifndef LWIP_HDR_INIT_H__
+#define LWIP_HDR_INIT_H__
 
 #include "lwip/opt.h"
 
@@ -69,4 +69,4 @@ void lwip_init(void);
 }
 #endif
 
-#endif /* __LWIP_INIT_H__ */
+#endif /* LWIP_HDR_INIT_H__ */
diff --git a/src/include/lwip/ip.h b/src/include/lwip/ip.h
index 5d34e9bc..fdd9eb02 100644
--- a/src/include/lwip/ip.h
+++ b/src/include/lwip/ip.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_IP_H__
-#define __LWIP_IP_H__
+#ifndef LWIP_HDR_IP_H__
+#define LWIP_HDR_IP_H__
 
 #include "lwip/opt.h"
 
@@ -255,6 +255,6 @@ extern struct ip_globals ip_data;
 }
 #endif
 
-#endif /* __LWIP_IP_H__ */
+#endif /* LWIP_HDR_IP_H__ */
 
 
diff --git a/src/include/lwip/ip_addr.h b/src/include/lwip/ip_addr.h
index 7bd03cbd..1ded93f1 100644
--- a/src/include/lwip/ip_addr.h
+++ b/src/include/lwip/ip_addr.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_IP_ADDR_H__
-#define __LWIP_IP_ADDR_H__
+#ifndef LWIP_HDR_IP_ADDR_H__
+#define LWIP_HDR_IP_ADDR_H__
 
 #include "lwip/opt.h"
 #include "lwip/def.h"
@@ -127,4 +127,4 @@ typedef ip_addr_t ipX_addr_t;
 }
 #endif
 
-#endif /* __LWIP_IP_ADDR_H__ */
+#endif /* LWIP_HDR_IP_ADDR_H__ */
diff --git a/src/include/lwip/mem.h b/src/include/lwip/mem.h
index 5bb906b6..f016d04d 100644
--- a/src/include/lwip/mem.h
+++ b/src/include/lwip/mem.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_MEM_H__
-#define __LWIP_MEM_H__
+#ifndef LWIP_HDR_MEM_H__
+#define LWIP_HDR_MEM_H__
 
 #include "lwip/opt.h"
 
@@ -120,4 +120,4 @@ void  mem_free(void *mem);
 }
 #endif
 
-#endif /* __LWIP_MEM_H__ */
+#endif /* LWIP_HDR_MEM_H__ */
diff --git a/src/include/lwip/memp.h b/src/include/lwip/memp.h
index f0d07399..fc3c5e5a 100644
--- a/src/include/lwip/memp.h
+++ b/src/include/lwip/memp.h
@@ -30,8 +30,8 @@
  *
  */
 
-#ifndef __LWIP_MEMP_H__
-#define __LWIP_MEMP_H__
+#ifndef LWIP_HDR_MEMP_H__
+#define LWIP_HDR_MEMP_H__
 
 #include "lwip/opt.h"
 
@@ -113,4 +113,4 @@ void  memp_free(memp_t type, void *mem);
 }
 #endif
 
-#endif /* __LWIP_MEMP_H__ */
+#endif /* LWIP_HDR_MEMP_H__ */
diff --git a/src/include/lwip/netbuf.h b/src/include/lwip/netbuf.h
index d12fe270..f203cba3 100644
--- a/src/include/lwip/netbuf.h
+++ b/src/include/lwip/netbuf.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_NETBUF_H__
-#define __LWIP_NETBUF_H__
+#ifndef LWIP_HDR_NETBUF_H__
+#define LWIP_HDR_NETBUF_H__
 
 #include "lwip/opt.h"
 #include "lwip/pbuf.h"
@@ -109,4 +109,4 @@ void              netbuf_first    (struct netbuf *buf);
 }
 #endif
 
-#endif /* __LWIP_NETBUF_H__ */
+#endif /* LWIP_HDR_NETBUF_H__ */
diff --git a/src/include/lwip/netdb.h b/src/include/lwip/netdb.h
index 7587e2f2..59312688 100644
--- a/src/include/lwip/netdb.h
+++ b/src/include/lwip/netdb.h
@@ -26,8 +26,8 @@
  * Author: Simon Goldschmidt
  *
  */
-#ifndef __LWIP_NETDB_H__
-#define __LWIP_NETDB_H__
+#ifndef LWIP_HDR_NETDB_H__
+#define LWIP_HDR_NETDB_H__
 
 #include "lwip/opt.h"
 
@@ -121,4 +121,4 @@ int lwip_getaddrinfo(const char *nodename,
 
 #endif /* LWIP_DNS && LWIP_SOCKET */
 
-#endif /* __LWIP_NETDB_H__ */
+#endif /* LWIP_HDR_NETDB_H__ */
diff --git a/src/include/lwip/netif.h b/src/include/lwip/netif.h
index 426e8141..0ace60c4 100644
--- a/src/include/lwip/netif.h
+++ b/src/include/lwip/netif.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_NETIF_H__
-#define __LWIP_NETIF_H__
+#ifndef LWIP_HDR_NETIF_H__
+#define LWIP_HDR_NETIF_H__
 
 #include "lwip/opt.h"
 
@@ -384,4 +384,4 @@ void netif_create_ip6_linklocal_address(struct netif * netif, u8_t from_mac_48bi
 }
 #endif
 
-#endif /* __LWIP_NETIF_H__ */
+#endif /* LWIP_HDR_NETIF_H__ */
diff --git a/src/include/lwip/netifapi.h b/src/include/lwip/netifapi.h
index 37a6743f..d6a86464 100644
--- a/src/include/lwip/netifapi.h
+++ b/src/include/lwip/netifapi.h
@@ -25,8 +25,8 @@
  * 
  */
  
-#ifndef __LWIP_NETIFAPI_H__
-#define __LWIP_NETIFAPI_H__
+#ifndef LWIP_HDR_NETIFAPI_H__
+#define LWIP_HDR_NETIFAPI_H__
 
 #include "lwip/opt.h"
 
@@ -114,4 +114,4 @@ err_t netifapi_netif_common    ( struct netif *netif,
 
 #endif /* LWIP_NETIF_API */
 
-#endif /* __LWIP_NETIFAPI_H__ */
+#endif /* LWIP_HDR_NETIFAPI_H__ */
diff --git a/src/include/lwip/opt.h b/src/include/lwip/opt.h
index 11080be5..391c3663 100644
--- a/src/include/lwip/opt.h
+++ b/src/include/lwip/opt.h
@@ -35,8 +35,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_OPT_H__
-#define __LWIP_OPT_H__
+#ifndef LWIP_HDR_OPT_H__
+#define LWIP_HDR_OPT_H__
 
 /*
  * Include user defined options first. Anything not defined in these files
@@ -2539,4 +2539,4 @@
 #define IP6_DEBUG                       LWIP_DBG_OFF
 #endif
 
-#endif /* __LWIP_OPT_H__ */
+#endif /* LWIP_HDR_OPT_H__ */
diff --git a/src/include/lwip/pbuf.h b/src/include/lwip/pbuf.h
index 5b3833a5..624dccde 100644
--- a/src/include/lwip/pbuf.h
+++ b/src/include/lwip/pbuf.h
@@ -30,8 +30,8 @@
  *
  */
 
-#ifndef __LWIP_PBUF_H__
-#define __LWIP_PBUF_H__
+#ifndef LWIP_HDR_PBUF_H__
+#define LWIP_HDR_PBUF_H__
 
 #include "lwip/opt.h"
 #include "lwip/err.h"
@@ -185,4 +185,4 @@ u16_t pbuf_strstr(struct pbuf* p, const char* substr);
 }
 #endif
 
-#endif /* __LWIP_PBUF_H__ */
+#endif /* LWIP_HDR_PBUF_H__ */
diff --git a/src/include/lwip/raw.h b/src/include/lwip/raw.h
index 9fa8c315..07361c1b 100644
--- a/src/include/lwip/raw.h
+++ b/src/include/lwip/raw.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_RAW_H__
-#define __LWIP_RAW_H__
+#ifndef LWIP_HDR_RAW_H__
+#define LWIP_HDR_RAW_H__
 
 #include "lwip/opt.h"
 
@@ -133,4 +133,4 @@ u8_t             raw_input      (struct pbuf *p, struct netif *inp);
 
 #endif /* LWIP_RAW */
 
-#endif /* __LWIP_RAW_H__ */
+#endif /* LWIP_HDR_RAW_H__ */
diff --git a/src/include/lwip/sio.h b/src/include/lwip/sio.h
index 28ae2f22..8d8fe77f 100644
--- a/src/include/lwip/sio.h
+++ b/src/include/lwip/sio.h
@@ -32,8 +32,8 @@
  * It needs to be implemented by those platforms which need SLIP or PPP
  */
 
-#ifndef __SIO_H__
-#define __SIO_H__
+#ifndef SIO_H__
+#define SIO_H__
 
 #include "lwip/arch.h"
 
@@ -138,4 +138,4 @@ void sio_read_abort(sio_fd_t fd);
 }
 #endif
 
-#endif /* __SIO_H__ */
+#endif /* SIO_H__ */
diff --git a/src/include/lwip/snmp.h b/src/include/lwip/snmp.h
index a592e6cb..3f40c44c 100644
--- a/src/include/lwip/snmp.h
+++ b/src/include/lwip/snmp.h
@@ -30,8 +30,8 @@
  * Author: Leon Woestenberg <leon.woestenberg@axon.tv>
  *
  */
-#ifndef __LWIP_SNMP_H__
-#define __LWIP_SNMP_H__
+#ifndef LWIP_HDR_SNMP_H__
+#define LWIP_HDR_SNMP_H__
 
 #include "lwip/opt.h"
 
@@ -364,4 +364,4 @@ void snmp_get_snmpenableauthentraps(u8_t *value);
 }
 #endif
 
-#endif /* __LWIP_SNMP_H__ */
+#endif /* LWIP_HDR_SNMP_H__ */
diff --git a/src/include/lwip/snmp_asn1.h b/src/include/lwip/snmp_asn1.h
index 605fa3f1..e676cd5b 100644
--- a/src/include/lwip/snmp_asn1.h
+++ b/src/include/lwip/snmp_asn1.h
@@ -32,8 +32,8 @@
  * Author: Christiaan Simons <christiaan.simons@axon.tv>
  */
 
-#ifndef __LWIP_SNMP_ASN1_H__
-#define __LWIP_SNMP_ASN1_H__
+#ifndef LWIP_HDR_SNMP_ASN1_H__
+#define LWIP_HDR_SNMP_ASN1_H__
 
 #include "lwip/opt.h"
 #include "lwip/err.h"
@@ -98,4 +98,4 @@ err_t snmp_asn1_enc_raw(struct pbuf *p, u16_t ofs, u16_t raw_len, u8_t *raw);
 
 #endif /* LWIP_SNMP */
 
-#endif /* __LWIP_SNMP_ASN1_H__ */
+#endif /* LWIP_HDR_SNMP_ASN1_H__ */
diff --git a/src/include/lwip/snmp_msg.h b/src/include/lwip/snmp_msg.h
index 1183e3a9..2f8ec32d 100644
--- a/src/include/lwip/snmp_msg.h
+++ b/src/include/lwip/snmp_msg.h
@@ -32,8 +32,8 @@
  * Author: Christiaan Simons <christiaan.simons@axon.tv>
  */
 
-#ifndef __LWIP_SNMP_MSG_H__
-#define __LWIP_SNMP_MSG_H__
+#ifndef LWIP_HDR_SNMP_MSG_H__
+#define LWIP_HDR_SNMP_MSG_H__
 
 #include "lwip/opt.h"
 #include "lwip/snmp.h"
@@ -312,4 +312,4 @@ void snmp_authfail_trap(void);
 
 #endif /* LWIP_SNMP */
 
-#endif /* __LWIP_SNMP_MSG_H__ */
+#endif /* LWIP_HDR_SNMP_MSG_H__ */
diff --git a/src/include/lwip/snmp_structs.h b/src/include/lwip/snmp_structs.h
index 0d3b46a9..25bba731 100644
--- a/src/include/lwip/snmp_structs.h
+++ b/src/include/lwip/snmp_structs.h
@@ -34,8 +34,8 @@
  * Author: Christiaan Simons <christiaan.simons@axon.tv>
  */
 
-#ifndef __LWIP_SNMP_STRUCTS_H__
-#define __LWIP_SNMP_STRUCTS_H__
+#ifndef LWIP_HDR_SNMP_STRUCTS_H__
+#define LWIP_HDR_SNMP_STRUCTS_H__
 
 #include "lwip/opt.h"
 
@@ -265,4 +265,4 @@ u8_t snmp_iso_prefix_expand(u8_t ident_len, s32_t *ident, struct snmp_obj_id *oi
 
 #endif /* LWIP_SNMP */
 
-#endif /* __LWIP_SNMP_STRUCTS_H__ */
+#endif /* LWIP_HDR_SNMP_STRUCTS_H__ */
diff --git a/src/include/lwip/sockets.h b/src/include/lwip/sockets.h
index 8bbebb84..01c63d32 100644
--- a/src/include/lwip/sockets.h
+++ b/src/include/lwip/sockets.h
@@ -31,8 +31,8 @@
  */
 
 
-#ifndef __LWIP_SOCKETS_H__
-#define __LWIP_SOCKETS_H__
+#ifndef LWIP_HDR_SOCKETS_H__
+#define LWIP_HDR_SOCKETS_H__
 
 #include "lwip/opt.h"
 
@@ -472,4 +472,4 @@ int lwip_fcntl(int s, int cmd, int val);
 
 #endif /* LWIP_SOCKET */
 
-#endif /* __LWIP_SOCKETS_H__ */
+#endif /* LWIP_HDR_SOCKETS_H__ */
diff --git a/src/include/lwip/stats.h b/src/include/lwip/stats.h
index d9112160..7f82fb88 100644
--- a/src/include/lwip/stats.h
+++ b/src/include/lwip/stats.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_STATS_H__
-#define __LWIP_STATS_H__
+#ifndef LWIP_HDR_STATS_H__
+#define LWIP_HDR_STATS_H__
 
 #include "lwip/opt.h"
 
@@ -344,4 +344,4 @@ void stats_display_sys(struct stats_sys *sys);
 }
 #endif
 
-#endif /* __LWIP_STATS_H__ */
+#endif /* LWIP_HDR_STATS_H__ */
diff --git a/src/include/lwip/sys.h b/src/include/lwip/sys.h
index fd45ee8a..3e1b070b 100644
--- a/src/include/lwip/sys.h
+++ b/src/include/lwip/sys.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_SYS_H__
-#define __LWIP_SYS_H__
+#ifndef LWIP_HDR_SYS_H__
+#define LWIP_HDR_SYS_H__
 
 #include "lwip/opt.h"
 
@@ -333,4 +333,4 @@ void sys_arch_unprotect(sys_prot_t pval);
 }
 #endif
 
-#endif /* __LWIP_SYS_H__ */
+#endif /* LWIP_HDR_SYS_H__ */
diff --git a/src/include/lwip/tcp.h b/src/include/lwip/tcp.h
index c2c0f111..748490b6 100644
--- a/src/include/lwip/tcp.h
+++ b/src/include/lwip/tcp.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_TCP_H__
-#define __LWIP_TCP_H__
+#ifndef LWIP_HDR_TCP_H__
+#define LWIP_HDR_TCP_H__
 
 #include "lwip/opt.h"
 
@@ -414,4 +414,4 @@ struct tcp_pcb * tcp_listen_dual_with_backlog(struct tcp_pcb *pcb, u8_t backlog)
 
 #endif /* LWIP_TCP */
 
-#endif /* __LWIP_TCP_H__ */
+#endif /* LWIP_HDR_TCP_H__ */
diff --git a/src/include/lwip/tcp_impl.h b/src/include/lwip/tcp_impl.h
index c8c4b648..9e7a97c4 100644
--- a/src/include/lwip/tcp_impl.h
+++ b/src/include/lwip/tcp_impl.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_TCP_IMPL_H__
-#define __LWIP_TCP_IMPL_H__
+#ifndef LWIP_HDR_TCP_IMPL_H__
+#define LWIP_HDR_TCP_IMPL_H__
 
 #include "lwip/opt.h"
 
@@ -527,4 +527,4 @@ void tcp_timer_needed(void);
 
 #endif /* LWIP_TCP */
 
-#endif /* __LWIP_TCP_H__ */
+#endif /* LWIP_HDR_TCP_H__ */
diff --git a/src/include/lwip/tcpip.h b/src/include/lwip/tcpip.h
index 5b71cf1b..03bda17a 100644
--- a/src/include/lwip/tcpip.h
+++ b/src/include/lwip/tcpip.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_TCPIP_H__
-#define __LWIP_TCPIP_H__
+#ifndef LWIP_HDR_TCPIP_H__
+#define LWIP_HDR_TCPIP_H__
 
 #include "lwip/opt.h"
 
@@ -205,4 +205,4 @@ struct tcpip_msg {
 
 #endif /* !NO_SYS */
 
-#endif /* __LWIP_TCPIP_H__ */
+#endif /* LWIP_HDR_TCPIP_H__ */
diff --git a/src/include/lwip/timers.h b/src/include/lwip/timers.h
index 04e78e0f..b46ed276 100644
--- a/src/include/lwip/timers.h
+++ b/src/include/lwip/timers.h
@@ -30,8 +30,8 @@
  *         Simon Goldschmidt
  *
  */
-#ifndef __LWIP_TIMERS_H__
-#define __LWIP_TIMERS_H__
+#ifndef LWIP_HDR_TIMERS_H__
+#define LWIP_HDR_TIMERS_H__
 
 #include "lwip/opt.h"
 
@@ -97,4 +97,4 @@ void sys_timeouts_mbox_fetch(sys_mbox_t *mbox, void **msg);
 #endif
 
 #endif /* LWIP_TIMERS */
-#endif /* __LWIP_TIMERS_H__ */
+#endif /* LWIP_HDR_TIMERS_H__ */
diff --git a/src/include/lwip/udp.h b/src/include/lwip/udp.h
index 93c72b79..8a5e5635 100644
--- a/src/include/lwip/udp.h
+++ b/src/include/lwip/udp.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __LWIP_UDP_H__
-#define __LWIP_UDP_H__
+#ifndef LWIP_HDR_UDP_H__
+#define LWIP_HDR_UDP_H__
 
 #include "lwip/opt.h"
 
@@ -218,4 +218,4 @@ void udp_debug_print(struct udp_hdr *udphdr);
 
 #endif /* LWIP_UDP */
 
-#endif /* __LWIP_UDP_H__ */
+#endif /* LWIP_HDR_UDP_H__ */
diff --git a/src/include/netif/etharp.h b/src/include/netif/etharp.h
index 2e4b9955..0d52e0ec 100644
--- a/src/include/netif/etharp.h
+++ b/src/include/netif/etharp.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef __NETIF_ETHARP_H__
-#define __NETIF_ETHARP_H__
+#ifndef LWIP_HDR_NETIF_ETHARP_H__
+#define LWIP_HDR_NETIF_ETHARP_H__
 
 #include "lwip/opt.h"
 
@@ -226,4 +226,4 @@ extern const struct eth_addr ethbroadcast, ethzero;
 }
 #endif
 
-#endif /* __NETIF_ARP_H__ */
+#endif /* LWIP_HDR_NETIF_ARP_H__ */
diff --git a/src/include/netif/slipif.h b/src/include/netif/slipif.h
index 7b6ce5e2..f739174d 100644
--- a/src/include/netif/slipif.h
+++ b/src/include/netif/slipif.h
@@ -31,8 +31,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef __NETIF_SLIPIF_H__
-#define __NETIF_SLIPIF_H__
+#ifndef LWIP_HDR_NETIF_SLIPIF_H__
+#define LWIP_HDR_NETIF_SLIPIF_H__
 
 #include "lwip/opt.h"
 #include "lwip/netif.h"
@@ -77,5 +77,5 @@ void slipif_received_bytes(struct netif *netif, u8_t *data, u8_t len);
 }
 #endif
  
-#endif 
+#endif /* LWIP_HDR_NETIF_SLIPIF_H__ */
 
diff --git a/test/unit/core/test_mem.h b/test/unit/core/test_mem.h
index 13803edc..a85bccb4 100644
--- a/test/unit/core/test_mem.h
+++ b/test/unit/core/test_mem.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_MEM_H__
-#define __TEST_MEM_H__
+#ifndef LWIP_HDR_TEST_MEM_H__
+#define LWIP_HDR_TEST_MEM_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/core/test_pbuf.h b/test/unit/core/test_pbuf.h
index b2715ade..82531570 100644
--- a/test/unit/core/test_pbuf.h
+++ b/test/unit/core/test_pbuf.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_PBUF_H__
-#define __TEST_PBUF_H__
+#ifndef LWIP_HDR_TEST_PBUF_H__
+#define LWIP_HDR_TEST_PBUF_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/dhcp/test_dhcp.h b/test/unit/dhcp/test_dhcp.h
index aff44b70..480aab9b 100644
--- a/test/unit/dhcp/test_dhcp.h
+++ b/test/unit/dhcp/test_dhcp.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_DHCP_H__
-#define __TEST_DHCP_H__
+#ifndef LWIP_HDR_TEST_DHCP_H__
+#define LWIP_HDR_TEST_DHCP_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/etharp/test_etharp.h b/test/unit/etharp/test_etharp.h
index 96e00c3b..fac7c9cf 100644
--- a/test/unit/etharp/test_etharp.h
+++ b/test/unit/etharp/test_etharp.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_ETHARP_H__
-#define __TEST_ETHARP_H__
+#ifndef LWIP_HDR_TEST_ETHARP_H__
+#define LWIP_HDR_TEST_ETHARP_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/lwip_check.h b/test/unit/lwip_check.h
index 09f8cfe9..82dc41f4 100644
--- a/test/unit/lwip_check.h
+++ b/test/unit/lwip_check.h
@@ -1,5 +1,5 @@
-#ifndef __LWIP_CHECK_H__
-#define __LWIP_CHECK_H__
+#ifndef LWIP_HDR_LWIP_CHECK_H__
+#define LWIP_HDR_LWIP_CHECK_H__
 
 /* Common header file for lwIP unit tests using the check framework */
 
@@ -44,4 +44,4 @@ static Suite* create_suite(const char* name, testfunc *tests, size_t num_tests,
   return s;
 }
 
-#endif /* __LWIP_CHECK_H__ */
+#endif /* LWIP_HDR_LWIP_CHECK_H__ */
diff --git a/test/unit/lwipopts.h b/test/unit/lwipopts.h
index 325856d4..fb5038b9 100644
--- a/test/unit/lwipopts.h
+++ b/test/unit/lwipopts.h
@@ -29,8 +29,8 @@
  * Author: Simon Goldschmidt
  *
  */
-#ifndef __LWIPOPTS_H__
-#define __LWIPOPTS_H__
+#ifndef LWIP_HDR_LWIPOPTS_H__
+#define LWIP_HDR_LWIPOPTS_H__
 
 /* Prevent having to link sys_arch.c (we don't test the API layers in unit tests) */
 #define NO_SYS                          1
@@ -53,4 +53,4 @@
 /* Minimal changes to opt.h required for etharp unit tests: */
 #define ETHARP_SUPPORT_STATIC_ENTRIES   1
 
-#endif /* __LWIPOPTS_H__ */
+#endif /* LWIP_HDR_LWIPOPTS_H__ */
diff --git a/test/unit/tcp/tcp_helper.h b/test/unit/tcp/tcp_helper.h
index 4a72c935..4119f37e 100644
--- a/test/unit/tcp/tcp_helper.h
+++ b/test/unit/tcp/tcp_helper.h
@@ -1,5 +1,5 @@
-#ifndef __TCP_HELPER_H__
-#define __TCP_HELPER_H__
+#ifndef LWIP_HDR_TCP_HELPER_H__
+#define LWIP_HDR_TCP_HELPER_H__
 
 #include "../lwip_check.h"
 #include "lwip/arch.h"
diff --git a/test/unit/tcp/test_tcp.h b/test/unit/tcp/test_tcp.h
index f1c4a463..ea739eba 100644
--- a/test/unit/tcp/test_tcp.h
+++ b/test/unit/tcp/test_tcp.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_TCP_H__
-#define __TEST_TCP_H__
+#ifndef LWIP_HDR_TEST_TCP_H__
+#define LWIP_HDR_TEST_TCP_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/tcp/test_tcp_oos.h b/test/unit/tcp/test_tcp_oos.h
index 5e411f00..1cb8650f 100644
--- a/test/unit/tcp/test_tcp_oos.h
+++ b/test/unit/tcp/test_tcp_oos.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_TCP_OOS_H__
-#define __TEST_TCP_OOS_H__
+#ifndef LWIP_HDR_TEST_TCP_OOS_H__
+#define LWIP_HDR_TEST_TCP_OOS_H__
 
 #include "../lwip_check.h"
 
diff --git a/test/unit/udp/test_udp.h b/test/unit/udp/test_udp.h
index 93353682..eb14354b 100644
--- a/test/unit/udp/test_udp.h
+++ b/test/unit/udp/test_udp.h
@@ -1,5 +1,5 @@
-#ifndef __TEST_UDP_H__
-#define __TEST_UDP_H__
+#ifndef LWIP_HDR_TEST_UDP_H__
+#define LWIP_HDR_TEST_UDP_H__
 
 #include "../lwip_check.h"