Update comments after #endif in C headers

74 files changed, 78 insertions, 78 deletions

diff --git a/src/plugins/alias/alias-config.h b/src/plugins/alias/alias-config.h
index cd30ca6ec..37df0632f 100644
--- a/src/plugins/alias/alias-config.h
+++ b/src/plugins/alias/alias-config.h
@@ -32,4 +32,4 @@ extern int alias_config_init ();
 extern int alias_config_read ();
 extern int alias_config_write ();
 
-#endif /* alias-config.h */
+#endif /* __WEECHAT_ALIAS_CONFIG_H */
diff --git a/src/plugins/alias/alias-info.h b/src/plugins/alias/alias-info.h
index 216f13b37..f457110d7 100644
--- a/src/plugins/alias/alias-info.h
+++ b/src/plugins/alias/alias-info.h
@@ -22,4 +22,4 @@
 
 extern void alias_info_init ();
 
-#endif /* alias-info.h */
+#endif /* __WEECHAT_ALIAS_INFO_H */
diff --git a/src/plugins/alias/alias.h b/src/plugins/alias/alias.h
index d292db79a..543550fb4 100644
--- a/src/plugins/alias/alias.h
+++ b/src/plugins/alias/alias.h
@@ -52,4 +52,4 @@ extern void alias_free_all ();
 extern int alias_add_to_infolist (struct t_infolist *infolist,
                                   struct t_alias *alias);
 
-#endif /* alias.h */
+#endif /* __WEECHAT_ALIAS_H */
diff --git a/src/plugins/aspell/weechat-aspell-config.h b/src/plugins/aspell/weechat-aspell-config.h
index fc8c6676a..fff053a45 100644
--- a/src/plugins/aspell/weechat-aspell-config.h
+++ b/src/plugins/aspell/weechat-aspell-config.h
@@ -43,4 +43,4 @@ extern int weechat_aspell_config_read ();
 extern int weechat_aspell_config_write ();
 extern void weechat_aspell_config_free ();
 
-#endif /* weechat-aspell-config.h */
+#endif /* __WEECHAT_ASPELL_CONFIG_H */
diff --git a/src/plugins/aspell/weechat-aspell-speller.h b/src/plugins/aspell/weechat-aspell-speller.h
index 657922997..a6042a54c 100644
--- a/src/plugins/aspell/weechat-aspell-speller.h
+++ b/src/plugins/aspell/weechat-aspell-speller.h
@@ -39,4 +39,4 @@ extern struct t_aspell_speller *weechat_aspell_speller_new (const char *lang);
 extern void weechat_aspell_speller_free (struct t_aspell_speller *speller);
 extern void weechat_aspell_speller_free_all ();
 
-#endif /* weechat-aspell-speller.h */
+#endif /* __WEECHAT_ASPELL_SPELLER_H */
diff --git a/src/plugins/aspell/weechat-aspell.h b/src/plugins/aspell/weechat-aspell.h
index c718173e5..d15928706 100644
--- a/src/plugins/aspell/weechat-aspell.h
+++ b/src/plugins/aspell/weechat-aspell.h
@@ -39,4 +39,4 @@ extern struct t_aspell_code countries_avail[];
 
 extern void weechat_aspell_create_spellers (struct t_gui_buffer *buffer);
 
-#endif /* weechat-aspell.h */
+#endif /* __WEECHAT_ASPELL_H */
diff --git a/src/plugins/fifo/fifo-info.h b/src/plugins/fifo/fifo-info.h
index 06d172d21..fe639bc03 100644
--- a/src/plugins/fifo/fifo-info.h
+++ b/src/plugins/fifo/fifo-info.h
@@ -22,4 +22,4 @@
 
 extern void fifo_info_init ();
 
-#endif /* fifo-info.h */
+#endif /* __WEECHAT_FIFO_INFO_H */
diff --git a/src/plugins/fifo/fifo.h b/src/plugins/fifo/fifo.h
index 864391f7a..55fdfb7e7 100644
--- a/src/plugins/fifo/fifo.h
+++ b/src/plugins/fifo/fifo.h
@@ -26,4 +26,4 @@
 extern struct t_weechat_plugin *weechat_fifo_plugin;
 extern char *fifo_filename;
 
-#endif /* fifo.h */
+#endif /* __WEECHAT_FIFO_H */
diff --git a/src/plugins/irc/irc-bar-item.h b/src/plugins/irc/irc-bar-item.h
index 39a410f44..803724c54 100644
--- a/src/plugins/irc/irc-bar-item.h
+++ b/src/plugins/irc/irc-bar-item.h
@@ -22,4 +22,4 @@
 
 extern void irc_bar_item_init ();
 
-#endif /* irc-bar-item.h */
+#endif /* __WEECHAT_IRC_BAR_ITEM_H */
diff --git a/src/plugins/irc/irc-buffer.h b/src/plugins/irc/irc-buffer.h
index ede859087..d3476dd9d 100644
--- a/src/plugins/irc/irc-buffer.h
+++ b/src/plugins/irc/irc-buffer.h
@@ -55,4 +55,4 @@ extern char *irc_buffer_build_name (const char *server, const char *channel);
 extern int irc_buffer_close_cb (void *data, struct t_gui_buffer *buffer);
 extern struct t_gui_buffer *irc_buffer_search_first_for_all_servers ();
 
