diff --git a/src/httpd_dacp.c b/src/httpd_dacp.c
index e38dfed8..d8dde6b6 100644
--- a/src/httpd_dacp.c
+++ b/src/httpd_dacp.c
@@ -512,7 +512,7 @@ playqueuecontents_add_queue_item(struct evbuffer *songlist, struct db_queue_item
 }
 
 static void
-speaker_enum_cb(struct spk_info *spk, void *arg)
+speaker_enum_cb(struct player_speaker_info *spk, void *arg)
 {
   struct evbuffer *evbuf;
   int len;
diff --git a/src/httpd_jsonapi.c b/src/httpd_jsonapi.c
index 893b73a9..c7a1042c 100644
--- a/src/httpd_jsonapi.c
+++ b/src/httpd_jsonapi.c
@@ -1071,7 +1071,7 @@ struct outputs_param
 };
 
 static json_object *
-speaker_to_json(struct spk_info *spk)
+speaker_to_json(struct player_speaker_info *spk)
 {
   json_object *output;
   char output_id[21];
@@ -1092,7 +1092,7 @@ speaker_to_json(struct spk_info *spk)
 }
 
 static void
-speaker_enum_cb(struct spk_info *spk, void *arg)
+speaker_enum_cb(struct player_speaker_info *spk, void *arg)
 {
   json_object *outputs;
   json_object *output;
@@ -1109,7 +1109,7 @@ speaker_enum_cb(struct spk_info *spk, void *arg)
 static int
 jsonapi_reply_outputs_get_byid(struct httpd_request *hreq)
 {
-  struct spk_info speaker_info;
+  struct player_speaker_info speaker_info;
   uint64_t output_id;
   json_object *jreply;
   int ret;
@@ -2220,7 +2220,7 @@ static int
 output_volume_set(int volume, int step, uint64_t output_id)
 {
   int new_volume;
-  struct spk_info speaker_info;
+  struct player_speaker_info speaker_info;
   int ret;
 
   new_volume = volume;
diff --git a/src/mpd.c b/src/mpd.c
index dca63bb2..25ae2cfe 100644
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -3548,7 +3548,7 @@ mpd_command_password(struct evbuffer *evbuf, int argc, char **argv, char **errms
  * the shortid of output_get_param matches the given speaker/output spk.
  */
 static void
-output_get_cb(struct spk_info *spk, void *arg)
+output_get_cb(struct player_speaker_info *spk, void *arg)
 {
   struct output_get_param *param = arg;
 
@@ -3696,7 +3696,7 @@ mpd_command_toggleoutput(struct evbuffer *evbuf, int argc, char **argv, char **e
  *   outputvolume: 50
  */
 static void
-speaker_enum_cb(struct spk_info *spk, void *arg)
+speaker_enum_cb(struct player_speaker_info *spk, void *arg)
 {
   struct evbuffer *evbuf;
 
diff --git a/src/player.c b/src/player.c
index b6029ea8..c732740e 100644
--- a/src/player.c
+++ b/src/player.c
@@ -149,7 +149,7 @@ struct speaker_set_param
 struct speaker_get_param
 {
   uint64_t spk_id;
-  struct spk_info *spk_info;
+  struct player_speaker_info *spk_info;
 };
 
 struct metadata_param
@@ -2414,9 +2414,9 @@ player_speaker_status_trigger(void)
 }
 
 static void
-device_to_speaker_info(struct spk_info *spk, struct output_device *device)
+device_to_speaker_info(struct player_speaker_info *spk, struct output_device *device)
 {
-  memset(spk, 0, sizeof(struct spk_info));
+  memset(spk, 0, sizeof(struct player_speaker_info));
   spk->id = device->id;
   strncpy(spk->name, device->name, sizeof(spk->name));
   spk->name[sizeof(spk->name) - 1] = '\0';
@@ -2437,7 +2437,7 @@ speaker_enumerate(void *arg, int *retval)
 {
   struct spk_enum *spk_enum = arg;
   struct output_device *device;
-  struct spk_info spk;
+  struct player_speaker_info spk;
 
   for (device = dev_list; device; device = device->next)
     {
@@ -3160,7 +3160,7 @@ player_speaker_set(uint64_t *ids)
 }
 
 int
-player_speaker_get_byid(uint64_t id, struct spk_info *spk)
+player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk)
 {
   struct speaker_get_param param;
   int ret;
diff --git a/src/player.h b/src/player.h
index 082ac1f0..3cae9c2d 100644
--- a/src/player.h
+++ b/src/player.h
@@ -29,7 +29,7 @@ enum repeat_mode {
   REPEAT_ALL  = 2,
 };
 
-struct spk_info {
+struct player_speaker_info {
   uint64_t id;
   char name[255];
   char output_type[50];
@@ -64,7 +64,7 @@ struct player_status {
   uint32_t len_ms;
 };
 
-typedef void (*spk_enum_cb)(struct spk_info *spk, void *arg);
+typedef void (*spk_enum_cb)(struct player_speaker_info *spk, void *arg);
 
 struct player_history
 {
@@ -96,7 +96,7 @@ int
 player_speaker_set(uint64_t *ids);
 
 int
-player_speaker_get_byid(uint64_t id, struct spk_info *spk);
+player_speaker_get_byid(uint64_t id, struct player_speaker_info *spk);
 
 int
 player_speaker_enable(uint64_t id);