diff --git a/apps/chargen/chargen.h b/apps/chargen/chargen.h
index 51ae256..bea97d0 100644
--- a/apps/chargen/chargen.h
+++ b/apps/chargen/chargen.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_CHARGEN_H__
-#define LWIP_CHARGEN_H__
+#ifndef LWIP_CHARGEN_H
+#define LWIP_CHARGEN_H
 
 #include "lwip/opt.h"
 
@@ -10,4 +10,4 @@ void chargen_init(void);
 #endif /* LWIP_SOCKET */
 
 
-#endif /* LWIP_CHARGEN_H__ */
+#endif /* LWIP_CHARGEN_H */
diff --git a/apps/httpserver/httpserver-netconn.h b/apps/httpserver/httpserver-netconn.h
index fcfdb7d..8c44a04 100644
--- a/apps/httpserver/httpserver-netconn.h
+++ b/apps/httpserver/httpserver-netconn.h
@@ -1,6 +1,6 @@
-#ifndef LWIP_HTTPSERVER_NETCONN_H__
-#define LWIP_HTTPSERVER_NETCONN_H__
+#ifndef LWIP_HTTPSERVER_NETCONN_H
+#define LWIP_HTTPSERVER_NETCONN_H
 
 void http_server_netconn_init();
 
-#endif /* LWIP_HTTPSERVER_NETCONN_H__ */
+#endif /* LWIP_HTTPSERVER_NETCONN_H */
diff --git a/apps/httpserver_raw/fs.h b/apps/httpserver_raw/fs.h
index a8933b5..ac3b249 100644
--- a/apps/httpserver_raw/fs.h
+++ b/apps/httpserver_raw/fs.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_FS_H__
-#define LWIP_FS_H__
+#ifndef LWIP_FS_H
+#define LWIP_FS_H
 
 #include "lwip/opt.h"
 #include "lwip/err.h"
@@ -129,4 +129,4 @@ void *fs_state_init(struct fs_file *file, const char *name);
 void fs_state_free(struct fs_file *file, void *state);
 #endif /* #if LWIP_HTTPD_FILE_STATE */
 
-#endif /* LWIP_FS_H__ */
+#endif /* LWIP_FS_H */
diff --git a/apps/httpserver_raw/fsdata.h b/apps/httpserver_raw/fsdata.h
index a6f804b..818458a 100644
--- a/apps/httpserver_raw/fsdata.h
+++ b/apps/httpserver_raw/fsdata.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_FSDATA_H__
-#define LWIP_FSDATA_H__
+#ifndef LWIP_FSDATA_H
+#define LWIP_FSDATA_H
 
 #include "lwip/opt.h"
 #include "fs.h"
@@ -47,4 +47,4 @@ struct fsdata_file {
 #endif /* HTTPD_PRECALCULATED_CHECKSUM */
 };
 
-#endif /* LWIP_FSDATA_H__ */
+#endif /* LWIP_FSDATA_H */
diff --git a/apps/httpserver_raw/httpd.h b/apps/httpserver_raw/httpd.h
index 241f5a2..be7e3a3 100644
--- a/apps/httpserver_raw/httpd.h
+++ b/apps/httpserver_raw/httpd.h
@@ -33,8 +33,8 @@
  * capability.
  */
 
-#ifndef LWIP_HTTPD_H__
-#define LWIP_HTTPD_H__
+#ifndef LWIP_HTTPD_H
+#define LWIP_HTTPD_H
 
 #include "lwip/opt.h"
 #include "lwip/err.h"
@@ -233,4 +233,4 @@ void httpd_post_data_recved(void *connection, u16_t recved_len);
 
 void httpd_init(void);
 
-#endif /* LWIP_HTTPD_H__ */
+#endif /* LWIP_HTTPD_H */
diff --git a/apps/netbios/netbios.h b/apps/netbios/netbios.h
index 354cb6e..878cd03 100644
--- a/apps/netbios/netbios.h
+++ b/apps/netbios/netbios.h
@@ -1,6 +1,6 @@
-#ifndef LWIP_NETBIOS_H__
-#define LWIP_NETBIOS_H__
+#ifndef LWIP_NETBIOS_H
+#define LWIP_NETBIOS_H
 
 void netbios_init(void);
 
