diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/legacy/elementary/src/lib/elc_fileselector_entry.c
index 8d2452f761..05e9a68cce 100644
--- a/legacy/elementary/src/lib/elc_fileselector_entry.c
+++ b/legacy/elementary/src/lib/elc_fileselector_entry.c
@@ -420,7 +420,7 @@ _constructor(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
          evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_entry_selected_set(Evas_Object *obj,
                                     const char *path)
 {
@@ -438,7 +438,7 @@ _selected_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    elm_fileselector_path_set(sd->button, path);
 }
 
-EAPI const char *
+EINA_DEPRECATED EAPI const char *
 elm_fileselector_entry_selected_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
@@ -529,7 +529,7 @@ _window_size_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    elm_fileselector_button_window_size_get(sd->button, width, height);
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_entry_path_set(Evas_Object *obj,
                                 const char *path)
 {
@@ -554,7 +554,7 @@ _path_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
      }
 }
 
-EAPI const char *
+EINA_DEPRECATED EAPI const char *
 elm_fileselector_entry_path_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, NULL);
@@ -574,7 +574,7 @@ _path_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = sd->path;
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_entry_expandable_set(Evas_Object *obj,
                                       Eina_Bool value)
 {
@@ -591,7 +591,7 @@ _expandable_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    elm_fileselector_expandable_set(sd->button, value);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_entry_expandable_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
@@ -609,7 +609,7 @@ _expandable_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = elm_fileselector_expandable_get(sd->button);
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_entry_folder_only_set(Evas_Object *obj,
                                        Eina_Bool value)
 {
@@ -626,7 +626,7 @@ _folder_only_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    elm_fileselector_folder_only_set(sd->button, value);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_entry_folder_only_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
@@ -644,7 +644,7 @@ _folder_only_get(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    *ret = elm_fileselector_folder_only_get(sd->button);
 }
 
-EAPI void
+EINA_DEPRECATED EAPI void
 elm_fileselector_entry_is_save_set(Evas_Object *obj,
                                    Eina_Bool value)
 {
@@ -661,7 +661,7 @@ _is_save_set(Eo *obj EINA_UNUSED, void *_pd, va_list *list)
    elm_fileselector_is_save_set(sd->button, value);
 }
 
-EAPI Eina_Bool
+EINA_DEPRECATED EAPI Eina_Bool
 elm_fileselector_entry_is_save_get(const Evas_Object *obj)
 {
    ELM_FILESELECTOR_INTERFACE_CHECK(obj, EINA_FALSE);
diff --git a/legacy/elementary/src/lib/elc_fileselector_entry_legacy.h b/legacy/elementary/src/lib/elc_fileselector_entry_legacy.h
index 89d9ce5199..92e59d5351 100644
--- a/legacy/elementary/src/lib/elc_fileselector_entry_legacy.h
+++ b/legacy/elementary/src/lib/elc_fileselector_entry_legacy.h
@@ -78,142 +78,6 @@ EAPI void                        elm_fileselector_entry_window_size_set(Evas_Obj
  */
 EAPI void                        elm_fileselector_entry_window_size_get(const Evas_Object *obj, Evas_Coord *width, Evas_Coord *height);
 
-/**
- * Set the initial file system path and the entry's path string for
- * a given file selector entry widget
- *
- * @param obj The file selector entry 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_entry_path_get()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_entry_path_set(Evas_Object *obj, const char *path);
-
-/**
- * Get the entry's path string for a given file selector entry
- * widget
- *
- * @param obj The file selector entry widget
- * @return path The path string
- *
- * @see elm_fileselector_entry_path_set() for more details
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI const char *elm_fileselector_entry_path_get(const Evas_Object *obj);
-
-/**
- * Enable/disable a tree view in the given file selector entry
- * widget's internal file selector
- *
- * @param obj The file selector entry 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 entry's internal file
- * selector.
- *
- * @note There's no way to put a file selector entry's internal
- * file selector in "grid mode", as one may do with "pure" file
- * selectors.
- *
- * @see elm_fileselector_expandable_get()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether tree view is enabled for the given file selector
- * entry widget's internal file selector
- *
- * @param obj The file selector entry 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_Entry
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_expandable_get(const Evas_Object *obj);
-
-/**
- * Set whether a given file selector entry widget's internal file
- * selector is to display folders only or the directory contents,
- * as well.
- *
- * @param obj The file selector entry 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 entry's internal file
- * selector.
- *
- * @see elm_fileselector_folder_only_get()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether a given file selector entry widget's internal file
- * selector is displaying folders only or the directory contents,
- * as well.
- *
- * @param obj The file selector entry 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_entry_folder_only_set() for more details
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_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 entry widget's
- * internal file selector.
- *
- * @param obj The file selector entry 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 entry's internal file
- * selector.
- *
- * @see elm_fileselector_is_save_get()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
-
-/**
- * Get whether the given file selector entry widget's internal
- * file selector is in "saving dialog" mode
- *
- * @param obj The file selector entry 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_entry_is_save_set() for more details
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_is_save_get(const Evas_Object *obj);
-
 /**
  * Set whether a given file selector entry widget's internal file
  * selector will raise an Elementary "inner window", instead of a
@@ -245,35 +109,3 @@ EAPI void                        elm_fileselector_entry_inwin_mode_set(Evas_Obje
  * @ingroup File_Selector_Entry
  */
 EAPI Eina_Bool                   elm_fileselector_entry_inwin_mode_get(const Evas_Object *obj);
-
-/**
- * Set the initial file system path for a given file selector entry
- * widget
- *
- * @param obj The file selector entry 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_entry_path_get()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI void        elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
-
-/**
- * Get the parent directory's path to the latest file selection on
- * a given filer selector entry widget
- *
- * @param obj The file selector object
- * @return The (full) path of the directory of the last selection
- * on @p obj widget, a @b stringshared string
- *
- * @see elm_fileselector_entry_path_set()
- *
- * @ingroup File_Selector_Entry
- */
-EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_get(const Evas_Object *obj);
diff --git a/legacy/elementary/src/lib/elm_deprecated.h b/legacy/elementary/src/lib/elm_deprecated.h
index 9c7b258a85..2ad95a9b52 100644
--- a/legacy/elementary/src/lib/elm_deprecated.h
+++ b/legacy/elementary/src/lib/elm_deprecated.h
@@ -1450,6 +1450,192 @@ EINA_DEPRECATED EAPI void        elm_fileselector_button_is_save_set(Evas_Object
  */
 EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_button_is_save_get(const Evas_Object *obj);
 
+/**
+ * Set the initial file system path and the entry's path string for
+ * a given file selector entry widget
+ *
+ * @param obj The file selector entry 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_Entry
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_entry_path_set(Evas_Object *obj, const char *path);
+
+/**
+ * Get the entry's path string for a given file selector entry
+ * widget
+ *
+ * @param obj The file selector entry widget
+ * @return path The path string
+ *
+ * @see elm_fileselector_path_set() for more details
+ *
+ * @deprecated Use elm_fileselector_path_get() instead.
+ * @ingroup File_Selector_Entry
+ */
+EINA_DEPRECATED EAPI const char *elm_fileselector_entry_path_get(const Evas_Object *obj);
+
+/**
+ * Enable/disable a tree view in the given file selector entry
+ * widget's internal file selector
+ *
+ * @param obj The file selector entry 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 entry's internal file
+ * selector.
+ *
+ * @note There's no way to put a file selector entry'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_Entry
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_entry_expandable_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether tree view is enabled for the given file selector
+ * entry widget's internal file selector
+ *
+ * @param obj The file selector entry 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_Entry
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_expandable_get(const Evas_Object *obj);
+
+/**
+ * Set whether a given file selector entry widget's internal file
+ * selector is to display folders only or the directory contents,
+ * as well.
+ *
+ * @param obj The file selector entry 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 entry's internal file
+ * selector.
+ *
+ * @see elm_fileselector_folder_only_get()
+ *
+ * @deprecated Use elm_fileselector_folder_only_set() instead.
+ *
+ * @ingroup File_Selector_Entry
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_entry_folder_only_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether a given file selector entry widget's internal file
+ * selector is displaying folders only or the directory contents,
+ * as well.
+ *
+ * @param obj The file selector entry 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_Entry
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_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 entry widget's
+ * internal file selector.
+ *
+ * @param obj The file selector entry 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 entry's internal file
+ * selector.
+ *
+ * @see elm_fileselector_is_save_get()
+ *
+ * @deprecated Use elm_fileselector_is_save_set() instead.
+ *
+ * @ingroup File_Selector_Entry
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_entry_is_save_set(Evas_Object *obj, Eina_Bool value);
+
+/**
+ * Get whether the given file selector entry widget's internal
+ * file selector is in "saving dialog" mode
+ *
+ * @param obj The file selector entry 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_Entry
+ */
+EINA_DEPRECATED EAPI Eina_Bool   elm_fileselector_entry_is_save_get(const Evas_Object *obj);
+
+/**
+ * Set the initial file system path for a given file selector entry
+ * widget
+ *
+ * @param obj The file selector entry 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_selected_set() instead.
+ *
+ * @ingroup File_Selector_Entry
+ */
+EINA_DEPRECATED EAPI void        elm_fileselector_entry_selected_set(Evas_Object *obj, const char *path);
+
+/**
+ * Get the parent directory's path to the latest file selection on
+ * a given filer selector entry widget
+ *
+ * @param obj The file selector object
+ * @return The (full) path of the directory of the last selection
+ * on @p obj widget, a @b stringshared string
+ *
+ * @see elm_fileselector_path_set()
+ *
+ * @deprecated Use elm_fileselector_selected_get() instead.
+ *
+ * @ingroup File_Selector_Entry
+ */
+EINA_DEPRECATED EAPI const char *elm_fileselector_entry_selected_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);