diff --git a/command.c b/command.c
index 7061918178..279ee3a34b 100644
--- a/command.c
+++ b/command.c
@@ -1725,14 +1725,12 @@ static bool command_event_resize_windowed_scale(void)
 }
 
 void command_playlist_push_write(
-      void *data,
+      playlist_t *playlist,
       const char *path,
       const char *label,
       const char *core_path,
       const char *core_name)
 {
-   playlist_t *playlist = (playlist_t*)data;
-
    if (!playlist)
       return;
 
@@ -1749,7 +1747,7 @@ void command_playlist_push_write(
 }
 
 void command_playlist_update_write(
-      void *data,
+      playlist_t *plist,
       size_t idx,
       const char *path,
       const char *label,
@@ -1758,7 +1756,6 @@ void command_playlist_update_write(
       const char *crc32,
       const char *db_name)
 {
-   playlist_t *plist    = (playlist_t*)data;
    playlist_t *playlist = plist ? plist : playlist_get_cached();
 
    if (!playlist)
diff --git a/command.h b/command.h
index 85712bd027..ef1e89aa87 100644
--- a/command.h
+++ b/command.h
@@ -27,6 +27,8 @@
 #include "config.h"
 #endif
 
+#include "playlist.h"
+
 RETRO_BEGIN_DECLS
 
 typedef struct command command_t;
@@ -269,14 +271,14 @@ bool command_free(command_t *handle);
 bool command_event(enum event_command action, void *data);
 
 void command_playlist_push_write(
-      void *data,
+      playlist_t *playlist,
       const char *path,
       const char *label,
       const char *core_path,
       const char *core_name);
 
 void command_playlist_update_write(
-      void *data,
+      playlist_t *playlist,
       size_t idx,
       const char *path,
       const char *label,