-#endif /* LWIP_NETBIOS_H__ */
+#endif /* LWIP_NETBIOS_H */
diff --git a/apps/netio/netio.h b/apps/netio/netio.h
index 60ff8f3..11d7730 100644
--- a/apps/netio/netio.h
+++ b/apps/netio/netio.h
@@ -1,6 +1,6 @@
-#ifndef LWIP_NETIO_H__
-#define LWIP_NETIO_H__
+#ifndef LWIP_NETIO_H
+#define LWIP_NETIO_H
 
 void netio_init(void);
 
-#endif /* LWIP_NETIO_H__ */
+#endif /* LWIP_NETIO_H */
diff --git a/apps/ping/ping.h b/apps/ping/ping.h
index d74e201..f657f8e 100644
--- a/apps/ping/ping.h
+++ b/apps/ping/ping.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_PING_H__
-#define LWIP_PING_H__
+#ifndef LWIP_PING_H
+#define LWIP_PING_H
 
 /**
  * PING_USE_SOCKETS: Set to 1 to use sockets, otherwise the raw api is used
@@ -15,4 +15,4 @@ void ping_init(void);
 void ping_send_now(void);
 #endif /* !PING_USE_SOCKETS */
 
-#endif /* LWIP_PING_H__ */
+#endif /* LWIP_PING_H */
diff --git a/apps/rtp/rtp.h b/apps/rtp/rtp.h
index f061566..c53d89b 100644
--- a/apps/rtp/rtp.h
+++ b/apps/rtp/rtp.h
@@ -1,8 +1,8 @@
-#ifndef LWIP_RTP_H__
-#define LWIP_RTP_H__
+#ifndef LWIP_RTP_H
+#define LWIP_RTP_H
 
 #if LWIP_SOCKET && LWIP_IGMP
 void rtp_init(void);
 #endif /* LWIP_SOCKET && LWIP_IGMP */
 
-#endif /* LWIP_RTP_H__ */
+#endif /* LWIP_RTP_H */
diff --git a/apps/shell/shell.h b/apps/shell/shell.h
index 60e7f29..118cd2c 100644
--- a/apps/shell/shell.h
+++ b/apps/shell/shell.h
@@ -29,9 +29,9 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_SHELL_H__
-#define LWIP_SHELL_H__
+#ifndef LWIP_SHELL_H
+#define LWIP_SHELL_H
 
 void shell_init(void);
 
-#endif /* LWIP_SHELL_H__ */
+#endif /* LWIP_SHELL_H */
diff --git a/apps/smtp/smtp.h b/apps/smtp/smtp.h
index 38269bb..56d80ec 100644
--- a/apps/smtp/smtp.h
+++ b/apps/smtp/smtp.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_SMTP_H__
-#define LWIP_SMTP_H__
+#ifndef LWIP_SMTP_H
+#define LWIP_SMTP_H
 
 #include "lwip/err.h"
 
@@ -64,4 +64,4 @@ void smtp_send_mail_int(void *arg);
 const char* smtp_result_str(u8_t smtp_result);
 #endif
 
-#endif /* LWIP_SMTP_H__ */
+#endif /* LWIP_SMTP_H */
diff --git a/apps/snmp_private_mib/private_mib.h b/apps/snmp_private_mib/private_mib.h
index c079882..6e0db9f 100644
--- a/apps/snmp_private_mib/private_mib.h
+++ b/apps/snmp_private_mib/private_mib.h
@@ -3,8 +3,8 @@
  * Exports Private lwIP MIB 
  */
 
-#ifndef LWIP_HDR_PRIVATE_MIB_H__
-#define LWIP_HDR_PRIVATE_MIB_H__
+#ifndef LWIP_HDR_PRIVATE_MIB_H
+#define LWIP_HDR_PRIVATE_MIB_H
 
 #include "arch/cc.h"
 #include "lwip/opt.h"
