diff --git a/legacy/edje/src/lib/Edje.h b/legacy/edje/src/lib/Edje.h
index c2cb1d7fa7..c44cc98d1c 100644
--- a/legacy/edje/src/lib/Edje.h
+++ b/legacy/edje/src/lib/Edje.h
@@ -200,21 +200,21 @@ extern "C" {
    EAPI Evas_Object *edje_object_add                 (Evas *evas);
 
    /* edje_util.c */
-   EAPI const char  *edje_object_data_get            (Evas_Object *obj, const char *key);
+   EAPI const char  *edje_object_data_get            (const Evas_Object *obj, const char *key);
 
    /* edje_load.c */
    EAPI int          edje_object_file_set            (Evas_Object *obj, const char *file, const char *group);
-   EAPI void         edje_object_file_get            (Evas_Object *obj, const char **file, const char **group);
-   EAPI int          edje_object_load_error_get      (Evas_Object *obj);
+   EAPI void         edje_object_file_get            (const Evas_Object *obj, const char **file, const char **group);
+   EAPI int          edje_object_load_error_get      (const Evas_Object *obj);
 
    /* edje_program.c */
    EAPI void         edje_object_signal_callback_add (Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *obj, const char *emission, const char *source), void *data);
    EAPI void        *edje_object_signal_callback_del (Evas_Object *obj, const char *emission, const char *source, void (*func) (void *data, Evas_Object *obj, const char *emission, const char *source));
    EAPI void         edje_object_signal_emit         (Evas_Object *obj, const char *emission, const char *source);
    EAPI void         edje_object_play_set            (Evas_Object *obj, int play);
-   EAPI int          edje_object_play_get            (Evas_Object *obj);
+   EAPI int          edje_object_play_get            (const Evas_Object *obj);
    EAPI void         edje_object_animation_set       (Evas_Object *obj, int on);
-   EAPI int          edje_object_animation_get       (Evas_Object *obj);
+   EAPI int          edje_object_animation_get       (const Evas_Object *obj);
 
    /* edje_util.c */
    EAPI int          edje_object_freeze              (Evas_Object *obj);
