diff --git a/core_info.c b/core_info.c
index 8eab7d5583..648f5678e8 100644
--- a/core_info.c
+++ b/core_info.c
@@ -57,6 +57,7 @@ struct core_info_state
 
 typedef struct core_info_state core_info_state_t;
 
+/* TODO/FIXME - global state - perhaps move outside this file */
 static core_info_state_t core_info_st;
 
 static core_info_state_t *coreinfo_get_ptr(void)
diff --git a/playlist.c b/playlist.c
index 2a09158739..597c61ba4e 100644
--- a/playlist.c
+++ b/playlist.c
@@ -85,6 +85,7 @@ typedef struct
    enum playlist_sort_mode *current_meta_sort_mode_val;
 } JSONContext;
 
+/* TODO/FIXME - global state - perhaps move outside this file */
 static playlist_t *playlist_cached = NULL;
 
 typedef int (playlist_sort_fun_t)(