diff --git a/src/core/hook/wee-hook-fd.h b/src/core/hook/wee-hook-fd.h
index c517ebcd7..13ef57fb0 100644
--- a/src/core/hook/wee-hook-fd.h
+++ b/src/core/hook/wee-hook-fd.h
@@ -26,9 +26,9 @@ struct t_infolist_item;
 #define HOOK_FD(hook, var) (((struct t_hook_fd *)hook->hook_data)->var)
 
 /* flags for fd hooks */
-#define HOOK_FD_FLAG_READ       1
-#define HOOK_FD_FLAG_WRITE      2
-#define HOOK_FD_FLAG_EXCEPTION  4
+#define HOOK_FD_FLAG_READ      (1 << 0)
+#define HOOK_FD_FLAG_WRITE     (1 << 1)
+#define HOOK_FD_FLAG_EXCEPTION (1 << 2)
 
 typedef int (t_hook_callback_fd)(const void *pointer, void *data, int fd);
 
diff --git a/src/plugins/irc/irc-raw.h b/src/plugins/irc/irc-raw.h
index b20781e87..db431ce6a 100644
--- a/src/plugins/irc/irc-raw.h
+++ b/src/plugins/irc/irc-raw.h
@@ -30,11 +30,11 @@
 #define IRC_RAW_PREFIX_SEND          "<--"
 #define IRC_RAW_PREFIX_SEND_MODIFIED "<=="
 
-#define IRC_RAW_FLAG_RECV     1
-#define IRC_RAW_FLAG_SEND     2
-#define IRC_RAW_FLAG_MODIFIED 4
-#define IRC_RAW_FLAG_REDIRECT 8
-#define IRC_RAW_FLAG_BINARY   16
+#define IRC_RAW_FLAG_RECV     (1 << 0)
+#define IRC_RAW_FLAG_SEND     (1 << 1)
+#define IRC_RAW_FLAG_MODIFIED (1 << 2)
+#define IRC_RAW_FLAG_REDIRECT (1 << 3)
+#define IRC_RAW_FLAG_BINARY   (1 << 4)
 
 struct t_irc_raw_message
 {
diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h
index a310b8f50..356d2821f 100644
--- a/src/plugins/irc/irc-server.h
+++ b/src/plugins/irc/irc-server.h
@@ -118,9 +118,9 @@ enum t_irc_server_option
 #define IRC_SERVER_NUM_OUTQUEUES_PRIO 2
 
 /* flags for irc_server_sendf() */
-#define IRC_SERVER_SEND_OUTQ_PRIO_HIGH   1
-#define IRC_SERVER_SEND_OUTQ_PRIO_LOW    2
-#define IRC_SERVER_SEND_RETURN_HASHTABLE 4
+#define IRC_SERVER_SEND_OUTQ_PRIO_HIGH   (1 << 0)
+#define IRC_SERVER_SEND_OUTQ_PRIO_LOW    (1 << 1)
+#define IRC_SERVER_SEND_RETURN_HASHTABLE (1 << 2)
 
 /* version strings */
 #define IRC_SERVER_VERSION_CAP "302"
diff --git a/src/plugins/relay/relay-raw.h b/src/plugins/relay/relay-raw.h
index edefc7135..37bdc7b7e 100644
--- a/src/plugins/relay/relay-raw.h
+++ b/src/plugins/relay/relay-raw.h
@@ -24,13 +24,13 @@
 
 #include "relay-client.h"
 
-#define RELAY_RAW_BUFFER_NAME     "relay_raw"
-#define RELAY_RAW_PREFIX_RECV     "-->"
-#define RELAY_RAW_PREFIX_SEND     "<--"
+#define RELAY_RAW_BUFFER_NAME "relay_raw"
+#define RELAY_RAW_PREFIX_RECV "-->"
+#define RELAY_RAW_PREFIX_SEND "<--"
 
-#define RELAY_RAW_FLAG_RECV     1
-#define RELAY_RAW_FLAG_SEND     2
-#define RELAY_RAW_FLAG_BINARY   4
+#define RELAY_RAW_FLAG_RECV   (1 << 0)
+#define RELAY_RAW_FLAG_SEND   (1 << 1)
+#define RELAY_RAW_FLAG_BINARY (1 << 2)
 
 struct t_relay_raw_message
 {
diff --git a/src/plugins/relay/weechat/relay-weechat-protocol.h b/src/plugins/relay/weechat/relay-weechat-protocol.h
index 4c8500074..76c90c8ce 100644
--- a/src/plugins/relay/weechat/relay-weechat-protocol.h
+++ b/src/plugins/relay/weechat/relay-weechat-protocol.h
@@ -20,10 +20,10 @@
 #ifndef WEECHAT_PLUGIN_RELAY_WEECHAT_PROTOCOL_H
 #define WEECHAT_PLUGIN_RELAY_WEECHAT_PROTOCOL_H
 
-#define RELAY_WEECHAT_PROTOCOL_SYNC_BUFFER   1
-#define RELAY_WEECHAT_PROTOCOL_SYNC_NICKLIST 2
-#define RELAY_WEECHAT_PROTOCOL_SYNC_BUFFERS  4
-#define RELAY_WEECHAT_PROTOCOL_SYNC_UPGRADE  8
+#define RELAY_WEECHAT_PROTOCOL_SYNC_BUFFER   (1 << 0)
+#define RELAY_WEECHAT_PROTOCOL_SYNC_NICKLIST (1 << 1)
+#define RELAY_WEECHAT_PROTOCOL_SYNC_BUFFERS  (1 << 2)
+#define RELAY_WEECHAT_PROTOCOL_SYNC_UPGRADE  (1 << 3)
 
 #define RELAY_WEECHAT_PROTOCOL_SYNC_ALL         \
     (RELAY_WEECHAT_PROTOCOL_SYNC_BUFFER |       \
diff --git a/src/plugins/script/script-repo.h b/src/plugins/script/script-repo.h
index fe9fe266a..f67810f18 100644
--- a/src/plugins/script/script-repo.h
+++ b/src/plugins/script/script-repo.h
@@ -23,11 +23,11 @@
 #include <time.h>
 
 /* status for script */
-#define SCRIPT_STATUS_INSTALLED   1
-#define SCRIPT_STATUS_AUTOLOADED  2
-#define SCRIPT_STATUS_HELD        4
-#define SCRIPT_STATUS_RUNNING     8
-#define SCRIPT_STATUS_NEW_VERSION 16
+#define SCRIPT_STATUS_INSTALLED   (1 << 0)
+#define SCRIPT_STATUS_AUTOLOADED  (1 << 1)
+#define SCRIPT_STATUS_HELD        (1 << 2)
+#define SCRIPT_STATUS_RUNNING     (1 << 3)
+#define SCRIPT_STATUS_NEW_VERSION (1 << 4)
 
 struct t_script_repo
 {