@@ -222,30 +222,30 @@ extern "C" {
    EAPI void         edje_object_color_class_set     (Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
    EAPI void         edje_object_color_class_del     (Evas_Object *obj, const char *color_class);
    EAPI void         edje_object_text_class_set      (Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size);
-   EAPI void         edje_object_size_min_get        (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-   EAPI void         edje_object_size_max_get        (Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
+   EAPI void         edje_object_size_min_get        (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
+   EAPI void         edje_object_size_max_get        (const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
    EAPI void         edje_object_calc_force          (Evas_Object *obj);
    EAPI void         edje_object_size_min_calc       (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
    EAPI void         edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh);
-   EAPI int          edje_object_part_exists         (Evas_Object *obj, const char *part);
-   EAPI Evas_Object *edje_object_part_object_get     (Evas_Object *obj, const char *part);
-   EAPI void         edje_object_part_geometry_get   (Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
+   EAPI int          edje_object_part_exists         (const Evas_Object *obj, const char *part);
+   EAPI const Evas_Object *edje_object_part_object_get     (const Evas_Object *obj, const char *part);
+   EAPI void         edje_object_part_geometry_get   (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
    EAPI void         edje_object_text_change_cb_set  (Evas_Object *obj, void (*func) (void *data, Evas_Object *obj, const char *part), void *data);
    EAPI void         edje_object_part_text_set       (Evas_Object *obj, const char *part, const char *text);
-   EAPI const char  *edje_object_part_text_get       (Evas_Object *obj, const char *part);
+   EAPI const char  *edje_object_part_text_get       (const Evas_Object *obj, const char *part);
    EAPI void         edje_object_part_swallow        (Evas_Object *obj, const char *part, Evas_Object *obj_swallow);
    EAPI void         edje_object_part_unswallow      (Evas_Object *obj, Evas_Object *obj_swallow);
-   EAPI Evas_Object *edje_object_part_swallow_get    (Evas_Object *obj, const char *part);
-   EAPI const char  *edje_object_part_state_get      (Evas_Object *obj, const char *part, double *val_ret);
-   EAPI int          edje_object_part_drag_dir_get   (Evas_Object *obj, const char *part);
+   EAPI Evas_Object *edje_object_part_swallow_get    (const Evas_Object *obj, const char *part);
+   EAPI const char  *edje_object_part_state_get      (const Evas_Object *obj, const char *part, double *val_ret);
+   EAPI int          edje_object_part_drag_dir_get   (const Evas_Object *obj, const char *part);
    EAPI void         edje_object_part_drag_value_set (Evas_Object *obj, const char *part, double dx, double dy);
-   EAPI void         edje_object_part_drag_value_get (Evas_Object *obj, const char *part, double *dx, double *dy);
+   EAPI void         edje_object_part_drag_value_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
    EAPI void         edje_object_part_drag_size_set  (Evas_Object *obj, const char *part, double dw, double dh);
-   EAPI void         edje_object_part_drag_size_get  (Evas_Object *obj, const char *part, double *dw, double *dh);
+   EAPI void         edje_object_part_drag_size_get  (const Evas_Object *obj, const char *part, double *dw, double *dh);
    EAPI void         edje_object_part_drag_step_set  (Evas_Object *obj, const char *part, double dx, double dy);
-   EAPI void         edje_object_part_drag_step_get  (Evas_Object *obj, const char *part, double *dx, double *dy);
+   EAPI void         edje_object_part_drag_step_get  (const Evas_Object *obj, const char *part, double *dx, double *dy);
    EAPI void         edje_object_part_drag_page_set  (Evas_Object *obj, const char *part, double dx, double dy);
-   EAPI void         edje_object_part_drag_page_get  (Evas_Object *obj, const char *part, double *dx, double *dy);
+   EAPI void         edje_object_part_drag_page_get  (const Evas_Object *obj, const char *part, double *dx, double *dy);
    EAPI void         edje_object_part_drag_step      (Evas_Object *obj, const char *part, double dx, double dy);
    EAPI void         edje_object_part_drag_page      (Evas_Object *obj, const char *part, double dx, double dy);
 
diff --git a/legacy/edje/src/lib/edje_load.c b/legacy/edje/src/lib/edje_load.c
index d60b886aee..aac4c7f7a1 100644
--- a/legacy/edje/src/lib/edje_load.c
+++ b/legacy/edje/src/lib/edje_load.c
@@ -49,7 +49,7 @@ edje_object_file_set(Evas_Object *obj, const char *file, const char *group)
  * interested in one of the values.
  */
 EAPI void
-edje_object_file_get(Evas_Object *obj, const char **file, const char **group)
+edje_object_file_get(const Evas_Object *obj, const char **file, const char **group)
 {
    Edje *ed;
 
@@ -79,7 +79,7 @@ edje_object_file_get(Evas_Object *obj, const char **file, const char **group)
  * 7: Incompatible File
  */
 EAPI int
-edje_object_load_error_get(Evas_Object *obj)
+edje_object_load_error_get(const Evas_Object *obj)
 {
    Edje *ed;
 
diff --git a/legacy/edje/src/lib/edje_private.h b/legacy/edje/src/lib/edje_private.h
index 167cfb07b2..4bc95ccfea 100644
--- a/legacy/edje/src/lib/edje_private.h
+++ b/legacy/edje/src/lib/edje_private.h
@@ -1073,7 +1073,7 @@ void              _edje_text_class_member_del(Edje *ed, const char *text_class);
 void              _edje_text_class_members_free(void);
 void              _edje_text_class_hash_free(void);
 
-Edje             *_edje_fetch(Evas_Object *obj);
+Edje             *_edje_fetch(const Evas_Object *obj);
 int               _edje_freeze(Edje *ed);
 int               _edje_thaw(Edje *ed);
 int               _edje_block(Edje *ed);
diff --git a/legacy/edje/src/lib/edje_program.c b/legacy/edje/src/lib/edje_program.c
index 11784f150d..f3a7ad48da 100644
--- a/legacy/edje/src/lib/edje_program.c
+++ b/legacy/edje/src/lib/edje_program.c
@@ -262,7 +262,7 @@ edje_object_play_set(Evas_Object *obj, int play)
  * 1 if Edje set to play
  */
 EAPI int
-edje_object_play_get(Evas_Object *obj)
+edje_object_play_get(const Evas_Object *obj)
 {
    Edje *ed;
 
@@ -343,7 +343,7 @@ edje_object_animation_set(Evas_Object *obj, int on)
  * 1 if animated
  */
 EAPI int
-edje_object_animation_get(Evas_Object *obj)
+edje_object_animation_get(const Evas_Object *obj)
 {
    Edje *ed;
 
diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index 60edf4426f..4d91bd62ee 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -94,7 +94,7 @@ edje_fontset_append_get(void)
  * @endcode
  */
 EAPI const char *
-edje_object_data_get(Evas_Object *obj, const char *key)
+edje_object_data_get(const Evas_Object *obj, const char *key)
 {
    Edje *ed;
    Evas_List *l;
@@ -683,7 +683,7 @@ edje_object_text_class_set(Evas_Object *obj, const char *text_class, const char
  * 1 if Edje part exists
  */
 EAPI int
-edje_object_part_exists(Evas_Object *obj, const char *part)
+edje_object_part_exists(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -707,8 +707,8 @@ edje_object_part_exists(Evas_Object *obj, const char *part)
  * @return Returns the Evas_Object corresponding to the given part,
  * or NULL on failure (if the part doesn't exist)
  **/
-EAPI Evas_Object *
-edje_object_part_object_get(Evas_Object *obj, const char *part)
+EAPI const Evas_Object *
+edje_object_part_object_get(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -734,7 +734,7 @@ edje_object_part_object_get(Evas_Object *obj, const char *part)
  * values you are uninterested in.
  */
 EAPI void
-edje_object_part_geometry_get(Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
+edje_object_part_geometry_get(const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h )
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -821,7 +821,7 @@ edje_object_part_text_set(Evas_Object *obj, const char *part, const char *text)
  * @return The text string
  */
 EAPI const char *
-edje_object_part_text_get(Evas_Object *obj, const char *part)
+edje_object_part_text_get(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1032,7 +1032,7 @@ edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow)
  * @return The swallowed object, or NULL if there is none.
  */
 EAPI Evas_Object *
-edje_object_part_swallow_get(Evas_Object *obj, const char *part)
+edje_object_part_swallow_get(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1053,7 +1053,7 @@ edje_object_part_swallow_get(Evas_Object *obj, const char *part)
  * to zero if no Edje is connected to the Evas Object.
  */
 EAPI void
-edje_object_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
+edje_object_size_min_get(const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
 {
    Edje *ed;
 
@@ -1077,7 +1077,7 @@ edje_object_size_min_get(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh)
  * to zero if no Edje is connected to the Evas Object.
  */
 EAPI void
-edje_object_size_max_get(Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
+edje_object_size_max_get(const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh)
 {
    Edje *ed;
 
@@ -1280,7 +1280,7 @@ edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Co
  */
 /* FIXME: Correctly return other states */
 EAPI const char *
-edje_object_part_state_get(Evas_Object *obj, const char *part, double *val_ret)
+edje_object_part_state_get(const Evas_Object *obj, const char *part, double *val_ret)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1328,7 +1328,7 @@ edje_object_part_state_get(Evas_Object *obj, const char *part, double *val_ret)
  * 3: Dragable in X & Y directions
  */
 EAPI int
-edje_object_part_drag_dir_get(Evas_Object *obj, const char *part)
+edje_object_part_drag_dir_get(const Evas_Object *obj, const char *part)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1386,7 +1386,7 @@ edje_object_part_drag_value_set(Evas_Object *obj, const char *part, double dx, d
  */
 /* FIXME: Should this be x and y instead of dx/dy? */
 EAPI void
-edje_object_part_drag_value_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_value_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1452,7 +1452,7 @@ edje_object_part_drag_size_set(Evas_Object *obj, const char *part, double dw, do
  * Gets the dragable object size.
  */
 EAPI void
-edje_object_part_drag_size_get(Evas_Object *obj, const char *part, double *dw, double *dh)
+edje_object_part_drag_size_get(const Evas_Object *obj, const char *part, double *dw, double *dh)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1510,7 +1510,7 @@ edje_object_part_drag_step_set(Evas_Object *obj, const char *part, double dx, do
  * Gets the x and y step increments for the dragable object.
  */
 EAPI void
-edje_object_part_drag_step_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_step_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1568,7 +1568,7 @@ edje_object_part_drag_page_set(Evas_Object *obj, const char *part, double dx, do
  * Gets the x,y page step increments for the dragable object.
  */
 EAPI void
-edje_object_part_drag_page_get(Evas_Object *obj, const char *part, double *dx, double *dy)
+edje_object_part_drag_page_get(const Evas_Object *obj, const char *part, double *dx, double *dy)
 {
    Edje *ed;
    Edje_Real_Part *rp;
@@ -1923,7 +1923,7 @@ _edje_text_class_hash_free(void)
 }
 
 Edje *
-_edje_fetch(Evas_Object *obj)
+_edje_fetch(const Evas_Object *obj)
 {
    Edje *ed;
    char *type;