diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h
index 44a46d288..06ae83046 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -22,14 +22,19 @@
 
 #define IRC_CONFIG_NAME "irc"
 
-#define IRC_CONFIG_NICK_COMPLETION_SMART_OFF                 0
-#define IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS            1
-#define IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS_HIGHLIGHTS 2
-
-#define IRC_CONFIG_DISPLAY_AWAY_OFF     0
-#define IRC_CONFIG_DISPLAY_AWAY_LOCAL   1
-#define IRC_CONFIG_DISPLAY_AWAY_CHANNEL 2
+enum t_irc_config_nick_completion
+{
+    IRC_CONFIG_NICK_COMPLETION_SMART_OFF = 0,
+    IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS,
+    IRC_CONFIG_NICK_COMPLETION_SMART_SPEAKERS_HIGHLIGHTS,
+};
 
+enum t_irc_config_display_away
+{
+    IRC_CONFIG_DISPLAY_AWAY_OFF = 0,
+    IRC_CONFIG_DISPLAY_AWAY_LOCAL,
+    IRC_CONFIG_DISPLAY_AWAY_CHANNEL,
+};
 
 extern struct t_config_file *irc_config_file;
 extern struct t_config_section *irc_config_section_server_default;
diff --git a/src/plugins/jabber/jabber-config.h b/src/plugins/jabber/jabber-config.h
index 129144a26..c2e59d26b 100644
--- a/src/plugins/jabber/jabber-config.h
+++ b/src/plugins/jabber/jabber-config.h
@@ -22,10 +22,12 @@
 
 #define JABBER_CONFIG_NAME "jabber"
 
-#define JABBER_CONFIG_DISPLAY_AWAY_OFF   0
-#define JABBER_CONFIG_DISPLAY_AWAY_LOCAL 1
-#define JABBER_CONFIG_DISPLAY_AWAY_MUC   2
-
+enum t_jabber_config_display_away
+{
+    JABBER_CONFIG_DISPLAY_AWAY_OFF = 0,
+    JABBER_CONFIG_DISPLAY_AWAY_LOCAL,
+    JABBER_CONFIG_DISPLAY_AWAY_MUC,
+};
 
 extern struct t_config_file *jabber_config_file;
 extern struct t_config_section *jabber_config_section_server_default;