diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/legacy/elementary/src/lib/elc_fileselector_button.c
index 14259b06cb..363c9a3118 100644
--- a/legacy/elementary/src/lib/elc_fileselector_button.c
+++ b/legacy/elementary/src/lib/elc_fileselector_button.c
@@ -315,7 +315,7 @@ _window_size_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    if (height) *height = sd->h;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_button_path_set(Evas_Object *obj,
                                  const char *path)
 {
@@ -334,7 +334,7 @@ _path_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    if (sd->fs) elm_fileselector_selected_set(sd->fs, sd->fsd.path);
 }
 
-EAPI const char *
+EINA_DEPRECATED EAPI const char *
 elm_fileselector_button_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
@@ -352,7 +352,7 @@ _path_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = sd->fsd.path;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_button_expandable_set(Evas_Object *obj,
                                        Eina_Bool value)
 {
@@ -371,7 +371,7 @@ _expandable_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    if (sd->fs) elm_fileselector_expandable_set(sd->fs, sd->fsd.expandable);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_button_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
@@ -389,7 +389,7 @@ _expandable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = sd->fsd.expandable;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_button_folder_only_set(Evas_Object *obj,
                                         Eina_Bool value)
 {
@@ -408,7 +408,7 @@ _folder_only_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    if (sd->fs) elm_fileselector_folder_only_set(sd->fs, sd->fsd.folder_only);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_button_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
@@ -426,7 +426,7 @@ _folder_only_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = sd->fsd.folder_only;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_button_is_save_set(Evas_Object *obj,
                                     Eina_Bool value)
 {
@@ -445,7 +445,7 @@ _is_save_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    if (sd->fs) elm_fileselector_is_save_set(sd->fs, sd->fsd.is_save);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_button_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
diff --git a/legacy/elementary/src/lib/elc_fileselector_button_legacy.h b/legacy/elementary/src/lib/elc_fileselector_button_legacy.h
index 2cf33aafcf..820a69a503 100644
--- a/legacy/elementary/src/lib/elc_fileselector_button_legacy.h
+++ b/legacy/elementary/src/lib/elc_fileselector_button_legacy.h
@@ -77,143 +77,6 @@ EAPI void                        elm_fileselector_button_window_size_set(Evas_Ob
  */
 EAPI void                        elm_fileselector_button_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
 
-/**
- * Set the initial file system path for a given file selector
- * button widget
- *
- * @param obj The file selector button widget
- * @param path The path string
- *
- * It must be a <b>directory</b> path, which will have the contents
- * displayed initially in the file selector's view, when invoked
- * from @p obj. The default initial path is the @c "HOME"
- * environment variable's value.
- *
- * @see elm_fileselector_button_path_get()
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_button_path_set(Evas_Object *obj, const char *path);
-
-/**
- * Get the initial file system path set for a given file selector
- * button widget
- *
- * @param obj The file selector button widget
- * @return path The path string
- *
- * @see elm_fileselector_button_path_set() for more details
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI const char *elm_fileselector_button_path_get(const Evas_Object *obj);
-
-/**
- * Enable/disable a tree view in the given file selector button
- * widget's internal file selector
- *
- * @param obj The file selector button widget
- * @param value @c EINA_TRUE to enable tree view, @c EINA_FALSE to
- * disable
- *
- * This has the same effect as elm_fileselector_expandable_set(),
- * but now applied to a file selector button's internal file
- * selector.
- *
- * @note There's no way to put a file selector button's internal
- * file selector in "grid mode", as one may do with "pure" file
- * selectors.
- *
- * @see elm_fileselector_expandable_get()
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether tree view is enabled for the given file selector
- * button widget's internal file selector
- *
- * @param obj The file selector button widget
- * @return @c EINA_TRUE if @p obj widget's internal file selector
- * is in tree view, @c EINA_FALSE otherwise (and or errors)
- *
- * @see elm_fileselector_expandable_set() for more details
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_expandable_get(const Evas_Object *obj);
-
-/**
- * Set whether a given file selector button widget's internal file
- * selector is to display folders only or the directory contents,
- * as well.
- *
- * @param obj The file selector button widget
- * @param value @c EINA_TRUE to make @p obj widget's internal file
- * selector only display directories, @c EINA_FALSE to make files
- * to be displayed in it too
- *
- * This has the same effect as elm_fileselector_folder_only_set(),
- * but now applied to a file selector button's internal file
- * selector.
- *
- * @see elm_fileselector_folder_only_get()
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether a given file selector button widget's internal file
- * selector is displaying folders only or the directory contents,
- * as well.
- *
- * @param obj The file selector button widget
- * @return @c EINA_TRUE if @p obj widget's internal file
- * selector is only displaying directories, @c EINA_FALSE if files
- * are being displayed in it too (and on errors)
- *
- * @see elm_fileselector_button_folder_only_set() for more details
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_folder_only_get(const Evas_Object *obj);
-
-/**
- * Enable/disable the file name entry box where the user can type
- * in a name for a file, in a given file selector button widget's
- * internal file selector.
- *
- * @param obj The file selector button widget
- * @param value @c EINA_TRUE to make @p obj widget's internal
- * file selector a "saving dialog", @c EINA_FALSE otherwise
- *
- * This has the same effect as elm_fileselector_is_save_set(),
- * but now applied to a file selector button's internal file
- * selector.
- *
- * @see elm_fileselector_is_save_get()
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether the given file selector button widget's internal
- * file selector is in "saving dialog" mode
- *
- * @param obj The file selector button widget
- * @return @c EINA_TRUE, if @p obj widget's internal file selector
- * is in "saving dialog" mode, @c EINA_FALSE otherwise (and on
- * errors)
- *
- * @see elm_fileselector_button_is_save_set() for more details
- *
- * @ingroup File_Selector_Button
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_is_save_get(const Evas_Object *obj);
-
 /**
  * Set whether a given file selector button widget's internal file
  * selector will raise an Elementary "inner window", instead of a
diff --git a/legacy/elementary/src/lib/elm_deprecated.h b/legacy/elementary/src/lib/elm_deprecated.h
index f8ed584205..9c7b258a85 100644
--- a/legacy/elementary/src/lib/elm_deprecated.h
+++ b/legacy/elementary/src/lib/elm_deprecated.h
@@ -1297,6 +1297,160 @@ EINA_DEPRECATED EAPI void  elm_icon_aspect_fixed_set(Evas_Object *obj, Eina_Bool
  */
 EINA_DEPRECATED EAPI Eina_Bool elm_icon_aspect_fixed_get(const Evas_Object *obj);
 
+/**
+ * Set the initial file system path for a given file selector
+ * button widget
+ *
+ * @param obj The file selector button widget
+ * @param path The path string
+ *
+ * It must be a <b>directory</b> path, which will have the contents
+ * displayed initially in the file selector's view, when invoked
+ * from @p obj. The default initial path is the @c "HOME"
+ * environment variable's value.
+ *
+ * @see elm_fileselector_path_get()
+ *
+ * @deprecated Use elm_fileselector_path_set() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_button_path_set(Evas_Object *obj, const char *path);
+
+/**
+ * Get the initial file system path set for a given file selector
+ * button widget
+ *
+ * @param obj The file selector button widget
+ * @return path The path string
+ *
+ * @see elm_fileselector_path_set() for more details
+ *
+ * @deprecated Use elm_fileselector_path_get() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI const char *elm_fileselector_button_path_get(const Evas_Object *obj);
+
+/**
+ * Enable/disable a tree view in the given file selector button
+ * widget's internal file selector
+ *
+ * @param obj The file selector button widget
+ * @param value @c EINA_TRUE to enable tree view, @c EINA_FALSE to
+ * disable
+ *
+ * This has the same effect as elm_fileselector_expandable_set(),
+ * but now applied to a file selector button's internal file
+ * selector.
+ *
+ * @note There's no way to put a file selector button's internal
+ * file selector in "grid mode", as one may do with "pure" file
+ * selectors.
+ *
+ * @see elm_fileselector_expandable_get()
+ *
+ * @deprecated Use elm_fileselector_expandable_set() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_button_expandable_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether tree view is enabled for the given file selector
+ * button widget's internal file selector
+ *
+ * @param obj The file selector button widget
+ * @return @c EINA_TRUE if @p obj widget's internal file selector
+ * is in tree view, @c EINA_FALSE otherwise (and or errors)
+ *
+ * @see elm_fileselector_expandable_set() for more details
+ *
+ * @deprecated Use elm_fileselector_expandable_get() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_expandable_get(const Evas_Object *obj);
+
+/**
+ * Set whether a given file selector button widget's internal file
+ * selector is to display folders only or the directory contents,
+ * as well.
+ *
+ * @param obj The file selector button widget
+ * @param value @c EINA_TRUE to make @p obj widget's internal file
+ * selector only display directories, @c EINA_FALSE to make files
+ * to be displayed in it too
+ *
+ * This has the same effect as elm_fileselector_folder_only_set(),
+ * but now applied to a file selector button's internal file
+ * selector.
+ *
+ * @see elm_fileselector_folder_only_get()
+ *
+ * @deprecated Use elm_fileselector_folder_only_set() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_button_folder_only_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether a given file selector button widget's internal file
+ * selector is displaying folders only or the directory contents,
+ * as well.
+ *
+ * @param obj The file selector button widget
+ * @return @c EINA_TRUE if @p obj widget's internal file
+ * selector is only displaying directories, @c EINA_FALSE if files
+ * are being displayed in it too (and on errors)
+ *
+ * @see elm_fileselector_folder_only_set() for more details
+ *
+ * @deprecated Use elm_fileselector_folder_only_get() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_folder_only_get(const Evas_Object *obj);
+
+/**
+ * Enable/disable the file name entry box where the user can type
+ * in a name for a file, in a given file selector button widget's
+ * internal file selector.
+ *
+ * @param obj The file selector button widget
+ * @param value @c EINA_TRUE to make @p obj widget's internal
+ * file selector a "saving dialog", @c EINA_FALSE otherwise
+ *
+ * This has the same effect as elm_fileselector_is_save_set(),
+ * but now applied to a file selector button's internal file
+ * selector.
+ *
+ * @see elm_fileselector_is_save_get()
+ *
+ * @deprecated Use elm_fileselector_is_save_set() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_button_is_save_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether the given file selector button widget's internal
+ * file selector is in "saving dialog" mode
+ *
+ * @param obj The file selector button widget
+ * @return @c EINA_TRUE, if @p obj widget's internal file selector
+ * is in "saving dialog" mode, @c EINA_FALSE otherwise (and on
+ * errors)
+ *
+ * @see elm_fileselector_is_save_set() for more details
+ *
+ * @deprecated Use elm_fileselector_is_save_get() instead.
+ *
+ * @ingroup File_Selector_Button
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_is_save_get(const Evas_Object *obj);
+
+
 //TODO: remvoe below - use elm_access_text_set(); or elm_access_cb_set();
 EINA_DEPRECATED EAPI void elm_access_external_info_set(Evas_Object *obj, const char *text);
 EINA_DEPRECATED EAPI char *elm_access_external_info_get(const Evas_Object *obj);