lib/*.h: use our standard naming scheme for header inclusion guards

35 files changed, 141 insertions, 110 deletions

diff --git a/lib/axtls.h b/lib/axtls.h
index 967f90930..8d33b1c7a 100644
--- a/lib/axtls.h
+++ b/lib/axtls.h
@@ -1,5 +1,5 @@
-#ifndef __AXTLS_H
-#define __AXTLS_H
+#ifndef HEADER_CURL_AXTLS_H
+#define HEADER_CURL_AXTLS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -59,4 +59,5 @@ int Curl_axtls_check_cxn(struct connectdata *conn);
 #define curlssl_data_pending(x,y) (x=x, y=y, 0)
 
 #endif /* USE_AXTLS */
-#endif
+#endif /* HEADER_CURL_AXTLS_H */
+
diff --git a/lib/bundles.h b/lib/bundles.h
index e9e257fc9..3816c4065 100644
--- a/lib/bundles.h
+++ b/lib/bundles.h
@@ -1,5 +1,5 @@
-#ifndef __BUNDLES_H
-#define __BUNDLES_H
+#ifndef HEADER_CURL_BUNDLES_H
+#define HEADER_CURL_BUNDLES_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -41,4 +41,5 @@ int Curl_bundle_remove_conn(struct connectbundle *cb_ptr,
                             struct connectdata *conn);
 
 
-#endif /* __BUNDLES_H */
+#endif /* HEADER_CURL_BUNDLES_H */
+
diff --git a/lib/config-dos.h b/lib/config-dos.h
index 694a30465..68614e8f4 100644
--- a/lib/config-dos.h
+++ b/lib/config-dos.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CONFIG_DOS_H
-#define HEADER_CONFIG_DOS_H
+#ifndef HEADER_CURL_CONFIG_DOS_H
+#define HEADER_CURL_CONFIG_DOS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -188,5 +188,5 @@
 #undef word
 #undef byte
 
-#endif /* HEADER_CONFIG_DOS_H */
+#endif /* HEADER_CURL_CONFIG_DOS_H */
 
diff --git a/lib/config-vms.h b/lib/config-vms.h
index 75c77d1b1..e6e638e20 100644
--- a/lib/config-vms.h
+++ b/lib/config-vms.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CONFIG_VMS_H
-#define HEADER_CONFIG_VMS_H
+#ifndef HEADER_CURL_CONFIG_VMS_H
+#define HEADER_CURL_CONFIG_VMS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -395,4 +395,5 @@
 /* Define to hide dollar sign from compilers in strict ansi mode. */
 #define decc_translate_vms(__s) decc$translate_vms(__s)
 
-#endif /* HEADER_CONFIG_VMS_H */
+#endif /* HEADER_CURL_CONFIG_VMS_H */
+
diff --git a/lib/curl_ldap.h b/lib/curl_ldap.h
index 4cd13cfd2..93fb4b07a 100644
--- a/lib/curl_ldap.h
+++ b/lib/curl_ldap.h
@@ -1,6 +1,5 @@
-#ifndef __CURL_LDAP_H
-#define __CURL_LDAP_H
-
+#ifndef HEADER_CURL_LDAP_H
+#define HEADER_CURL_LDAP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -32,4 +31,5 @@ extern const struct Curl_handler Curl_handler_ldaps;
 #endif
 
 #endif
-#endif /* __CURL_LDAP_H */
+#endif /* HEADER_CURL_LDAP_H */
+
diff --git a/lib/curlx.h b/lib/curlx.h
index a1df66902..9dc90a004 100644
--- a/lib/curlx.h
+++ b/lib/curlx.h
@@ -1,5 +1,5 @@
-#ifndef __CURLX_H
-#define __CURLX_H
+#ifndef HEADER_CURL_CURLX_H
+#define HEADER_CURL_CURLX_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -115,4 +115,5 @@
 # define vaprintf curlx_mvaprintf
 #endif /* ENABLE_CURLX_PRINTF */
 
-#endif /* __CURLX_H */
+#endif /* HEADER_CURL_CURLX_H */
+
diff --git a/lib/easyif.h b/lib/easyif.h
index d05b7d610..1f521689f 100644
--- a/lib/easyif.h
+++ b/lib/easyif.h
@@ -1,5 +1,5 @@
-#ifndef __EASYIF_H
-#define __EASYIF_H
+#ifndef HEADER_CURL_EASYIF_H
+#define HEADER_CURL_EASYIF_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -29,4 +29,5 @@ void Curl_easy_addmulti(struct SessionHandle *data, void *multi);
 
 void Curl_easy_initHandleData(struct SessionHandle *data);
 
