diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 272ee6a589..501b7dc078 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -1592,7 +1592,7 @@ static void setting_get_string_representation_hex(void *data,
  *
  * Returns: setting of type ST_ACTION.
  **/
-rarch_setting_t setting_action_setting(const char* name,
+static rarch_setting_t setting_action_setting(const char* name,
       const char* short_description,
       const char *group, const char *subgroup)
 {
@@ -1626,7 +1626,7 @@ rarch_setting_t setting_action_setting(const char* name,
  *
  * Returns: setting of type ST_GROUP.
  **/
-rarch_setting_t setting_group_setting(enum setting_type type, const char* name)
+static rarch_setting_t setting_group_setting(enum setting_type type, const char* name)
 {
    rarch_setting_t result = {0};
 
@@ -1649,7 +1649,7 @@ rarch_setting_t setting_group_setting(enum setting_type type, const char* name)
  *
  * Returns: setting of type ST_SUBGROUP.
  **/
-rarch_setting_t setting_subgroup_setting(enum setting_type type,
+static rarch_setting_t setting_subgroup_setting(enum setting_type type,
       const char* name, const char *parent_name)
 {
    rarch_setting_t result = {0};
@@ -1681,7 +1681,7 @@ rarch_setting_t setting_subgroup_setting(enum setting_type type,
  *
  * Returns: setting of type ST_FLOAT.
  **/
-rarch_setting_t setting_float_setting(const char* name,
+static rarch_setting_t setting_float_setting(const char* name,
       const char* short_description, float* target, float default_value,
       const char *rounding, const char *group, const char *subgroup,
       change_handler_t change_handler, change_handler_t read_handler)
@@ -1728,7 +1728,7 @@ rarch_setting_t setting_float_setting(const char* name,
  *
  * Returns: setting of type ST_BOOL.
  **/
-rarch_setting_t setting_bool_setting(const char* name,
+static rarch_setting_t setting_bool_setting(const char* name,
       const char* short_description, bool* target, bool default_value,
       const char *off, const char *on,
       const char *group, const char *subgroup,
@@ -1775,7 +1775,7 @@ rarch_setting_t setting_bool_setting(const char* name,
  *
  * Returns: setting of type ST_INT.
  **/
-rarch_setting_t setting_int_setting(const char* name,
+static rarch_setting_t setting_int_setting(const char* name,
       const char* short_description, int* target, int default_value,
       const char *group, const char *subgroup, change_handler_t change_handler,
       change_handler_t read_handler)
@@ -1815,7 +1815,7 @@ rarch_setting_t setting_int_setting(const char* name,
  *
  * Returns: setting of type ST_UINT.
  **/
-rarch_setting_t setting_uint_setting(const char* name,
+static rarch_setting_t setting_uint_setting(const char* name,
       const char* short_description, unsigned int* target,
       unsigned int default_value, const char *group, const char *subgroup,
       change_handler_t change_handler, change_handler_t read_handler)
@@ -1858,7 +1858,7 @@ rarch_setting_t setting_uint_setting(const char* name,
  *
  * Returns: setting of type ST_HEX.
  **/
-rarch_setting_t setting_hex_setting(const char* name,
+static rarch_setting_t setting_hex_setting(const char* name,
       const char* short_description, unsigned int* target,
       unsigned int default_value, const char *group, const char *subgroup,
       change_handler_t change_handler, change_handler_t read_handler)
@@ -1901,7 +1901,7 @@ rarch_setting_t setting_hex_setting(const char* name,
  *
  * Returns: setting of type ST_BIND.
  **/
-rarch_setting_t setting_bind_setting(const char* name,
+static rarch_setting_t setting_bind_setting(const char* name,
       const char* short_description, struct retro_keybind* target,
       uint32_t idx, uint32_t idx_offset,
       const struct retro_keybind* default_value,
@@ -2007,12 +2007,12 @@ rarch_setting_t setting_string_setting(enum setting_type type,
  *
  * Returns: string option list setting.
  **/
-rarch_setting_t setting_string_setting_options(enum setting_type type,
- const char* name, const char* short_description, char* target,
- unsigned size, const char* default_value,
- const char *empty, const char *values,
- const char *group, const char *subgroup,
- change_handler_t change_handler, change_handler_t read_handler)
+static rarch_setting_t setting_string_setting_options(enum setting_type type,
+      const char* name, const char* short_description, char* target,
+      unsigned size, const char* default_value,
+      const char *empty, const char *values,
+      const char *group, const char *subgroup,
+      change_handler_t change_handler, change_handler_t read_handler)
 {
   rarch_setting_t result = setting_string_setting(type, name,
         short_description, target, size, default_value, empty, group,
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 21fcd80aab..6c3c9df32e 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -248,223 +248,6 @@ int setting_set_with_string_representation(
  **/
 void setting_get_string_representation(void *data, char *s, size_t len);
 
-/**
- * setting_action_setting:
- * @name               : name of setting.
- * @short_description  : short description of setting.
- * @group              : group that the setting belongs to.
- * @subgroup           : subgroup that the setting belongs to.
- *
- * Initializes a setting of type ST_ACTION.
- *
- * Returns: setting of type ST_ACTION.
- **/
-rarch_setting_t setting_action_setting(const char *name,
-      const char *short_description,
-      const char *group,
-      const char *subgroup);
-
-/**
- * setting_group_setting:
- * @type               : type of settting.
- * @name               : name of setting.
- *
- * Initializes a setting of type ST_GROUP.
- *
- * Returns: setting of type ST_GROUP.
- **/
-rarch_setting_t setting_group_setting(enum setting_type type,
-      const char* name);
-
-/**
- * setting_subgroup_setting:
- * @type               : type of settting.
- * @name               : name of setting.
- * @parent_name        : group that the subgroup setting belongs to.
- *
- * Initializes a setting of type ST_SUBGROUP.
- *
- * Returns: setting of type ST_SUBGROUP.
- **/
-rarch_setting_t setting_subgroup_setting(enum setting_type type,
-      const char* name, const char *parent_name);
-
-/**
- * setting_bool_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of bool setting.
- * @default_value      : Default value (in bool format).
- * @off                : String value for "Off" label.
- * @on                 : String value for "On"  label.
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a setting of type ST_BOOL.
- *
- * Returns: setting of type ST_BOOL.
- **/
-rarch_setting_t setting_bool_setting(const char* name,
-      const char* description, bool* target, bool default_value,
-      const char *off, const char *on, const char * group,
-      const char *subgroup, change_handler_t change_handler,
-      change_handler_t read_handler);
-
-/**
- * setting_int_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of signed integer setting.
- * @default_value      : Default value (in signed integer format).
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a setting of type ST_INT. 
- *
- * Returns: setting of type ST_INT.
- **/
-rarch_setting_t setting_int_setting(const char* name,
-      const char* description, int* target, int default_value,
-      const char *group, const char *subgroup,
-      change_handler_t change_handler, change_handler_t read_handler);
-
-/**
- * setting_uint_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of unsigned integer setting.
- * @default_value      : Default value (in unsigned integer format).
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a setting of type ST_UINT. 
- *
- * Returns: setting of type ST_UINT.
- **/
-rarch_setting_t setting_uint_setting(const char* name,
-      const char* description, unsigned int* target,
-      unsigned int default_value, const char *group,
-      const char *subgroup, change_handler_t change_handler,
-      change_handler_t read_handler);
-
-/**
- * setting_hex_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of unsigned integer setting.
- * @default_value      : Default value (in unsigned integer format).
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a setting of type ST_HEX.
- *
- * Returns: setting of type ST_HEX.
- **/
-rarch_setting_t setting_hex_setting(const char* name,
-      const char* short_description, unsigned int* target,
-      unsigned int default_value, const char *group,
-      const char *subgroup, change_handler_t change_handler,
-      change_handler_t read_handler);
-
-/**
- * setting_float_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of float setting.
- * @default_value      : Default value (in float).
- * @rounding           : Rounding (for float-to-string representation).
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a setting of type ST_FLOAT.
- *
- * Returns: setting of type ST_FLOAT.
- **/
-rarch_setting_t setting_float_setting(const char* name,
-      const char* description, float* target, float default_value,
-      const char *rounding, const char *group, const char *subgroup,
-      change_handler_t change_handler, change_handler_t read_handler);
-
-/**
- * setting_string_setting:
- * @type               : type of setting.
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of string setting.
- * @size               : Size of string setting.
- * @default_value      : Default value (in string format).
- * @empty              : TODO/FIXME: ???
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a string setting (of type @type). 
- *
- * Returns: String setting of type @type.
- **/
-rarch_setting_t setting_string_setting(enum setting_type type,
-      const char* name, const char* description, char* target,
-      unsigned size, const char* default_value, const char *empty,
-      const char *group, const char *subgroup,
-      change_handler_t change_handler, change_handler_t read_handler);
-
-/**
- * setting_bind_setting:
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of bind setting.
- * @idx                : Index of bind setting.
- * @idx_offset         : Index offset of bind setting.
- * @default_value      : Default value (in bind format).
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- *
- * Initializes a setting of type ST_BIND. 
- *
- * Returns: setting of type ST_BIND.
- **/
-rarch_setting_t setting_bind_setting(const char* name,
-      const char* description, struct retro_keybind* target, uint32_t idx,
-      uint32_t idx_offset,
-      const struct retro_keybind* default_value, const char *group,
-      const char *subgroup);
-    
-/**
- * setting_string_setting_options:
- * @type               : type of settting.
- * @name               : name of setting.
- * @short_description  : Short description of setting.
- * @target             : Target of bind setting.
- * @size               : Size of string setting.
- * @default_value      : Default value.
- * @empty              : N/A.
- * @values             : Values, separated by a delimiter.
- * @group              : Group that the setting belongs to.
- * @subgroup           : Subgroup that the setting belongs to.
- * @change_handler     : Function callback for change handler function pointer.
- * @read_handler       : Function callback for read handler function pointer.
- *
- * Initializes a string options list setting. 
- *
- * Returns: string option list setting.
- **/
-rarch_setting_t setting_string_setting_options(enum setting_type type,
-     const char* name, const char* short_description, char* target,
-     unsigned size, const char* default_value, const char *empty, const char *values,
-     const char *group, const char *subgroup, change_handler_t change_handler,
-     change_handler_t read_handler);
-
 /**
  * setting_get_description:
  * @label              : identifier label of setting