diff --git a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
index 9ccde64a..b391bf87 100644
--- a/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
+++ b/src/apps/altcp_tls/altcp_tls_mbedtls_mem.h
@@ -69,4 +69,4 @@ void altcp_mbedtls_free_config(void *item);
 
 #endif /* LWIP_ALTCP_TLS && LWIP_ALTCP_TLS_MBEDTLS */
 #endif /* LWIP_ALTCP */
-#endif /* LWIP_HDR_ALTCP_TLS_H */
+#endif /* LWIP_HDR_ALTCP_MBEDTLS_MEM_H */
diff --git a/src/include/lwip/apps/httpd.h b/src/include/lwip/apps/httpd.h
index e0638ff7..6bceafba 100644
--- a/src/include/lwip/apps/httpd.h
+++ b/src/include/lwip/apps/httpd.h
@@ -251,4 +251,4 @@ void httpd_inits(struct altcp_tls_config *conf);
 }
 #endif
 
-#endif /* LWIP_HTTPD_H */
+#endif /* LWIP_HDR_APPS_HTTPD_H */
diff --git a/src/include/lwip/ip6_zone.h b/src/include/lwip/ip6_zone.h
index a757575e..92074a24 100644
--- a/src/include/lwip/ip6_zone.h
+++ b/src/include/lwip/ip6_zone.h
@@ -293,4 +293,4 @@ enum lwip_ipv6_scope_type
 
 #endif /* LWIP_IPV6 */
 
-#endif /* LWIP_HDR_IP6_ADDR_H */
+#endif /* LWIP_HDR_IP6_ZONE_H */
diff --git a/src/include/lwip/prot/dhcp.h b/src/include/lwip/prot/dhcp.h
index c88a283a..abb4781e 100644
--- a/src/include/lwip/prot/dhcp.h
+++ b/src/include/lwip/prot/dhcp.h
@@ -173,4 +173,4 @@ typedef enum {
 }
 #endif
 
-#endif /*LWIP_HDR_PROT_DHCP_H*/
+#endif /* LWIP_HDR_PROT_DHCP_H */
diff --git a/src/include/lwip/prot/dhcp6.h b/src/include/lwip/prot/dhcp6.h
index a53601cc..c1059e67 100644
--- a/src/include/lwip/prot/dhcp6.h
+++ b/src/include/lwip/prot/dhcp6.h
@@ -133,4 +133,4 @@ typedef enum {
 }
 #endif
 
-#endif /*LWIP_HDR_PROT_DHCP_H*/
+#endif /* LWIP_HDR_PROT_DHCP6_H */