-#endif /* __EASYIF_H */
+#endif /* HEADER_CURL_EASYIF_H */
+
diff --git a/lib/escape.h b/lib/escape.h
index 4c7f84133..731b13655 100644
--- a/lib/escape.h
+++ b/lib/escape.h
@@ -1,6 +1,5 @@
 #ifndef HEADER_CURL_ESCAPE_H
 #define HEADER_CURL_ESCAPE_H
-
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -30,4 +29,5 @@ CURLcode Curl_urldecode(struct SessionHandle *data,
                         char **ostring, size_t *olen,
                         bool reject_crlf);
 
-#endif
+#endif /* HEADER_CURL_ESCAPE_H */
+
diff --git a/lib/file.h b/lib/file.h
index 5e3bd7564..997474bc7 100644
--- a/lib/file.h
+++ b/lib/file.h
@@ -1,6 +1,5 @@
-#ifndef __FILE_H
-#define __FILE_H
-
+#ifndef HEADER_CURL_FILE_H
+#define HEADER_CURL_FILE_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -37,4 +36,6 @@ struct FILEPROTO {
 #ifndef CURL_DISABLE_FILE
 extern const struct Curl_handler Curl_handler_file;
 #endif
-#endif
+
+#endif /* HEADER_CURL_FILE_H */
+
diff --git a/lib/hash.h b/lib/hash.h
index 5f7c2bf56..3fa621cb1 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -1,5 +1,5 @@
-#ifndef __HASH_H
-#define __HASH_H
+#ifndef HEADER_CURL_HASH_H
+#define HEADER_CURL_HASH_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -103,4 +103,5 @@ void Curl_hash_print(struct curl_hash *h,
                      void (*func)(void *));
 
 
-#endif
+#endif /* HEADER_CURL_HASH_H */
+
diff --git a/lib/hostcheck.h b/lib/hostcheck.h
index 51cc4aa82..f4a517a8e 100644
--- a/lib/hostcheck.h
+++ b/lib/hostcheck.h
@@ -1,5 +1,5 @@
-#ifndef __HOSTCHECK_H
-#define __HOSTCHECK_H
+#ifndef HEADER_CURL_HOSTCHECK_H
+#define HEADER_CURL_HOSTCHECK_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -28,4 +28,5 @@
 #define CURL_HOST_MATCH   1
 int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
 
-#endif
+#endif /* HEADER_CURL_HOSTCHECK_H */
+
diff --git a/lib/http.h b/lib/http.h
index cfe8b8455..7236dd88c 100644
--- a/lib/http.h
+++ b/lib/http.h
@@ -1,6 +1,5 @@
-#ifndef __HTTP_H
-#define __HTTP_H
-
+#ifndef HEADER_CURL_HTTP_H
+#define HEADER_CURL_HTTP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -168,4 +167,5 @@ Curl_http_output_auth(struct connectdata *conn,
                       bool proxytunnel); /* TRUE if this is the request setting
                                             up the proxy tunnel */
 
-#endif
+#endif /* HEADER_CURL_HTTP_H */
+
diff --git a/lib/http_chunks.h b/lib/http_chunks.h
index 6056e188c..b999ab53b 100644
--- a/lib/http_chunks.h
+++ b/lib/http_chunks.h
@@ -1,5 +1,5 @@
-#ifndef __HTTP_CHUNKS_H
-#define __HTTP_CHUNKS_H
+#ifndef HEADER_CURL_HTTP_CHUNKS_H
+#define HEADER_CURL_HTTP_CHUNKS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -104,4 +104,5 @@ struct Curl_chunker {
   size_t dataleft; /* untouched data amount at the end of the last buffer */
 };
 
-#endif
+#endif /* HEADER_CURL_HTTP_CHUNKS_H */
+
diff --git a/lib/imap.h b/lib/imap.h
index e56c7643e..02ea346ad 100644
--- a/lib/imap.h
+++ b/lib/imap.h
@@ -1,5 +1,5 @@
-#ifndef __IMAP_H
-#define __IMAP_H
+#ifndef HEADER_CURL_IMAP_H
+#define HEADER_CURL_IMAP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -55,4 +55,5 @@ struct imap_conn {
 extern const struct Curl_handler Curl_handler_imap;
 extern const struct Curl_handler Curl_handler_imaps;
 