-#endif /* irc-buffer.h */
+#endif /* __WEECHAT_IRC_BUFFER_H */
diff --git a/src/plugins/irc/irc-channel.h b/src/plugins/irc/irc-channel.h
index e8d818314..3558f7717 100644
--- a/src/plugins/irc/irc-channel.h
+++ b/src/plugins/irc/irc-channel.h
@@ -121,4 +121,4 @@ extern int irc_channel_add_to_infolist (struct t_infolist *infolist,
                                         struct t_irc_channel *channel);
 extern void irc_channel_print_log (struct t_irc_channel *channel);
 
-#endif /* irc-channel.h */
+#endif /* __WEECHAT_IRC_CHANNEL_H */
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 36f40192f..df795ac65 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -94,4 +94,4 @@ extern char *irc_color_modifier_cb (void *data, const char *modifier,
                                     const char *modifier_data,
                                     const char *string);
 
-#endif /* irc-color.h */
+#endif /* __WEECHAT_IRC_COLOR_H */
diff --git a/src/plugins/irc/irc-command.h b/src/plugins/irc/irc-command.h
index 621ee23b2..fc2005310 100644
--- a/src/plugins/irc/irc-command.h
+++ b/src/plugins/irc/irc-command.h
@@ -65,4 +65,4 @@ extern void irc_command_quit_server (struct t_irc_server *server,
                                      const char *arguments);
 extern void irc_command_init ();
 
-#endif /* irc-command.h */
+#endif /* __WEECHAT_IRC_COMMAND_H */
diff --git a/src/plugins/irc/irc-completion.h b/src/plugins/irc/irc-completion.h
index ac7ba3de3..8d79eb247 100644
--- a/src/plugins/irc/irc-completion.h
+++ b/src/plugins/irc/irc-completion.h
@@ -22,4 +22,4 @@
 
 extern void irc_completion_init ();
 
-#endif /* irc-completion.h */
+#endif /* __WEECHAT_IRC_COMPLETION_H */
diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index 131e4c51b..e2a5f79ca 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -148,4 +148,4 @@ extern int irc_config_read ();
 extern int irc_config_write (int write_temp_servers);
 extern void irc_config_free ();
 
-#endif /* irc-config.h */
+#endif /* __WEECHAT_IRC_CONFIG_H */
diff --git a/src/plugins/irc/irc-ctcp.h b/src/plugins/irc/irc-ctcp.h
index 541232af9..c16302145 100644
--- a/src/plugins/irc/irc-ctcp.h
+++ b/src/plugins/irc/irc-ctcp.h
@@ -39,4 +39,4 @@ extern void irc_ctcp_recv (struct t_irc_server *server, const char *command,
                            const char *nick, const char *remote_nick,
                            char *arguments, char *message);
 
-#endif /* irc-ctcp.h */
+#endif /* __WEECHAT_IRC_CTCP_H */
diff --git a/src/plugins/irc/irc-debug.h b/src/plugins/irc/irc-debug.h
index 598aec330..c89f69001 100644
--- a/src/plugins/irc/irc-debug.h
+++ b/src/plugins/irc/irc-debug.h
@@ -22,4 +22,4 @@
 
 extern void irc_debug_init ();
 
-#endif /* irc-debug.h */
+#endif /* __WEECHAT_IRC_DEBUG_H */
diff --git a/src/plugins/irc/irc-display.h b/src/plugins/irc/irc-display.h
index 0bc1e3289..a9ea3e00e 100644
--- a/src/plugins/irc/irc-display.h
+++ b/src/plugins/irc/irc-display.h
@@ -25,4 +25,4 @@ extern void irc_display_away (struct t_irc_server *server, const char *string1,
                               const char *string2);
 extern void irc_display_server (struct t_irc_server *server, int with_detail);
 
-#endif /* irc-display.h */
+#endif /* __WEECHAT_IRC_DISPLAY_H */
diff --git a/src/plugins/irc/irc-ignore.h b/src/plugins/irc/irc-ignore.h
index 874d9e9f2..2831e65e5 100644
--- a/src/plugins/irc/irc-ignore.h
+++ b/src/plugins/irc/irc-ignore.h
@@ -54,4 +54,4 @@ extern void irc_ignore_free_all ();
 extern int irc_ignore_add_to_infolist (struct t_infolist *infolist,
                                        struct t_irc_ignore *ignore);
     
-#endif /* irc-ignore.h */
+#endif /* __WEECHAT_IRC_IGNORE_H */
diff --git a/src/plugins/irc/irc-info.h b/src/plugins/irc/irc-info.h
index f56eb6ca0..0a6521b6d 100644
--- a/src/plugins/irc/irc-info.h
+++ b/src/plugins/irc/irc-info.h
@@ -22,4 +22,4 @@
 
 extern void irc_info_init ();
 
