Make header defines consistent

33 files changed, 75 insertions, 60 deletions

diff --git a/src/command/cmd_ac.h b/src/command/cmd_ac.h
index 79b1806c..bdfd8b80 100644
--- a/src/command/cmd_ac.h
+++ b/src/command/cmd_ac.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CMD_AC_H
-#define CMD_AC_H
+#ifndef COMMAND_CMD_AC_H
+#define COMMAND_CMD_AC_H
 
 #include "config/preferences.h"
 #include "command/cmd_funcs.h"
diff --git a/src/command/cmd_defs.h b/src/command/cmd_defs.h
index 3d4f3fad..3f07693b 100644
--- a/src/command/cmd_defs.h
+++ b/src/command/cmd_defs.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CMD_DEFS_H
-#define CMD_DEFS_H
+#ifndef COMMAND_CMD_DEFS_H
+#define COMMAND_CMD_DEFS_H
 
 #include <glib.h>
 
diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h
index c91fd9c6..4d0f4a86 100644
--- a/src/command/cmd_funcs.h
+++ b/src/command/cmd_funcs.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CMD_FUNCS_H
-#define CMD_FUNCS_H
+#ifndef COMMAND_CMD_FUNCS_H
+#define COMMAND_CMD_FUNCS_H
 
 #include "ui/win_types.h"
 
diff --git a/src/config/account.h b/src/config/account.h
index e268d77d..09166752 100644
--- a/src/config/account.h
+++ b/src/config/account.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ACCOUNT_H
-#define ACCOUNT_H
+#ifndef CONFIG_ACCOUNT_H
+#define CONFIG_ACCOUNT_H
 
 #include "common.h"
 
diff --git a/src/config/accounts.h b/src/config/accounts.h
index 4bc8fc14..7524c65e 100644
--- a/src/config/accounts.h
+++ b/src/config/accounts.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef ACCOUNTS_H
-#define ACCOUNTS_H
+#ifndef CONFIG_ACCOUNTS_H
+#define CONFIG_ACCOUNTS_H
 
 #define MAX_PASSWORD_SIZE 64
 
diff --git a/src/config/conflists.h b/src/config/conflists.h
index d1f3f211..5fb280e1 100644
--- a/src/config/conflists.h
+++ b/src/config/conflists.h
@@ -32,9 +32,14 @@
  *
  */
 
+#ifndef CONFIG_CONFLISTS_H
+#define CONFIG_CONFLISTS_H
+
 #include <glib.h>
 
 gboolean conf_string_list_add(GKeyFile *keyfile, const char *const group, const char *const key,
     const char *const item);
 gboolean conf_string_list_remove(GKeyFile *keyfile, const char *const group, const char *const key,
     const char *const item);
+
+#endif
diff --git a/src/config/preferences.h b/src/config/preferences.h
index 5174d076..621b1760 100644
--- a/src/config/preferences.h
+++ b/src/config/preferences.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PREFERENCES_H
-#define PREFERENCES_H
+#ifndef CONFIG_PREFERENCES_H
+#define CONFIG_PREFERENCES_H
 
 #include "config.h"
 
diff --git a/src/config/scripts.h b/src/config/scripts.h
index de4bde69..aa2ba3d7 100644
--- a/src/config/scripts.h
+++ b/src/config/scripts.h
@@ -32,9 +32,14 @@
  *
  */
 
+#ifndef CONFIG_SCRIPTS_H
+#define CONFIG_SCRIPTS_H
+
 #include <glib.h>
 
 void scripts_init(void);
 GSList* scripts_list(void);
 GSList* scripts_read(const char *const script);
 gboolean scripts_exec(const char *const script);
+
+#endif
diff --git a/src/config/theme.h b/src/config/theme.h
index 20868ffc..c8e740b2 100644
--- a/src/config/theme.h
+++ b/src/config/theme.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef THEME_H
-#define THEME_H
+#ifndef CONFIG_THEME_H
+#define CONFIG_THEME_H
 
 #include "config.h"
 