-#endif /* __IMAP_H */
+#endif /* HEADER_CURL_IMAP_H */
+
diff --git a/lib/inet_ntop.h b/lib/inet_ntop.h
index 8db9775c8..dbc146d91 100644
--- a/lib/inet_ntop.h
+++ b/lib/inet_ntop.h
@@ -1,5 +1,5 @@
-#ifndef __INET_NTOP_H
-#define __INET_NTOP_H
+#ifndef HEADER_CURL_INET_NTOP_H
+#define HEADER_CURL_INET_NTOP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -34,4 +34,5 @@ char *Curl_inet_ntop(int af, const void *addr, char *buf, size_t size);
         inet_ntop(af,addr,buf,(curl_socklen_t)size)
 #endif
 
-#endif /* __INET_NTOP_H */
+#endif /* HEADER_CURL_INET_NTOP_H */
+
diff --git a/lib/inet_pton.h b/lib/inet_pton.h
index d53fddff8..f991473d6 100644
--- a/lib/inet_pton.h
+++ b/lib/inet_pton.h
@@ -1,5 +1,5 @@
-#ifndef __INET_PTON_H
-#define __INET_PTON_H
+#ifndef HEADER_CURL_INET_PTON_H
+#define HEADER_CURL_INET_PTON_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -33,4 +33,5 @@ int Curl_inet_pton(int, const char *, void *);
 #define Curl_inet_pton(x,y,z) inet_pton(x,y,z)
 #endif
 
-#endif /* __INET_PTON_H */
+#endif /* HEADER_CURL_INET_PTON_H */
+
diff --git a/lib/krb4.h b/lib/krb4.h
index b0307122c..3e29b2588 100644
--- a/lib/krb4.h
+++ b/lib/krb4.h
@@ -1,5 +1,5 @@
-#ifndef __KRB4_H
-#define __KRB4_H
+#ifndef HEADER_CURL_KRB4_H
+#define HEADER_CURL_KRB4_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -53,4 +53,5 @@ void Curl_sec_end (struct connectdata *);
 CURLcode Curl_sec_login (struct connectdata *);
 int Curl_sec_request_prot (struct connectdata *conn, const char *level);
 
-#endif
+#endif /* HEADER_CURL_KRB4_H */
+
diff --git a/lib/llist.h b/lib/llist.h
index c33912a4b..b4ca82a44 100644
--- a/lib/llist.h
+++ b/lib/llist.h
@@ -1,5 +1,5 @@
-#ifndef __LLIST_H
-#define __LLIST_H
+#ifndef HEADER_CURL_LLIST_H
+#define HEADER_CURL_LLIST_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -53,4 +53,5 @@ void Curl_llist_destroy(struct curl_llist *, void *);
 int Curl_llist_move(struct curl_llist *, struct curl_llist_element *,
                     struct curl_llist *, struct curl_llist_element *);
 
-#endif
+#endif /* HEADER_CURL_LLIST_H */
+
diff --git a/lib/multiif.h b/lib/multiif.h
index 76918181e..c84b6184c 100644
--- a/lib/multiif.h
+++ b/lib/multiif.h
@@ -1,5 +1,5 @@
-#ifndef __MULTIIF_H
-#define __MULTIIF_H
+#ifndef HEADER_CURL_MULTIIF_H
+#define HEADER_CURL_MULTIIF_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -50,4 +50,5 @@ void Curl_multi_handlePipeBreak(struct SessionHandle *data);
 void Curl_multi_dump(const struct Curl_multi *multi_handle);
 #endif
 
-#endif /* __MULTIIF_H */
+#endif /* HEADER_CURL_MULTIIF_H */
+
diff --git a/lib/nonblock.h b/lib/nonblock.h
index adcd2c15e..b540ae46f 100644
--- a/lib/nonblock.h
+++ b/lib/nonblock.h
@@ -1,5 +1,5 @@
-#ifndef __NONBLOCK_H
-#define __NONBLOCK_H
+#ifndef HEADER_CURL_NONBLOCK_H
+#define HEADER_CURL_NONBLOCK_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -27,4 +27,5 @@
 int curlx_nonblock(curl_socket_t sockfd,    /* operate on this */
                    int nonblock   /* TRUE or FALSE */);
 
-#endif
+#endif /* HEADER_CURL_NONBLOCK_H */
+
diff --git a/lib/parsedate.h b/lib/parsedate.h
index 25d25367d..ade0f4f60 100644
--- a/lib/parsedate.h
+++ b/lib/parsedate.h
@@ -1,5 +1,5 @@
-#ifndef __CURL_PARSEDATE_H
-#define __CURL_PARSEDATE_H
+#ifndef HEADER_CURL_PARSEDATE_H
+#define HEADER_CURL_PARSEDATE_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -27,4 +27,5 @@ extern const char * const Curl_month[12];
 
 CURLcode Curl_gmtime(time_t intime, struct tm *store);
 
