diff --git a/core_options.c b/core_options.c
index 9c970efbc1..ecbd7272cc 100644
--- a/core_options.c
+++ b/core_options.c
@@ -22,6 +22,7 @@
 #include <compat/strl.h>
 #include <retro_miscellaneous.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #include "libretro.h"
 
@@ -328,24 +329,6 @@ const char *core_option_get_val(core_option_manager_t *opt, size_t idx)
    return option->vals->elems[option->index].data;
 }
 
-/**
- * core_option_get_vals:
- * @opt                   : pointer to core option manager object.
- * @idx                   : idx of core option.
- *
- * Gets list of core option values from core option at index @idx.
- *
- * Returns: string list of core option values if successful, otherwise
- * NULL.
- **/
-struct string_list *core_option_get_vals(
-      core_option_manager_t *opt, size_t idx)
-{
-   if (!opt)
-      return NULL;
-   return opt->opts[idx].vals;
-}
-
 void core_option_set_val(core_option_manager_t *opt,
       size_t idx, size_t val_idx)
 {
diff --git a/core_options.h b/core_options.h
index 82e16aa3eb..c147e92448 100644
--- a/core_options.h
+++ b/core_options.h
@@ -20,7 +20,6 @@
 #include <stddef.h>
 
 #include <boolean.h>
-#include <string/string_list.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -119,19 +118,6 @@ const char *core_option_get_desc(core_option_manager_t *opt,
 const char *core_option_get_val(core_option_manager_t *opt, 
       size_t idx);
 
-/**
- * core_option_get_vals:
- * @opt                   : pointer to core option manager object.
- * @idx                   : idx of core option.
- *
- * Gets list of core option values from core option at index @idx.
- *
- * Returns: string list of core option values if successful, otherwise
- * NULL.
- **/
-struct string_list *core_option_get_vals(
-      core_option_manager_t *opt, size_t idx);
-
 void core_option_set_val(core_option_manager_t *opt,
       size_t idx, size_t val_idx);
 
diff --git a/libretro_version_1.c b/libretro_version_1.c
index a82230757f..ac185e9a11 100644
--- a/libretro_version_1.c
+++ b/libretro_version_1.c
@@ -23,6 +23,7 @@
 
 #include <retro_inline.h>
 #include <boolean.h>
+#include <string/string_list.h>
 
 #include "libretro.h"
 #include "libretro_version_1.h"
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 6e5bb5155f..6c9c5f88c4 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -15,6 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index db34caa8d2..7a1bc6a3f6 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -15,6 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 938be29dc9..8c12d11812 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -15,6 +15,7 @@
 
 #include <file/file_path.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 8bc67d5d2d..8ad61e4e05 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -18,6 +18,7 @@
 #include <retro_stat.h>
 #include <retro_file.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 505f12cb46..fc8c18a7f4 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -14,6 +14,7 @@
  */
 
 #include <file/file_path.h>
+#include <string/string_list.h>
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
diff --git a/retroarch.c b/retroarch.c
index 4dec592c1c..725ad44861 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -25,6 +25,7 @@
 
 #include <boolean.h>
 #include <string/stdstring.h>
+#include <string/string_list.h>
 
 #ifdef _WIN32
 #ifdef _XBOX