diff --git a/include/netinet/icmp6.h b/include/netinet/icmp6.h
index 64219e778f1..eb85b6f86eb 100644
--- a/include/netinet/icmp6.h
+++ b/include/netinet/icmp6.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NETINET_ICMP6_H
-#define _INCLUDE_NETINET_ICMP6_H
+#ifndef __INCLUDE_NETINET_ICMP6_H
+#define __INCLUDE_NETINET_ICMP6_H
 
 /****************************************************************************
  * Included Files
@@ -361,4 +361,4 @@ struct nd_opt_home_agent_info
   uint16_t  nd_opt_home_agent_info_lifetime;
 };
 
-#endif /* netinet/icmpv6.h */
+#endif /* __INCLUDE_NETINET_ICMP6_H */
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
index b9c58eb7e2f..d1986f2fc33 100644
--- a/include/netinet/if_ether.h
+++ b/include/netinet/if_ether.h
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef _INCLUDE_NETINET_IF_ETHER_H
-#define _INCLUDE_NETINET_IF_ETHER_H
+#ifndef __INCLUDE_NETINET_IF_ETHER_H
+#define __INCLUDE_NETINET_IF_ETHER_H
 
 /****************************************************************************
  * Included Files
@@ -46,7 +46,7 @@
  * RFC 826.
  */
 
-struct  ether_arp
+struct ether_arp
 {
   struct  arphdr ea_hdr;          /* fixed-size header */
   uint8_t arp_sha[ETH_ALEN];      /* sender hardware address */
@@ -61,4 +61,4 @@ struct  ether_arp
 #define arp_pln ea_hdr.ar_pln
 #define arp_op  ea_hdr.ar_op
 
-#endif /* _INCLUDE_NETINET_IF_ETHER_H */
+#endif /* __INCLUDE_NETINET_IF_ETHER_H */