-#endif
+#endif /* HEADER_CURL_PARSEDATE_H */
+
diff --git a/lib/progress.h b/lib/progress.h
index 951de7f94..f97fef996 100644
--- a/lib/progress.h
+++ b/lib/progress.h
@@ -1,5 +1,5 @@
-#ifndef __PROGRESS_H
-#define __PROGRESS_H
+#ifndef HEADER_CURL_PROGRESS_H
+#define HEADER_CURL_PROGRESS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -68,4 +68,5 @@ void Curl_pgrsTime(struct SessionHandle *data, timerid timer);
 #define PGRS_HEADERS_OUT (1<<7) /* set when the headers have been written */
 
 
-#endif /* __PROGRESS_H */
+#endif /* HEADER_CURL_PROGRESS_H */
+
diff --git a/lib/rawstr.h b/lib/rawstr.h
index d73dbc2c0..b491460d0 100644
--- a/lib/rawstr.h
+++ b/lib/rawstr.h
@@ -1,5 +1,5 @@
-#ifndef __RAWSTR_H
-#define __RAWSTR_H
+#ifndef HEADER_CURL_RAWSTR_H
+#define HEADER_CURL_RAWSTR_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -42,4 +42,6 @@ char Curl_raw_toupper(char in);
 #define checkprefix(a,b)    Curl_raw_nequal(a,b,strlen(a))
 
 void Curl_strntoupper(char *dest, const char *src, size_t n);
-#endif
+
+#endif /* HEADER_CURL_RAWSTR_H */
+
diff --git a/lib/rtsp.h b/lib/rtsp.h
index 08b8b5cbf..3ffa70cc6 100644
--- a/lib/rtsp.h
+++ b/lib/rtsp.h
@@ -1,6 +1,5 @@
-#ifndef __RTSP_H_
-#define __RTSP_H_
-
+#ifndef HEADER_CURL_RTSP_H
+#define HEADER_CURL_RTSP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -66,4 +65,5 @@ struct RTSP {
 };
 
 
-#endif /* __RTSP_H_ */
+#endif /* HEADER_CURL_RTSP_H */
+
diff --git a/lib/select.h b/lib/select.h
index c1769e9a8..d66873fe9 100644
--- a/lib/select.h
+++ b/lib/select.h
@@ -1,5 +1,5 @@
-#ifndef __SELECT_H
-#define __SELECT_H
+#ifndef HEADER_CURL_SELECT_H
+#define HEADER_CURL_SELECT_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -104,4 +104,5 @@ int tpf_select_libcurl(int maxfds, fd_set* reads, fd_set* writes,
 } WHILE_FALSE
 #endif
 
-#endif /* __SELECT_H */
+#endif /* HEADER_CURL_SELECT_H */
+
diff --git a/lib/setup_once.h b/lib/setup_once.h
index e7104b071..2d55c4060 100644
--- a/lib/setup_once.h
+++ b/lib/setup_once.h
@@ -1,5 +1,5 @@
-#ifndef __SETUP_ONCE_H
-#define __SETUP_ONCE_H
+#ifndef HEADER_CURL_SETUP_ONCE_H
+#define HEADER_CURL_SETUP_ONCE_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -566,4 +566,5 @@ typedef int sig_atomic_t;
 #define ZERO_NULL 0
 
 
-#endif /* __SETUP_ONCE_H */
+#endif /* HEADER_CURL_SETUP_ONCE_H */
+
diff --git a/lib/slist.h b/lib/slist.h
index 161b1509e..aede1f041 100644
--- a/lib/slist.h
+++ b/lib/slist.h
@@ -1,5 +1,5 @@
-#ifndef __SLIST_H
-#define __SLIST_H
+#ifndef HEADER_CURL_SLIST_H
+#define HEADER_CURL_SLIST_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -29,4 +29,5 @@
  */
 struct curl_slist *Curl_slist_duplicate(struct curl_slist *inlist);
 
-#endif /* __SLIST_H */
+#endif /* HEADER_CURL_SLIST_H */
+
diff --git a/lib/smtp.h b/lib/smtp.h
index d68a659b5..d30c10a8c 100644
--- a/lib/smtp.h
+++ b/lib/smtp.h
@@ -1,5 +1,5 @@
-#ifndef __SMTP_H
-#define __SMTP_H
+#ifndef HEADER_CURL_SMTP_H
+#define HEADER_CURL_SMTP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -84,4 +84,5 @@ extern const struct Curl_handler Curl_handler_smtps;
 
 CURLcode Curl_smtp_escape_eob(struct connectdata *conn, ssize_t nread);
 