diff --git a/src/config/tlscerts.h b/src/config/tlscerts.h
index 8e9bdfa4..0001fc28 100644
--- a/src/config/tlscerts.h
+++ b/src/config/tlscerts.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef TLSCERTS_H
-#define TLSCERTS_H
+#ifndef CONFIG_TLSCERTS_H
+#define CONFIG_TLSCERTS_H
 
 typedef struct tls_cert_t {
     int version;
diff --git a/src/event/client_events.h b/src/event/client_events.h
index 39bb1372..876a0d54 100644
--- a/src/event/client_events.h
+++ b/src/event/client_events.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CLIENT_EVENTS_H
-#define CLIENT_EVENTS_H
+#ifndef EVENT_CLIENT_EVENTS_H
+#define EVENT_CLIENT_EVENTS_H
 
 #include "xmpp/xmpp.h"
 
diff --git a/src/event/server_events.h b/src/event/server_events.h
index ace049ad..7f60c3a5 100644
--- a/src/event/server_events.h
+++ b/src/event/server_events.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef SERVER_EVENTS_H
-#define SERVER_EVENTS_H
+#ifndef EVENT_SERVER_EVENTS_H
+#define EVENT_SERVER_EVENTS_H
 
 #include "xmpp/xmpp.h"
 
diff --git a/src/otr/otr.h b/src/otr/otr.h
index be8af6d4..0853f4fc 100644
--- a/src/otr/otr.h
+++ b/src/otr/otr.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef OTR_H
-#define OTR_H
+#ifndef OTR_OTR_H
+#define OTR_OTR_H
 
 #include <libotr/proto.h>
 #include <libotr/message.h>
diff --git a/src/otr/otrlib.h b/src/otr/otrlib.h
index b669ee20..1031f8c1 100644
--- a/src/otr/otrlib.h
+++ b/src/otr/otrlib.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef OTRLIB_H
-#define OTRLIB_H
+#ifndef OTR_OTRLIB_H
+#define OTR_OTRLIB_H
 
 OtrlPolicy otrlib_policy(void);
 
diff --git a/src/pgp/gpg.h b/src/pgp/gpg.h
index e2616b98..038578ef 100644
--- a/src/pgp/gpg.h
+++ b/src/pgp/gpg.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef GPG_H
-#define GPG_H
+#ifndef PGP_GPG_H
+#define PGP_GPG_H
 
 typedef struct pgp_key_t {
     char *id;
diff --git a/src/plugins/api.h b/src/plugins/api.h
index 126facb5..db1417cf 100644
--- a/src/plugins/api.h
+++ b/src/plugins/api.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef API_H
-#define API_H
+#ifndef PLUGINS_API_H
+#define PLUGINS_API_H
 
 #include "plugins/callbacks.h"
 
diff --git a/src/plugins/autocompleters.h b/src/plugins/autocompleters.h
index 08b06962..15580514 100644
--- a/src/plugins/autocompleters.h
+++ b/src/plugins/autocompleters.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef AUTOCOMPLETERS_H
-#define AUTOCOMPLETERS_H
+#ifndef PLUGINS_AUTOCOMPLETERS_H
+#define PLUGINS_AUTOCOMPLETERS_H
 
 #include <glib.h>
 
diff --git a/src/plugins/c_api.h b/src/plugins/c_api.h
index 2f541e2f..40281fcf 100644
--- a/src/plugins/c_api.h
+++ b/src/plugins/c_api.h
@@ -32,6 +32,9 @@
  *
  */
 
+#ifndef PLUGINS_C_API_H
+#define PLUGINS_C_API_H
+
 #include <glib.h>
 
 void c_api_init(void);
@@ -39,3 +42,5 @@ void c_api_init(void);
 void c_command_callback(PluginCommand *command, gchar **args);
 void c_timed_callback(PluginTimedFunction *timed_function);
 void c_window_callback(PluginWindowCallback *window_callback, char *tag, char *line);
+
+#endif
diff --git a/src/plugins/c_plugins.h b/src/plugins/c_plugins.h
index a042fbc1..80c3ffe7 100644
--- a/src/plugins/c_plugins.h
+++ b/src/plugins/c_plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef C_PLUGINS_H
-#define C_PLUGINS_H
+#ifndef PLUGINS_C_PLUGINS_H
+#define PLUGINS_C_PLUGINS_H
 
 #include "plugins/plugins.h"
 
diff --git a/src/plugins/callbacks.h b/src/plugins/callbacks.h
index 8620e47b..4fea2151 100644
--- a/src/plugins/callbacks.h
+++ b/src/plugins/callbacks.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CALLBACKS_H
-#define CALLBACKS_H
+#ifndef PLUGINS_CALLBACKS_H
+#define PLUGINS_CALLBACKS_H
 
 #include <glib.h>
 
diff --git a/src/plugins/disco.h b/src/plugins/disco.h
index 2f7799ab..0fb3f628 100644
--- a/src/plugins/disco.h
+++ b/src/plugins/disco.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef DISCO_H
-#define DISCO_H
+#ifndef PLUGINS_DISCO_H
+#define PLUGINS_DISCO_H
 
 void disco_add_feature(char *feature);
 GList* disco_get_features(void);
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index c5cc56c2..4a324a5f 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGINS_H
-#define PLUGINS_H
+#ifndef PLUGINS_PLUGINS_H
+#define PLUGINS_PLUGINS_H
 
 #include "command/cmd_defs.h"
 
diff --git a/src/plugins/profapi.h b/src/plugins/profapi.h
index cde726f7..1e2e8b01 100644
--- a/src/plugins/profapi.h
+++ b/src/plugins/profapi.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PROF_API_H
-#define PROF_API_H
+#ifndef PLUGINS_PROF_API_H
+#define PLUGINS_PROF_API_H
 
 #define prof_register_command(command_name, min_args, max_args, synopsis, description, arguments, examples, callback) _prof_register_command(__FILE__, command_name, min_args, max_args, synopsis, description, arguments, examples, callback)
 #define prof_register_timed(callback, interval_seconds) _prof_register_timed(__FILE__, callback, interval_seconds)
diff --git a/src/plugins/python_api.h b/src/plugins/python_api.h
index 27c17a3d..335821d0 100644
--- a/src/plugins/python_api.h
+++ b/src/plugins/python_api.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PYTHON_API_H
-#define PYTHON_API_H
+#ifndef PLUGINS_PYTHON_API_H
+#define PLUGINS_PYTHON_API_H
 
 void python_env_init(void);
 void python_init_prof(void);
diff --git a/src/plugins/python_plugins.h b/src/plugins/python_plugins.h
index dda73405..f0ac48a5 100644
--- a/src/plugins/python_plugins.h
+++ b/src/plugins/python_plugins.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PYTHON_PLUGINS_H
-#define PYTHON_PLUGINS_H
+#ifndef PLUGINS_PYTHON_PLUGINS_H
+#define PLUGINS_PYTHON_PLUGINS_H
 
 #include "plugins/plugins.h"
 
diff --git a/src/plugins/settings.h b/src/plugins/settings.h
index 2c91b0c9..09913243 100644
--- a/src/plugins/settings.h
+++ b/src/plugins/settings.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGIN_SETTINGS_H
-#define PLUGIN_SETTINGS_H
+#ifndef PLUGINS_SETTINGS_H
+#define PLUGINS_SETTINGS_H
 
 void plugin_settings_init(void);
 void plugin_settings_close(void);
diff --git a/src/plugins/themes.h b/src/plugins/themes.h
index 9c3c4a8c..398eb9e3 100644
--- a/src/plugins/themes.h
+++ b/src/plugins/themes.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PLUGIN_THEMES_H
-#define PLUGIN_THEMES_H
+#ifndef PLUGINS_THEMES_H
+#define PLUGINS_THEMES_H
 
 void plugin_themes_init(void);
 void plugin_themes_close(void);
diff --git a/src/tools/autocomplete.h b/src/tools/autocomplete.h
index 72652b5b..7c2a2f4a 100644
--- a/src/tools/autocomplete.h
+++ b/src/tools/autocomplete.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef AUTOCOMPLETE_H
-#define AUTOCOMPLETE_H
+#ifndef TOOLS_AUTOCOMPLETE_H
+#define TOOLS_AUTOCOMPLETE_H
 
 #include <glib.h>
 
diff --git a/src/tools/parser.h b/src/tools/parser.h
index babc874e..b5ce5383 100644
--- a/src/tools/parser.h
+++ b/src/tools/parser.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PARSER_H
-#define PARSER_H
+#ifndef TOOLS_PARSER_H
+#define TOOLS_PARSER_H
 
 #include <glib.h>
 
diff --git a/src/tools/tinyurl.h b/src/tools/tinyurl.h
index 62acfeab..e30d9773 100644
--- a/src/tools/tinyurl.h
+++ b/src/tools/tinyurl.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef TINYURL_H
-#define TINYURL_H
+#ifndef TOOLS_TINYURL_H
+#define TOOLS_TINYURL_H
 
 #include <glib.h>
 
diff --git a/src/tray.h b/src/tray.h
index 76173cfe..1f8f13d8 100644
--- a/src/tray.h
+++ b/src/tray.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef PROFANITY_TRAY_H
-#define PROFANITY_TRAY_H
+#ifndef TRAY_H
+#define TRAY_H
 
 void tray_init(void);
 void tray_update(void);
diff --git a/src/xmpp/chat_state.h b/src/xmpp/chat_state.h
index 393598ba..8fcfabf5 100644
--- a/src/xmpp/chat_state.h
+++ b/src/xmpp/chat_state.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef CHAT_STATE_H
-#define CHAT_STATE_H
+#ifndef XMPP_CHAT_STATE_H
+#define XMPP_CHAT_STATE_H
 
 #include <glib.h>
 
diff --git a/src/xmpp/form.h b/src/xmpp/form.h
index 8ae8e75a..f9740d68 100644
--- a/src/xmpp/form.h
+++ b/src/xmpp/form.h
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef FORM_H
-#define FORM_H
+#ifndef XMPP_FORM_H
+#define XMPP_FORM_H
 
 #include "xmpp/xmpp.h"