diff --git a/player/clipboard/clipboard-wayland.c b/player/clipboard/clipboard-wayland.c
index ddcbbb0602..677a3cd242 100644
--- a/player/clipboard/clipboard-wayland.c
+++ b/player/clipboard/clipboard-wayland.c
@@ -27,10 +27,12 @@
 #include "osdep/poll_wrapper.h"
 #include "osdep/threads.h"
 
-static const uint8_t MESSAGE_DEATH = 0;
-static const uint8_t MESSAGE_CREATE_SOURCES = 1;
-static const uint8_t MESSAGE_UPDATE_CLIPBOARD = 2;
-static const uint8_t MESSAGE_UPDATE_PRIMARY_SELECTION = 3;
+enum message_type {
+    MESSAGE_DEATH = 0,
+    MESSAGE_CREATE_SOURCES = 1,
+    MESSAGE_UPDATE_CLIPBOARD = 2,
+    MESSAGE_UPDATE_PRIMARY_SELECTION = 3,
+};
 
 struct clipboard_wayland_data_offer {
     struct ext_data_control_offer_v1 *offer;
@@ -540,7 +542,8 @@ static void uninit(struct clipboard_ctx *cl)
     struct clipboard_wayland_priv *priv = cl->priv;
     if (!priv)
         return;
-    (void)write(priv->message_pipe[1], &MESSAGE_DEATH, sizeof(MESSAGE_DEATH));
+    uint8_t msg = MESSAGE_DEATH;
+    (void)write(priv->message_pipe[1], &msg, sizeof(msg));
     mp_thread_join(priv->thread);
     close(priv->message_pipe[0]);
     close(priv->message_pipe[1]);
@@ -605,7 +608,8 @@ static int set_data(struct clipboard_ctx *cl, struct clipboard_access_params *pa
         break;
     }
     mp_mutex_unlock(&priv->lock);
-    (void)write(priv->message_pipe[1], &MESSAGE_CREATE_SOURCES, sizeof(MESSAGE_CREATE_SOURCES));
+    uint8_t msg = MESSAGE_CREATE_SOURCES;
+    (void)write(priv->message_pipe[1], &msg, sizeof(msg));
     return CLIPBOARD_SUCCESS;
 }
 
diff --git a/player/clipboard/clipboard-x11.c b/player/clipboard/clipboard-x11.c
index c66d0ff111..9b6bc60e9d 100644
--- a/player/clipboard/clipboard-x11.c
+++ b/player/clipboard/clipboard-x11.c
@@ -27,10 +27,12 @@
 #include "osdep/poll_wrapper.h"
 #include "osdep/threads.h"
 
-static const uint8_t MESSAGE_DEATH = 0;
-static const uint8_t MESSAGE_SET_OWNER = 1;
-static const uint8_t MESSAGE_UPDATE_CLIPBOARD = 2;
-static const uint8_t MESSAGE_UPDATE_PRIMARY_SELECTION = 3;
+enum message_type {
+    MESSAGE_DEATH = 0,
+    MESSAGE_SET_OWNER = 1,
+    MESSAGE_UPDATE_CLIPBOARD = 2,
+    MESSAGE_UPDATE_PRIMARY_SELECTION = 3,
+};
 
 struct clipboard_x11_priv {
     mp_mutex lock;
@@ -299,7 +301,8 @@ static void uninit(struct clipboard_ctx *cl)
     struct clipboard_x11_priv *priv = cl->priv;
     if (!priv)
         return;
-    (void)write(priv->message_pipe[1], &MESSAGE_DEATH, sizeof(MESSAGE_DEATH));
+    uint8_t msg = MESSAGE_DEATH;
+    (void)write(priv->message_pipe[1], &msg, sizeof(msg));
     mp_thread_join(priv->thread);
     close(priv->message_pipe[0]);
     close(priv->message_pipe[1]);
@@ -364,7 +367,8 @@ static int set_data(struct clipboard_ctx *cl, struct clipboard_access_params *pa
         break;
     }
     mp_mutex_unlock(&priv->lock);
-    (void)write(priv->message_pipe[1], &MESSAGE_SET_OWNER, sizeof(MESSAGE_SET_OWNER));
+    uint8_t msg = MESSAGE_SET_OWNER;
+    (void)write(priv->message_pipe[1], &msg, sizeof(msg));
     return CLIPBOARD_SUCCESS;
 }