-#endif /* __SMTP_H */
+#endif /* HEADER_CURL_SMTP_H */
+
diff --git a/lib/sockaddr.h b/lib/sockaddr.h
index 440eb0a97..522a2199f 100644
--- a/lib/sockaddr.h
+++ b/lib/sockaddr.h
@@ -1,5 +1,5 @@
-#ifndef __SOCKADDR_H
-#define __SOCKADDR_H
+#ifndef HEADER_CURL_SOCKADDR_H
+#define HEADER_CURL_SOCKADDR_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -39,4 +39,5 @@ struct Curl_sockaddr_storage {
   } buffer;
 };
 
-#endif /* __SOCKADDR_H */
+#endif /* HEADER_CURL_SOCKADDR_H */
+
diff --git a/lib/socks.h b/lib/socks.h
index fc4cc7f02..0ce0bd044 100644
--- a/lib/socks.h
+++ b/lib/socks.h
@@ -1,5 +1,5 @@
-#ifndef __CURL_SOCKS_H
-#define __CURL_SOCKS_H
+#ifndef HEADER_CURL_SOCKS_H
+#define HEADER_CURL_SOCKS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -73,4 +73,5 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
 
 #endif /* CURL_DISABLE_PROXY */
 
-#endif  /* __CURL_SOCKS_H */
+#endif  /* HEADER_CURL_SOCKS_H */
+
diff --git a/lib/strequal.h b/lib/strequal.h
index 202c9197d..287e042f4 100644
--- a/lib/strequal.h
+++ b/lib/strequal.h
@@ -1,5 +1,5 @@
-#ifndef __STREQUAL_H
-#define __STREQUAL_H
+#ifndef HEADER_CURL_STREQUAL_H
+#define HEADER_CURL_STREQUAL_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -32,4 +32,5 @@
 #endif
 size_t strlcat(char *dst, const char *src, size_t siz);
 
-#endif
+#endif /* HEADER_CURL_STREQUAL_H */
+
diff --git a/lib/telnet.h b/lib/telnet.h
index f00f7fd8f..ddb9e5473 100644
--- a/lib/telnet.h
+++ b/lib/telnet.h
@@ -1,6 +1,5 @@
-#ifndef __TELNET_H
-#define __TELNET_H
-
+#ifndef HEADER_CURL_TELNET_H
+#define HEADER_CURL_TELNET_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -25,4 +24,6 @@
 #ifndef CURL_DISABLE_TELNET
 extern const struct Curl_handler Curl_handler_telnet;
 #endif
-#endif
+
+#endif /* HEADER_CURL_TELNET_H */
+
diff --git a/lib/tftp.h b/lib/tftp.h
index b2d67b26b..117b40f62 100644
--- a/lib/tftp.h
+++ b/lib/tftp.h
@@ -1,6 +1,5 @@
-#ifndef __TFTP_H
-#define __TFTP_H
-
+#ifndef HEADER_CURL_TFTP_H
+#define HEADER_CURL_TFTP_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -25,4 +24,6 @@
 #ifndef CURL_DISABLE_TFTP
 extern const struct Curl_handler Curl_handler_tftp;
 #endif
-#endif
+
+#endif /* HEADER_CURL_TFTP_H */
+
diff --git a/lib/timeval.h b/lib/timeval.h
index bc79a45ad..b464ae406 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -1,5 +1,5 @@
-#ifndef __TIMEVAL_H
-#define __TIMEVAL_H
+#ifndef HEADER_CURL_TIMEVAL_H
+#define HEADER_CURL_TIMEVAL_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -54,4 +54,5 @@ long Curl_tvlong(struct timeval t1);
 #define Curl_tvdiff(x,y) curlx_tvdiff(x,y)
 #define Curl_tvdiff_secs(x,y) curlx_tvdiff_secs(x,y)
 
-#endif
+#endif /* HEADER_CURL_TIMEVAL_H */
+
diff --git a/lib/transfer.h b/lib/transfer.h
index 68a31c67e..b47422a63 100644
--- a/lib/transfer.h
+++ b/lib/transfer.h
@@ -1,5 +1,5 @@
-#ifndef __TRANSFER_H
-#define __TRANSFER_H
+#ifndef HEADER_CURL_TRANSFER_H
+#define HEADER_CURL_TRANSFER_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -66,4 +66,5 @@ Curl_setup_transfer (struct connectdata *data,
 long Curl_sleep_time(curl_off_t rate_bps, curl_off_t cur_rate_bps,
                      int pkt_size);
 
-#endif
+#endif /* HEADER_CURL_TRANSFER_H */
+