diff --git a/apps/sntp/sntp.h b/apps/sntp/sntp.h
index de5f11b..071e514 100644
--- a/apps/sntp/sntp.h
+++ b/apps/sntp/sntp.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_SNTP_H__
-#define LWIP_SNTP_H__
+#ifndef LWIP_SNTP_H
+#define LWIP_SNTP_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -12,4 +12,4 @@ void sntp_stop(void);
 }
 #endif
 
-#endif /* LWIP_SNTP_H__ */
+#endif /* LWIP_SNTP_H */
diff --git a/apps/socket_examples/socket_examples.h b/apps/socket_examples/socket_examples.h
index 7c4eccf..354d03a 100644
--- a/apps/socket_examples/socket_examples.h
+++ b/apps/socket_examples/socket_examples.h
@@ -1,6 +1,6 @@
-#ifndef LWIP_SOCKET_EXAMPLES_H__
-#define LWIP_SOCKET_EXAMPLES_H__
+#ifndef LWIP_SOCKET_EXAMPLES_H
+#define LWIP_SOCKET_EXAMPLES_H
 
 void socket_examples_init(void);
 
-#endif /* LWIP_SOCKET_EXAMPLES_H__ */
+#endif /* LWIP_SOCKET_EXAMPLES_H */
diff --git a/apps/tcpecho/tcpecho.h b/apps/tcpecho/tcpecho.h
index a039334..5b4bcfd 100644
--- a/apps/tcpecho/tcpecho.h
+++ b/apps/tcpecho/tcpecho.h
@@ -30,9 +30,9 @@
  *
  */
 
-#ifndef LWIP_TCPECHO_H__
-#define LWIP_TCPECHO_H__
+#ifndef LWIP_TCPECHO_H
+#define LWIP_TCPECHO_H
 
 void tcpecho_init(void);
 
-#endif /* LWIP_TCPECHO_H__ */
+#endif /* LWIP_TCPECHO_H */
diff --git a/apps/tcpecho_raw/echo.h b/apps/tcpecho_raw/echo.h
index 0306d68..8258fe7 100644
--- a/apps/tcpecho_raw/echo.h
+++ b/apps/tcpecho_raw/echo.h
@@ -27,8 +27,8 @@
  * This file is part of the lwIP TCP/IP stack.
  * 
  */
-#ifndef LWIP_ECHO_H__
-#define LWIP_ECHO_H__
+#ifndef LWIP_ECHO_H
+#define LWIP_ECHO_H
 
 void echo_init(void);
 
diff --git a/apps/udpecho/udpecho.h b/apps/udpecho/udpecho.h
index 7f4bc3f..a3155b8 100644
--- a/apps/udpecho/udpecho.h
+++ b/apps/udpecho/udpecho.h
@@ -29,9 +29,9 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_UDPECHO_H__
-#define LWIP_UDPECHO_H__
+#ifndef LWIP_UDPECHO_H
+#define LWIP_UDPECHO_H
 
 void udpecho_init(void);
 
-#endif /* LWIP_UDPECHO_H__ */
+#endif /* LWIP_UDPECHO_H */
diff --git a/ports/win32/include/arch/cc.h b/ports/win32/include/arch/cc.h
index be0d79d..aed6769 100644
--- a/ports/win32/include/arch/cc.h
+++ b/ports/win32/include/arch/cc.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_ARCH_CC_H__
-#define LWIP_ARCH_CC_H__
+#ifndef LWIP_ARCH_CC_H
+#define LWIP_ARCH_CC_H
 
 #include <stdio.h> /* printf, fflush, FILE */
 #include <stdlib.h> /* abort */
@@ -101,4 +101,4 @@ u32_t dns_lookup_external_hosts_file(const char *name);
 
 #define LWIP_RAND() ((u32_t)rand())
 