-#endif /* irc-info.h */
+#endif /* __WEECHAT_IRC_INFO_H */
diff --git a/src/plugins/irc/irc-input.h b/src/plugins/irc/irc-input.h
index 45fc7a158..8a8dd61e4 100644
--- a/src/plugins/irc/irc-input.h
+++ b/src/plugins/irc/irc-input.h
@@ -27,4 +27,4 @@ extern void irc_input_user_message_display (struct t_gui_buffer *buffer,
 extern int irc_input_data_cb (void *data, struct t_gui_buffer *buffer,
                               const char *input_data);
 
-#endif /* irc-input.h */
+#endif /* __WEECHAT_IRC_INPUT_H */
diff --git a/src/plugins/irc/irc-mode.h b/src/plugins/irc/irc-mode.h
index a540b7ff7..358ba5b77 100644
--- a/src/plugins/irc/irc-mode.h
+++ b/src/plugins/irc/irc-mode.h
@@ -34,4 +34,4 @@ extern int irc_mode_get_nick_attr (struct t_irc_server *server, char *mode,
 extern char irc_mode_get_prefix (struct t_irc_server *server, char mode,
                                  char default_prefix);
 
-#endif /* irc-mode.h */
+#endif /* __WEECHAT_IRC_MODE_H */
diff --git a/src/plugins/irc/irc-msgbuffer.h b/src/plugins/irc/irc-msgbuffer.h
index 2034e472f..16c082017 100644
--- a/src/plugins/irc/irc-msgbuffer.h
+++ b/src/plugins/irc/irc-msgbuffer.h
@@ -44,4 +44,4 @@ extern struct t_gui_buffer *irc_msgbuffer_get_target_buffer (struct t_irc_server
                                                              const char *alias,
                                                              struct t_gui_buffer *default_buffer);
 
-#endif /* irc-msgbuffer.h */
+#endif /* __WEECHAT_IRC_MSGBUFFER_H */
diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h
index f5f1ec682..1b05d85eb 100644
--- a/src/plugins/irc/irc-nick.h
+++ b/src/plugins/irc/irc-nick.h
@@ -117,4 +117,4 @@ extern int irc_nick_add_to_infolist (struct t_infolist *infolist,
                                      struct t_irc_nick *nick);
 extern void irc_nick_print_log (struct t_irc_nick *nick);
 
-#endif /* irc-nick.h */
+#endif /* __WEECHAT_IRC_NICK_H */
diff --git a/src/plugins/irc/irc-protocol.h b/src/plugins/irc/irc-protocol.h
index 9918d5746..73415b10b 100644
--- a/src/plugins/irc/irc-protocol.h
+++ b/src/plugins/irc/irc-protocol.h
@@ -84,4 +84,4 @@ extern void irc_protocol_recv_command (struct t_irc_server *server,
                                        const char *msg_command,
                                        const char *msg_channel);
 
-#endif /* irc-protocol.h */
+#endif /* __WEECHAT_IRC_PROTOCOL_H */
diff --git a/src/plugins/irc/irc-raw.h b/src/plugins/irc/irc-raw.h
index 489a9996a..1a5cfd61c 100644
--- a/src/plugins/irc/irc-raw.h
+++ b/src/plugins/irc/irc-raw.h
@@ -51,4 +51,4 @@ extern void irc_raw_message_free_all ();
 extern int irc_raw_add_to_infolist (struct t_infolist *infolist,
                                     struct t_irc_raw_message *raw_message);
 
-#endif /* irc-raw.h */
+#endif /* __WEECHAT_IRC_RAW_H */
diff --git a/src/plugins/irc/irc-sasl.h b/src/plugins/irc/irc-sasl.h
index 61f50abc5..63a78e340 100644
--- a/src/plugins/irc/irc-sasl.h
+++ b/src/plugins/irc/irc-sasl.h
@@ -38,4 +38,4 @@ extern char *irc_sasl_mechanism_dh_blowfish (const char *data_base64,
                                              const char *sasl_username,
                                              const char *sasl_password);
 
-#endif /* irc-sasl.h */
+#endif /* __WEECHAT_IRC_SASL_H */
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index 575545467..997f055b4 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -235,4 +235,4 @@ extern int irc_server_add_to_infolist (struct t_infolist *infolist,
                                        struct t_irc_server *server);
 extern void irc_server_print_log ();
 
-#endif /* irc-server.h */
+#endif /* __WEECHAT_IRC_SERVER_H */
diff --git a/src/plugins/irc/irc-upgrade.h b/src/plugins/irc/irc-upgrade.h
index 1b3ecf139..431c9d0bb 100644
--- a/src/plugins/irc/irc-upgrade.h
+++ b/src/plugins/irc/irc-upgrade.h
@@ -35,4 +35,4 @@ enum t_irc_upgrade_type
 extern int irc_upgrade_save ();
 extern int irc_upgrade_load ();
 
-#endif /* irc-upgrade.h */
+#endif /* __WEECHAT_IRC_UPGRADE_H */
diff --git a/src/plugins/irc/irc.h b/src/plugins/irc/irc.h
index 5dea08884..4526c3f64 100644
--- a/src/plugins/irc/irc.h
+++ b/src/plugins/irc/irc.h
@@ -27,4 +27,4 @@
 extern struct t_weechat_plugin *weechat_irc_plugin;
 extern struct t_hook *irc_hook_timer_check_away;
 
-#endif /* irc.h */
+#endif /* __WEECHAT_IRC_H */
diff --git a/src/plugins/logger/logger-buffer.h b/src/plugins/logger/logger-buffer.h
index 3d6664c40..12846a9ce 100644
--- a/src/plugins/logger/logger-buffer.h
+++ b/src/plugins/logger/logger-buffer.h
@@ -47,4 +47,4 @@ extern void logger_buffer_free (struct t_logger_buffer *logger_buffer);
 extern int logger_buffer_add_to_infolist (struct t_infolist *infolist,
                                           struct t_logger_buffer *logger_buffer);
 
-#endif /* logger-buffer.h */
+#endif /* __WEECHAT_LOGGER_BUFFER_H */
diff --git a/src/plugins/logger/logger-config.h b/src/plugins/logger/logger-config.h
index c4a01d7e6..1f108c5e2 100644
--- a/src/plugins/logger/logger-config.h
+++ b/src/plugins/logger/logger-config.h
@@ -41,4 +41,4 @@ extern int logger_config_read ();
 extern int logger_config_write ();
 extern void logger_config_free ();
 
-#endif /* logger-config.h */
+#endif /* __WEECHAT_LOGGER_CONFIG_H */
diff --git a/src/plugins/logger/logger-info.h b/src/plugins/logger/logger-info.h
index 82d1541e0..0c536a994 100644
--- a/src/plugins/logger/logger-info.h
+++ b/src/plugins/logger/logger-info.h
@@ -22,4 +22,4 @@
 
 extern void logger_info_init ();
 
-#endif /* logger-info.h */
+#endif /* __WEECHAT_LOGGER_INFO_H */
diff --git a/src/plugins/logger/logger-tail.h b/src/plugins/logger/logger-tail.h
index 889f022dc..203059f86 100644
--- a/src/plugins/logger/logger-tail.h
+++ b/src/plugins/logger/logger-tail.h
@@ -30,4 +30,4 @@ extern struct t_logger_line *logger_tail_file (const char *filename,
                                                int n_lines);
 extern void logger_tail_free (struct t_logger_line *lines);
 
-#endif /* logger-tail.h */
+#endif /* __WEECHAT_LOGGER_TAIL_H */
diff --git a/src/plugins/logger/logger.h b/src/plugins/logger/logger.h
index 245547759..6c3643967 100644
--- a/src/plugins/logger/logger.h
+++ b/src/plugins/logger/logger.h
@@ -32,4 +32,4 @@ extern void logger_start_buffer_all (int write_info_line);
 extern void logger_stop_all (int write_info_line);
 extern void logger_adjust_log_filenames ();
 
-#endif /* logger.h */
+#endif /* __WEECHAT_LOGGER_H */
diff --git a/src/plugins/plugin-api.h b/src/plugins/plugin-api.h
index 9736ab70d..9a188480d 100644
--- a/src/plugins/plugin-api.h
+++ b/src/plugins/plugin-api.h
@@ -66,4 +66,4 @@ extern void plugin_api_infolist_free (struct t_infolist *infolist);
 
 extern void plugin_api_init ();
 
-#endif /* plugin-api.h */
+#endif /* __WEECHAT_PLUGIN_API_H */
diff --git a/src/plugins/plugin-config.h b/src/plugins/plugin-config.h
index 9abe1238f..38ee76e98 100644
--- a/src/plugins/plugin-config.h
+++ b/src/plugins/plugin-config.h
@@ -34,4 +34,4 @@ extern int plugin_config_read ();
 extern int plugin_config_write ();
 extern void plugin_config_end ();
 
-#endif /* plugin-config.h */
+#endif /* __WEECHAT_PLUGIN_CONFIG_H */
diff --git a/src/plugins/plugin.h b/src/plugins/plugin.h
index a28ac3bab..0a1b42b8a 100644
--- a/src/plugins/plugin.h
+++ b/src/plugins/plugin.h
@@ -46,4 +46,4 @@ extern int plugin_add_to_infolist (struct t_infolist *infolist,
                                    struct t_weechat_plugin *plugin);
 extern void plugin_print_log ();
 
-#endif /* plugin.h */
+#endif /* __WEECHAT_PLUGIN_H */
diff --git a/src/plugins/relay/relay-buffer.h b/src/plugins/relay/relay-buffer.h
index fb8b0995f..555e44640 100644
--- a/src/plugins/relay/relay-buffer.h
+++ b/src/plugins/relay/relay-buffer.h
@@ -17,8 +17,8 @@
  * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __WEECHAT_RELAY_DISPLAY_H
-#define __WEECHAT_RELAY_DISPLAY_H 1
+#ifndef __WEECHAT_RELAY_BUFFER_H
+#define __WEECHAT_RELAY_BUFFER_H 1
 
 extern struct t_gui_buffer *relay_buffer;
 extern int relay_buffer_selected_line;
@@ -29,4 +29,4 @@ extern int relay_buffer_input_cb (void *data, struct t_gui_buffer *buffer,
 extern int relay_buffer_close_cb (void *data, struct t_gui_buffer *buffer);
 extern void relay_buffer_open ();
 
-#endif /* relay-buffer.h */
+#endif /* __WEECHAT_RELAY_BUFFER_H */
diff --git a/src/plugins/relay/relay-client.h b/src/plugins/relay/relay-client.h
index 48b057eef..fa0b5818a 100644
--- a/src/plugins/relay/relay-client.h
+++ b/src/plugins/relay/relay-client.h
@@ -82,4 +82,4 @@ extern int relay_client_add_to_infolist (struct t_infolist *infolist,
                                          struct t_relay_client *client);
 extern void relay_client_print_log ();
 
-#endif /* relay-client.h */
+#endif /* __WEECHAT_RELAY_CLIENT_H */
diff --git a/src/plugins/relay/relay-command.h b/src/plugins/relay/relay-command.h
index 0ceee0d82..943516abb 100644
--- a/src/plugins/relay/relay-command.h
+++ b/src/plugins/relay/relay-command.h
@@ -22,4 +22,4 @@
 
 extern void relay_command_init ();
 
-#endif /* relay-command.h */
+#endif /* __WEECHAT_RELAY_COMMAND_H */
diff --git a/src/plugins/relay/relay-completion.h b/src/plugins/relay/relay-completion.h
index 586d52e40..b8cb0d04a 100644
--- a/src/plugins/relay/relay-completion.h
+++ b/src/plugins/relay/relay-completion.h
@@ -22,4 +22,4 @@
 
 extern void relay_completion_init ();
 
-#endif /* relay-completion.h */
+#endif /* __WEECHAT_RELAY_COMPLETION_H */
diff --git a/src/plugins/relay/relay-config.h b/src/plugins/relay/relay-config.h
index d71da0315..5790b3261 100644
--- a/src/plugins/relay/relay-config.h
+++ b/src/plugins/relay/relay-config.h
@@ -43,4 +43,4 @@ extern int relay_config_init ();
 extern int relay_config_read ();
 extern int relay_config_write ();
 
-#endif /* relay-config.h */
+#endif /* __WEECHAT_RELAY_CONFIG_H */
diff --git a/src/plugins/relay/relay-info.h b/src/plugins/relay/relay-info.h
index 48b1bb088..580a5c5af 100644
--- a/src/plugins/relay/relay-info.h
+++ b/src/plugins/relay/relay-info.h
@@ -22,4 +22,4 @@
 
 extern void relay_info_init ();
 
-#endif /* relay-info.h */
+#endif /* __WEECHAT_RELAY_INFO_H */
diff --git a/src/plugins/relay/relay-protocol-irc.h b/src/plugins/relay/relay-protocol-irc.h
index c964a4092..f92a2b503 100644
--- a/src/plugins/relay/relay-protocol-irc.h
+++ b/src/plugins/relay/relay-protocol-irc.h
@@ -43,4 +43,4 @@ extern void relay_protocol_irc_alloc (struct t_relay_client *client);
 extern void relay_protocol_irc_free (struct t_relay_client *client);
 extern void relay_protocol_irc_print_log (struct t_relay_client *client);
 
-#endif /* relay-protocol-irc.h */
+#endif /* __WEECHAT_RELAY_PROTOCOL_IRC_H */
diff --git a/src/plugins/relay/relay-protocol-weechat.h b/src/plugins/relay/relay-protocol-weechat.h
index a40d6a49e..8466868d9 100644
--- a/src/plugins/relay/relay-protocol-weechat.h
+++ b/src/plugins/relay/relay-protocol-weechat.h
@@ -41,4 +41,4 @@ extern void relay_protocol_weechat_alloc (struct t_relay_client *client);
 extern void relay_protocol_weechat_free (struct t_relay_client *client);
 extern void relay_protocol_weechat_print_log (struct t_relay_client *client);
 
-#endif /* relay-protocol-weechat.h */
+#endif /* __WEECHAT_RELAY_PROTOCOL_WEECHAT_H */
diff --git a/src/plugins/relay/relay-server.h b/src/plugins/relay/relay-server.h
index 1cd76dec3..bb57a2e5f 100644
--- a/src/plugins/relay/relay-server.h
+++ b/src/plugins/relay/relay-server.h
@@ -49,4 +49,4 @@ extern void relay_server_free (struct t_relay_server *server);
 extern void relay_server_free_all ();
 extern void relay_server_print_log ();
 
-#endif /* relay-server.h */
+#endif /* __WEECHAT_RELAY_SERVER_H */
diff --git a/src/plugins/relay/relay-upgrade.h b/src/plugins/relay/relay-upgrade.h
index c9b2ab89b..6d308fec3 100644
--- a/src/plugins/relay/relay-upgrade.h
+++ b/src/plugins/relay/relay-upgrade.h
@@ -32,4 +32,4 @@ enum t_relay_upgrade_type
 extern int relay_upgrade_save ();
 extern int relay_upgrade_load ();
 
-#endif /* relay-upgrade.h */
+#endif /* __WEECHAT_RELAY_UPGRADE_H */
diff --git a/src/plugins/relay/relay.h b/src/plugins/relay/relay.h
index dcc7a9549..533a0b370 100644
--- a/src/plugins/relay/relay.h
+++ b/src/plugins/relay/relay.h
@@ -43,4 +43,4 @@ extern char *relay_protocol_string[];
 
 extern int relay_protocol_search (const char *name);
 
-#endif /* relay.h */
+#endif /* __WEECHAT_RELAY_H */
diff --git a/src/plugins/scripts/lua/weechat-lua-api.h b/src/plugins/scripts/lua/weechat-lua-api.h
index 30d3b8337..3a834e422 100644
--- a/src/plugins/scripts/lua/weechat-lua-api.h
+++ b/src/plugins/scripts/lua/weechat-lua-api.h
@@ -29,4 +29,4 @@ extern int weechat_lua_api_buffer_input_data_cb (void *data,
 extern int weechat_lua_api_buffer_close_cb (void *data,
                                             struct t_gui_buffer *buffer);
 
-#endif /* weechat-lua.h */
+#endif /* __WEECHAT_LUA_API_H */
diff --git a/src/plugins/scripts/lua/weechat-lua.h b/src/plugins/scripts/lua/weechat-lua.h
index a2131205f..fe5c11fc1 100644
--- a/src/plugins/scripts/lua/weechat-lua.h
+++ b/src/plugins/scripts/lua/weechat-lua.h
@@ -40,4 +40,4 @@ extern void *weechat_lua_exec (struct t_plugin_script *script,
                                int ret_type, const char *function,
                                char **argv);
 
-#endif /* weechat-lua.h */
+#endif /* __WEECHAT_LUA_H */
diff --git a/src/plugins/scripts/perl/weechat-perl-api.h b/src/plugins/scripts/perl/weechat-perl-api.h
index bd3b9b314..a33d0520f 100644
--- a/src/plugins/scripts/perl/weechat-perl-api.h
+++ b/src/plugins/scripts/perl/weechat-perl-api.h
@@ -27,4 +27,4 @@ extern int weechat_perl_api_buffer_close_cb (void *data,
                                              struct t_gui_buffer *buffer);
 extern void weechat_perl_api_init (pTHX);
 
-#endif /* weechat-perl.h */
+#endif /* __WEECHAT_PERL_API_H */
diff --git a/src/plugins/scripts/perl/weechat-perl.h b/src/plugins/scripts/perl/weechat-perl.h
index f5e209538..ec75dbc1f 100644
--- a/src/plugins/scripts/perl/weechat-perl.h
+++ b/src/plugins/scripts/perl/weechat-perl.h
@@ -38,4 +38,4 @@ extern void *weechat_perl_exec (struct t_plugin_script *script,
                                 int ret_type, const char *function,
                                 char **argv);
 
-#endif /* weechat-perl.h */
+#endif /* __WEECHAT_PERL_H */
diff --git a/src/plugins/scripts/python/weechat-python-api.h b/src/plugins/scripts/python/weechat-python-api.h
index a0830ac4b..a2a7e9454 100644
--- a/src/plugins/scripts/python/weechat-python-api.h
+++ b/src/plugins/scripts/python/weechat-python-api.h
@@ -29,4 +29,4 @@ extern int weechat_python_api_buffer_input_data_cb (void *data,
 extern int weechat_python_api_buffer_close_cb (void *data,
                                                struct t_gui_buffer *buffer);
 
-#endif /* weechat-python.h */
+#endif /* __WEECHAT_PYTHON_API_H */
diff --git a/src/plugins/scripts/python/weechat-python.h b/src/plugins/scripts/python/weechat-python.h
index 7966d36d4..9a456401f 100644
--- a/src/plugins/scripts/python/weechat-python.h
+++ b/src/plugins/scripts/python/weechat-python.h
@@ -39,4 +39,4 @@ extern void *weechat_python_exec (struct t_plugin_script *script,
                                   int ret_type, const char *function,
                                   char **argv);
 
-#endif /* weechat-perl.h */
+#endif /* __WEECHAT_PYTHON_H */
diff --git a/src/plugins/scripts/ruby/weechat-ruby-api.h b/src/plugins/scripts/ruby/weechat-ruby-api.h
index 4742e71d6..f75f478eb 100644
--- a/src/plugins/scripts/ruby/weechat-ruby-api.h
+++ b/src/plugins/scripts/ruby/weechat-ruby-api.h
@@ -28,4 +28,4 @@ extern int weechat_ruby_api_buffer_close_cb (void *data,
                                              struct t_gui_buffer *buffer);
 extern void weechat_ruby_api_init (VALUE ruby_mWeechat);
 
-#endif /* weechat-ruby.h */
+#endif /* __WEECHAT_RUBY_API_H */
diff --git a/src/plugins/scripts/ruby/weechat-ruby.h b/src/plugins/scripts/ruby/weechat-ruby.h
index f61a568d0..2ef5cbbf4 100644
--- a/src/plugins/scripts/ruby/weechat-ruby.h
+++ b/src/plugins/scripts/ruby/weechat-ruby.h
@@ -39,4 +39,4 @@ extern void *weechat_ruby_exec (struct t_plugin_script *script,
                                 int ret_type, const char *function,
                                 char **argv);
 
-#endif /* weechat-perl.h */
+#endif /* __WEECHAT_RUBY_H */
diff --git a/src/plugins/scripts/script-api.h b/src/plugins/scripts/script-api.h
index 0bb4c9c10..94be78410 100644
--- a/src/plugins/scripts/script-api.h
+++ b/src/plugins/scripts/script-api.h
@@ -311,4 +311,4 @@ extern int script_api_upgrade_read (struct t_weechat_plugin *weechat_plugin,
                                     const char *function,
                                     const char *data);
 
-#endif /* script-api.h */
+#endif /* __WEECHAT_SCRIPT_API_H */
diff --git a/src/plugins/scripts/script-callback.h b/src/plugins/scripts/script-callback.h
index db9f38dd9..ec34e2e1b 100644
--- a/src/plugins/scripts/script-callback.h
+++ b/src/plugins/scripts/script-callback.h
@@ -50,4 +50,4 @@ extern void script_callback_remove_all (struct t_plugin_script *script);
 extern void script_callback_print_log (struct t_weechat_plugin *weechat_plugin,
                                        struct t_script_callback *script_callback);
 
-#endif /* script-callback.h */
+#endif /* __WEECHAT_SCRIPT_CALLBACK_H */
diff --git a/src/plugins/scripts/script.h b/src/plugins/scripts/script.h
index 3f7f86cc5..767259d9c 100644
--- a/src/plugins/scripts/script.h
+++ b/src/plugins/scripts/script.h
@@ -150,4 +150,4 @@ extern void script_end (struct t_weechat_plugin *weechat_plugin,
 extern void script_print_log (struct t_weechat_plugin *weechat_plugin,
                               struct t_plugin_script *scripts);
 
-#endif /* script.h */
+#endif /* __WEECHAT_SCRIPT_H */
diff --git a/src/plugins/scripts/tcl/weechat-tcl-api.h b/src/plugins/scripts/tcl/weechat-tcl-api.h
index c9a461b36..0b58d3094 100644
--- a/src/plugins/scripts/tcl/weechat-tcl-api.h
+++ b/src/plugins/scripts/tcl/weechat-tcl-api.h
@@ -28,4 +28,4 @@ extern int weechat_tcl_api_buffer_close_cb (void *data,
                                             struct t_gui_buffer *buffer);
 extern void weechat_tcl_api_init (Tcl_Interp *interp);
 
-#endif /* weechat-tcl.h */
+#endif /* __WEECHAT_TCL_API_H */
diff --git a/src/plugins/scripts/tcl/weechat-tcl.h b/src/plugins/scripts/tcl/weechat-tcl.h
index c4bce34a4..78972233e 100644
--- a/src/plugins/scripts/tcl/weechat-tcl.h
+++ b/src/plugins/scripts/tcl/weechat-tcl.h
@@ -39,4 +39,4 @@ extern void *weechat_tcl_exec (struct t_plugin_script *script,
                                 int ret_type, const char *function,
                                 char **argv);
 
-#endif /* weechat-tcl.h */
+#endif /* __WEECHAT_TCL_H */
diff --git a/src/plugins/weechat-plugin.h b/src/plugins/weechat-plugin.h
index 65d79e1f2..8b3a74f84 100644
--- a/src/plugins/weechat-plugin.h
+++ b/src/plugins/weechat-plugin.h
@@ -1230,4 +1230,4 @@ extern int weechat_plugin_end (struct t_weechat_plugin *plugin);
 #define weechat_upgrade_close(__upgrade_file)                           \
     weechat_plugin->upgrade_close(__upgrade_file)
 
-#endif /* weechat-plugin.h */
+#endif /* __WEECHAT_WEECHAT_PLUGIN_H */
diff --git a/src/plugins/xfer/xfer-buffer.h b/src/plugins/xfer/xfer-buffer.h
index b0874631d..2615eb630 100644
--- a/src/plugins/xfer/xfer-buffer.h
+++ b/src/plugins/xfer/xfer-buffer.h
@@ -17,8 +17,8 @@
  * along with WeeChat.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __WEECHAT_XFER_DISPLAY_H
-#define __WEECHAT_XFER_DISPLAY_H 1
+#ifndef __WEECHAT_XFER_BUFFER_H
+#define __WEECHAT_XFER_BUFFER_H 1
 
 #define XFER_BUFFER_NAME "xfer.list"
 
@@ -31,4 +31,4 @@ extern int xfer_buffer_input_cb (void *data, struct t_gui_buffer *buffer,
 extern int xfer_buffer_close_cb (void *data, struct t_gui_buffer *buffer);
 extern void xfer_buffer_open ();
 
-#endif /* xfer-buffer.h */
+#endif /* __WEECHAT_XFER_BUFFER_H */
diff --git a/src/plugins/xfer/xfer-chat.h b/src/plugins/xfer/xfer-chat.h
index ce7699c6f..de802e858 100644
--- a/src/plugins/xfer/xfer-chat.h
+++ b/src/plugins/xfer/xfer-chat.h
@@ -24,4 +24,4 @@ extern void xfer_chat_sendf (struct t_xfer *xfer, const char *format, ...);
 extern int xfer_chat_recv_cb (void *arg_xfer, int fd);
 extern void xfer_chat_open_buffer (struct t_xfer *xfer);
 
-#endif /* xfer-chat.h */
+#endif /* __WEECHAT_XFER_CHAT_H */
diff --git a/src/plugins/xfer/xfer-command.h b/src/plugins/xfer/xfer-command.h
index 2264134bb..03dc5f49a 100644
--- a/src/plugins/xfer/xfer-command.h
+++ b/src/plugins/xfer/xfer-command.h
@@ -22,4 +22,4 @@
 
 extern void xfer_command_init ();
 
-#endif /* xfer-command.h */
+#endif /* __WEECHAT_XFER_COMMAND_H */
diff --git a/src/plugins/xfer/xfer-completion.h b/src/plugins/xfer/xfer-completion.h
index b877a8339..ddba64563 100644
--- a/src/plugins/xfer/xfer-completion.h
+++ b/src/plugins/xfer/xfer-completion.h
@@ -22,4 +22,4 @@
 
 extern void xfer_completion_init ();
 
-#endif /* xfer-completion.h */
+#endif /* __WEECHAT_XFER_COMPLETION_H */
diff --git a/src/plugins/xfer/xfer-config.h b/src/plugins/xfer/xfer-config.h
index e7bf27096..7bdfee607 100644
--- a/src/plugins/xfer/xfer-config.h
+++ b/src/plugins/xfer/xfer-config.h
@@ -54,4 +54,4 @@ extern int xfer_config_init ();
 extern int xfer_config_read ();
 extern int xfer_config_write ();
 
-#endif /* xfer-config.h */
+#endif /* __WEECHAT_XFER_CONFIG_H */
diff --git a/src/plugins/xfer/xfer-dcc.h b/src/plugins/xfer/xfer-dcc.h
index b4d2c83d4..2399315c6 100644
--- a/src/plugins/xfer/xfer-dcc.h
+++ b/src/plugins/xfer/xfer-dcc.h
@@ -23,4 +23,4 @@
 extern void xfer_dcc_send_file_child (struct t_xfer *xfer);
 extern void xfer_dcc_recv_file_child (struct t_xfer *xfer);
 
-#endif /* xfer-dcc.h */
+#endif /* __WEECHAT_XFER_DCC_H */
diff --git a/src/plugins/xfer/xfer-file.h b/src/plugins/xfer/xfer-file.h
index 55c5a4b19..02dff53fc 100644
--- a/src/plugins/xfer/xfer-file.h
+++ b/src/plugins/xfer/xfer-file.h
@@ -23,4 +23,4 @@
 extern void xfer_file_find_filename (struct t_xfer *xfer);
 extern void xfer_file_calculate_speed (struct t_xfer *xfer, int ended);
 
-#endif /* xfer-file.h */
+#endif /* __WEECHAT_XFER_FILE_H */
diff --git a/src/plugins/xfer/xfer-info.h b/src/plugins/xfer/xfer-info.h
index c1eff4fee..00a3f09df 100644
--- a/src/plugins/xfer/xfer-info.h
+++ b/src/plugins/xfer/xfer-info.h
@@ -22,4 +22,4 @@
 
 extern void xfer_info_init ();
 
-#endif /* xfer-info.h */
+#endif /* __WEECHAT_XFER_INFO_H */
diff --git a/src/plugins/xfer/xfer-network.h b/src/plugins/xfer/xfer-network.h
index 03e9303cb..4b76adb82 100644
--- a/src/plugins/xfer/xfer-network.h
+++ b/src/plugins/xfer/xfer-network.h
@@ -27,4 +27,4 @@ extern void xfer_network_child_kill (struct t_xfer *xfer);
 extern int xfer_network_connect (struct t_xfer *xfer);
 extern void xfer_network_accept (struct t_xfer *xfer);
 
-#endif /* xfer-network.h */
+#endif /* __WEECHAT_XFER_NETWORK_H */
diff --git a/src/plugins/xfer/xfer-upgrade.h b/src/plugins/xfer/xfer-upgrade.h
index 50c4e96c9..c24719e42 100644
--- a/src/plugins/xfer/xfer-upgrade.h
+++ b/src/plugins/xfer/xfer-upgrade.h
@@ -32,4 +32,4 @@ enum t_xfer_upgrade_type
 extern int xfer_upgrade_save ();
 extern int xfer_upgrade_load ();
 
-#endif /* xfer-upgrade.h */
+#endif /* __WEECHAT_XFER_UPGRADE_H */
diff --git a/src/plugins/xfer/xfer.h b/src/plugins/xfer/xfer.h
index cf3c0affa..694ded453 100644
--- a/src/plugins/xfer/xfer.h
+++ b/src/plugins/xfer/xfer.h
@@ -167,4 +167,4 @@ extern void xfer_free (struct t_xfer *xfer);
 extern int xfer_add_to_infolist (struct t_infolist *infolist,
                                  struct t_xfer *xfer);
 
-#endif /* xfer.h */
+#endif /* __WEECHAT_XFER_H */