-#endif /* LWIP_ARCH_CC_H__ */
+#endif /* LWIP_ARCH_CC_H */
diff --git a/ports/win32/include/arch/perf.h b/ports/win32/include/arch/perf.h
index 9ddf61f..4580aab 100644
--- a/ports/win32/include/arch/perf.h
+++ b/ports/win32/include/arch/perf.h
@@ -31,10 +31,10 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_PERF_H__
-#define LWIP_PERF_H__
+#ifndef LWIP_PERF_H
+#define LWIP_PERF_H
 
 #define PERF_START    /* null definition */
 #define PERF_STOP(x)  /* null definition */
 
-#endif /* LWIP_PERF_H__ */
+#endif /* LWIP_PERF_H */
diff --git a/ports/win32/include/arch/sys_arch.h b/ports/win32/include/arch/sys_arch.h
index 5fcab94..a6ebb3a 100644
--- a/ports/win32/include/arch/sys_arch.h
+++ b/ports/win32/include/arch/sys_arch.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_ARCH_SYS_ARCH_H__
-#define LWIP_ARCH_SYS_ARCH_H__
+#ifndef LWIP_ARCH_SYS_ARCH_H
+#define LWIP_ARCH_SYS_ARCH_H
 
 /* HANDLE is used for sys_sem_t but we won't include windows.h */
 struct _sys_sem {
@@ -60,5 +60,5 @@ typedef struct lwip_mbox sys_mbox_t;
 /* DWORD (thread id) is used for sys_thread_t but we won't include windows.h */
 typedef u32_t sys_thread_t;
 
-#endif /* LWIP_ARCH_SYS_ARCH_H__ */
+#endif /* LWIP_ARCH_SYS_ARCH_H */
 
diff --git a/ports/win32/include/lwipopts.h b/ports/win32/include/lwipopts.h
index e4f65fd..3178c93 100644
--- a/ports/win32/include/lwipopts.h
+++ b/ports/win32/include/lwipopts.h
@@ -29,8 +29,8 @@
  * Author: Adam Dunkels <adam@sics.se>
  *
  */
-#ifndef LWIP_LWIPOPTS_H__
-#define LWIP_LWIPOPTS_H__
+#ifndef LWIP_LWIPOPTS_H
+#define LWIP_LWIPOPTS_H
 
 #define NO_SYS                     0
 #define LWIP_SOCKET               (NO_SYS==0)
@@ -282,4 +282,4 @@ a lot of data that needs to be copied, this should be set high. */
 
 #endif /* PPP_SUPPORT */
 
-#endif /* LWIP_LWIPOPTS_H__ */
+#endif /* LWIP_LWIPOPTS_H */
diff --git a/ports/win32/pcapif.h b/ports/win32/pcapif.h
index d0e0e10..8d67ea4 100644
--- a/ports/win32/pcapif.h
+++ b/ports/win32/pcapif.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_PCAPIF_H__
-#define LWIP_PCAPIF_H__
+#ifndef LWIP_PCAPIF_H
+#define LWIP_PCAPIF_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,4 +29,4 @@ void  pcapif_poll    (struct netif *netif);
 }
 #endif
 
-#endif /* LWIP_PCAPIF_H__ */
+#endif /* LWIP_PCAPIF_H */
diff --git a/ports/win32/pcapif_helper.h b/ports/win32/pcapif_helper.h
index 682db06..2ebde22 100644
--- a/ports/win32/pcapif_helper.h
+++ b/ports/win32/pcapif_helper.h
@@ -1,5 +1,5 @@
-#ifndef LWIP_PCAPIF_HELPER_H__
-#define LWIP_PCAPIF_HELPER_H__
+#ifndef LWIP_PCAPIF_HELPER_H
+#define LWIP_PCAPIF_HELPER_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -22,4 +22,4 @@ void pcapifh_linkstate_close(struct pcapifh_linkstate* state);
 }
 #endif
 
-#endif /* LWIP_PCAPIF_HELPER_H__ */
\ No newline at end of file
+#endif /* LWIP_PCAPIF_HELPER_H */
\ No newline at end of file