diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 04bae9ba72..effcf2d5ba 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -111,7 +111,7 @@ ecore_shutdown(void)
 }
 
 EAPI void
-_ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname)
+_ecore_magic_fail(const void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname)
 {
    fprintf(stderr,
 	   "\n"
diff --git a/legacy/ecore/src/lib/ecore/ecore_private.h b/legacy/ecore/src/lib/ecore/ecore_private.h
index 5cc24ebf0e..2a77c2d791 100644
--- a/legacy/ecore/src/lib/ecore/ecore_private.h
+++ b/legacy/ecore/src/lib/ecore/ecore_private.h
@@ -394,7 +394,7 @@ struct _Ecore_Poller
 
 #endif
 
-EAPI void          _ecore_magic_fail(void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname);
+EAPI void          _ecore_magic_fail(const void *d, Ecore_Magic m, Ecore_Magic req_m, const char *fname);
 
 void          _ecore_timer_shutdown(void);
 void          _ecore_timer_cleanup(void);
diff --git a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
index 5ef99f40aa..6cfb1cb4b4 100644
--- a/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
+++ b/legacy/ecore/src/lib/ecore_evas/Ecore_Evas.h
@@ -136,40 +136,40 @@ EAPI Ecore_Evas *ecore_evas_new(const char *engine_name, int x, int y, int w, in
 
 /* engine/target specific init calls */
 EAPI Ecore_Evas     *ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window  ecore_evas_software_x11_window_get(Ecore_Evas *ee);
-EAPI Ecore_X_Window  ecore_evas_software_x11_subwindow_get(Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_software_x11_window_get(const Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_software_x11_subwindow_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on);
-EAPI int             ecore_evas_software_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI int             ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
 
 EAPI Ecore_Evas     *ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window  ecore_evas_gl_x11_window_get(Ecore_Evas *ee);
-EAPI Ecore_X_Window  ecore_evas_gl_x11_subwindow_get(Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_gl_x11_window_get(const Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_gl_x11_subwindow_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on);
-EAPI int             ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI int             ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
 
 EAPI Ecore_Evas     *ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window  ecore_evas_xrender_x11_window_get(Ecore_Evas *ee);
-EAPI Ecore_X_Window  ecore_evas_xrender_x11_subwindow_get(Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_xrender_x11_subwindow_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on);
-EAPI int             ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee);
+EAPI int             ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
 
 EAPI Ecore_Evas     *ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent, int x, int y, int w, int h);
-EAPI Ecore_X_Window  ecore_evas_software_x11_16_window_get(Ecore_Evas *ee);
-EAPI Ecore_X_Window  ecore_evas_software_x11_16_subwindow_get(Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee);
+EAPI Ecore_X_Window  ecore_evas_software_x11_16_subwindow_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on);
-EAPI int             ecore_evas_software_x11_16_direct_resize_get(Ecore_Evas *ee);
+EAPI int             ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee);
 EAPI void            ecore_evas_software_x11_16_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win);
 
-EAPI Ecore_Evas     *ecore_evas_fb_new(char *disp_name, int rotation, int w, int h);
+EAPI Ecore_Evas     *ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h);
 
 EAPI Ecore_Evas     *ecore_evas_directfb_new(const char *disp_name, int windowed, int x, int y, int w, int h);
-EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(Ecore_Evas *ee);
+EAPI Ecore_DirectFB_Window *ecore_evas_directfb_window_get(const Ecore_Evas *ee);
 
 EAPI Ecore_Evas     *ecore_evas_buffer_new(int w, int h);
-EAPI const int      *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
+EAPI const void     *ecore_evas_buffer_pixels_get(Ecore_Evas *ee);
 
 EAPI Evas_Object    *ecore_evas_object_image_new(Ecore_Evas *ee_target);
 
@@ -197,7 +197,7 @@ EAPI Ecore_Evas *ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
                                         int                 width,
                                         int                 height);
 
-EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(Ecore_Evas *ee);
+EAPI Ecore_Win32_Window *ecore_evas_win32_window_get(const Ecore_Evas *ee);
 
 EAPI Ecore_Evas     *ecore_evas_sdl_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
 EAPI Ecore_Evas     *ecore_evas_sdl16_new(const char* name, int w, int h, int fullscreen, int hwsurface, int noframe, int alpha);
@@ -226,13 +226,13 @@ EAPI Ecore_Evas     *ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *par
                                                          int                 width,
                                                          int                 height);
 
-EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(Ecore_Evas *ee);
+EAPI Ecore_WinCE_Window *ecore_evas_software_wince_window_get(const Ecore_Evas *ee);
 
 /* generic manipulation calls */
 EAPI const char *ecore_evas_engine_name_get(const Ecore_Evas *ee);
-EAPI Ecore_Evas *ecore_evas_ecore_evas_get(Evas *e);
+EAPI Ecore_Evas *ecore_evas_ecore_evas_get(const Evas *e);
 EAPI void        ecore_evas_free(Ecore_Evas *ee);
-EAPI void       *ecore_evas_data_get(Ecore_Evas *ee, const char *key);
+EAPI void       *ecore_evas_data_get(const Ecore_Evas *ee, const char *key);
 EAPI void        ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data);
 EAPI void        ecore_evas_callback_resize_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
 EAPI void        ecore_evas_callback_move_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
@@ -249,67 +249,67 @@ EAPI void        ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, void (*func)
 EAPI void        ecore_evas_callback_pre_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
 EAPI void        ecore_evas_callback_post_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
 EAPI void        ecore_evas_callback_pre_free_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee));
-EAPI Evas       *ecore_evas_get(Ecore_Evas *ee);
+EAPI Evas       *ecore_evas_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_move(Ecore_Evas *ee, int x, int y);
 EAPI void        ecore_evas_managed_move(Ecore_Evas *ee, int x, int y);
 EAPI void        ecore_evas_resize(Ecore_Evas *ee, int w, int h);
 EAPI void        ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h);
-EAPI void        ecore_evas_geometry_get(Ecore_Evas *ee, int *x, int *y, int *w, int *h);
+EAPI void        ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h);
 EAPI void        ecore_evas_rotation_set(Ecore_Evas *ee, int rot);
-EAPI int         ecore_evas_rotation_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_rotation_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_shaped_set(Ecore_Evas *ee, int shaped);
-EAPI int         ecore_evas_shaped_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_shaped_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_alpha_set(Ecore_Evas *ee, int alpha);
-EAPI int         ecore_evas_alpha_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_alpha_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_show(Ecore_Evas *ee);
 EAPI void        ecore_evas_hide(Ecore_Evas *ee);
-EAPI int         ecore_evas_visibility_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_visibility_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_raise(Ecore_Evas *ee);
 EAPI void        ecore_evas_lower(Ecore_Evas *ee);
 EAPI void        ecore_evas_activate(Ecore_Evas *ee);
 EAPI void        ecore_evas_title_set(Ecore_Evas *ee, const char *t);
-EAPI const char *ecore_evas_title_get(Ecore_Evas *ee);
+EAPI const char *ecore_evas_title_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c);
-EAPI void        ecore_evas_name_class_get(Ecore_Evas *ee, const char **n, const char **c);
+EAPI void        ecore_evas_name_class_get(const Ecore_Evas *ee, const char **n, const char **c);
 EAPI void        ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h);
-EAPI void        ecore_evas_size_min_get(Ecore_Evas *ee, int *w, int *h);
+EAPI void        ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h);
 EAPI void        ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h);
-EAPI void        ecore_evas_size_max_get(Ecore_Evas *ee, int *w, int *h);
+EAPI void        ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h);
 EAPI void        ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h);
-EAPI void        ecore_evas_size_base_get(Ecore_Evas *ee, int *w, int *h);
+EAPI void        ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h);
 EAPI void        ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h);
-EAPI void        ecore_evas_size_step_get(Ecore_Evas *ee, int *w, int *h);
+EAPI void        ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h);
 EAPI void        ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int hot_y);
 EAPI void        ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int hot_x, int hot_y);
-EAPI void        ecore_evas_cursor_get(Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y);
+EAPI void        ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y);
 EAPI void        ecore_evas_layer_set(Ecore_Evas *ee, int layer);
-EAPI int         ecore_evas_layer_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_layer_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_focus_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_focus_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_focus_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_iconified_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_iconified_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_iconified_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_borderless_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_borderless_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_borderless_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_override_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_override_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_override_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_maximized_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_maximized_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_maximized_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_fullscreen_set(Ecore_Evas *ee, int on);
-EAPI int         ecore_evas_fullscreen_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_fullscreen_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on);
-EAPI Ecore_Evas_Avoid_Damage_Type ecore_evas_avoid_damage_get(Ecore_Evas *ee);
+EAPI Ecore_Evas_Avoid_Damage_Type ecore_evas_avoid_damage_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn);
-EAPI int         ecore_evas_withdrawn_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_withdrawn_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_sticky_set(Ecore_Evas *ee, int sticky);
-EAPI int         ecore_evas_sticky_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_sticky_get(const Ecore_Evas *ee);
 EAPI void        ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore);
-EAPI int         ecore_evas_ignore_events_get(Ecore_Evas *ee);
-EAPI void       *ecore_evas_window_get(Ecore_Evas *ee);
+EAPI int         ecore_evas_ignore_events_get(const Ecore_Evas *ee);
+EAPI void       *ecore_evas_window_get(const Ecore_Evas *ee);
 
 
 EAPI int          ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags);
 EAPI int          ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj);
-EAPI Evas_Object *ecore_evas_object_associate_get(Ecore_Evas *ee);
+EAPI Evas_Object *ecore_evas_object_associate_get(const Ecore_Evas *ee);
 
 #ifdef __cplusplus
 }
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index 03f9a9454c..29215aa5cc 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -631,7 +631,7 @@ ecore_evas_engine_name_get(const Ecore_Evas *ee)
  * @return The Ecore_Evas that holds this Evas
  */
 EAPI Ecore_Evas *
-ecore_evas_ecore_evas_get(Evas *e)
+ecore_evas_ecore_evas_get(const Evas *e)
 {
    return evas_data_attach_get(e);
 }
@@ -669,7 +669,7 @@ ecore_evas_free(Ecore_Evas *ee)
  * @see ecore_evas_data_set
  */
 EAPI void *
-ecore_evas_data_get(Ecore_Evas *ee, const char *key)
+ecore_evas_data_get(const Ecore_Evas *ee, const char *key)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1054,7 +1054,7 @@ ecore_evas_callback_pre_free_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * This function returns the Evas contained within @p ee.
  */
 EAPI Evas *
-ecore_evas_get(Ecore_Evas *ee)
+ecore_evas_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1191,7 +1191,7 @@ ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
  *
  */
 EAPI void
-ecore_evas_geometry_get(Ecore_Evas *ee, int *x, int *y, int *w, int *h)
+ecore_evas_geometry_get(const Ecore_Evas *ee, int *x, int *y, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1248,7 +1248,7 @@ ecore_evas_rotation_set(Ecore_Evas *ee, int rot)
  *
  */
 EAPI int
-ecore_evas_rotation_get(Ecore_Evas *ee)
+ecore_evas_rotation_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1292,7 +1292,7 @@ ecore_evas_shaped_set(Ecore_Evas *ee, int shaped)
  * This function returns 1 if @p ee is shaped, and 0 if not.
  */
 EAPI int
-ecore_evas_shaped_get(Ecore_Evas *ee)
+ecore_evas_shaped_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1337,7 +1337,7 @@ ecore_evas_alpha_set(Ecore_Evas *ee, int alpha)
  * it does not.
  */
 EAPI int
-ecore_evas_alpha_get(Ecore_Evas *ee)
+ecore_evas_alpha_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1394,7 +1394,7 @@ ecore_evas_hide(Ecore_Evas *ee)
  * This function queries @p ee and returns 1 if it is visible, and 0 if not.
  */
 EAPI int
-ecore_evas_visibility_get(Ecore_Evas *ee)
+ecore_evas_visibility_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1490,7 +1490,7 @@ ecore_evas_title_set(Ecore_Evas *ee, const char *t)
  * This function returns the title of @p ee.
  */
 EAPI const char *
-ecore_evas_title_get(Ecore_Evas *ee)
+ecore_evas_title_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1532,7 +1532,7 @@ ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c)
  * @p c.
  */
 EAPI void
-ecore_evas_name_class_get(Ecore_Evas *ee, const char **n, const char **c)
+ecore_evas_name_class_get(const Ecore_Evas *ee, const char **n, const char **c)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1584,7 +1584,7 @@ ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
  * This function puts the minimum size of @p ee into @p w and @p h.
  */
 EAPI void
-ecore_evas_size_min_get(Ecore_Evas *ee, int *w, int *h)
+ecore_evas_size_min_get(const Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1644,7 +1644,7 @@ ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
  * This function puts the maximum size of @p ee into @p w and @p h.
  */
 EAPI void
-ecore_evas_size_max_get(Ecore_Evas *ee, int *w, int *h)
+ecore_evas_size_max_get(const Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1704,7 +1704,7 @@ ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
  * This function puts the base size of @p ee into @p w and @p h.
  */
 EAPI void
-ecore_evas_size_base_get(Ecore_Evas *ee, int *w, int *h)
+ecore_evas_size_base_get(const Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1765,7 +1765,7 @@ ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
  * This function puts the step size of @p ee into @p w and @p h.
  */
 EAPI void
-ecore_evas_size_step_get(Ecore_Evas *ee, int *w, int *h)
+ecore_evas_size_step_get(const Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1862,7 +1862,7 @@ ecore_evas_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, int ho
  * This function queries information about an Ecore_Evas' cursor.
  */
 EAPI void
-ecore_evas_cursor_get(Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y)
+ecore_evas_cursor_get(const Ecore_Evas *ee, Evas_Object **obj, int *layer, int *hot_x, int *hot_y)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1903,7 +1903,7 @@ ecore_evas_layer_set(Ecore_Evas *ee, int layer)
  *
  */
 EAPI int
-ecore_evas_layer_get(Ecore_Evas *ee)
+ecore_evas_layer_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1941,7 +1941,7 @@ ecore_evas_focus_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_focus_get(Ecore_Evas *ee)
+ecore_evas_focus_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -1980,7 +1980,7 @@ ecore_evas_iconified_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_iconified_get(Ecore_Evas *ee)
+ecore_evas_iconified_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2019,7 +2019,7 @@ ecore_evas_borderless_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_borderless_get(Ecore_Evas *ee)
+ecore_evas_borderless_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2058,7 +2058,7 @@ ecore_evas_override_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_override_get(Ecore_Evas *ee)
+ecore_evas_override_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2097,7 +2097,7 @@ ecore_evas_maximized_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_maximized_get(Ecore_Evas *ee)
+ecore_evas_maximized_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2136,7 +2136,7 @@ ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
  *
  */
 EAPI int
-ecore_evas_fullscreen_get(Ecore_Evas *ee)
+ecore_evas_fullscreen_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2176,7 +2176,7 @@ ecore_evas_avoid_damage_set(Ecore_Evas *ee, Ecore_Evas_Avoid_Damage_Type on)
  *
  */
 EAPI Ecore_Evas_Avoid_Damage_Type
-ecore_evas_avoid_damage_get(Ecore_Evas *ee)
+ecore_evas_avoid_damage_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
      {
@@ -2214,7 +2214,7 @@ ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn)
  *
  */
 EAPI int
-ecore_evas_withdrawn_get(Ecore_Evas *ee)
+ecore_evas_withdrawn_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
    {
@@ -2254,7 +2254,7 @@ ecore_evas_sticky_set(Ecore_Evas *ee, int sticky)
  *
  */
 EAPI int
-ecore_evas_sticky_get(Ecore_Evas *ee)
+ecore_evas_sticky_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
    {
@@ -2294,7 +2294,7 @@ ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore)
  *
  */
 EAPI int
-ecore_evas_ignore_events_get(Ecore_Evas *ee)
+ecore_evas_ignore_events_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
    {
@@ -2306,7 +2306,7 @@ ecore_evas_ignore_events_get(Ecore_Evas *ee)
 }
 
 EAPI void *
-ecore_evas_window_get(Ecore_Evas *ee)
+ecore_evas_window_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
    {
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
index 0af793559a..866b700fef 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -511,7 +511,7 @@ ecore_evas_buffer_new(int w, int h)
 #endif
 }
 
-EAPI const int *
+EAPI const void *
 ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_BUFFER
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
index d0fc2b212d..b80925477e 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_directfb.c
@@ -480,7 +480,7 @@ _ecore_evas_directfb_fullscreen_set(Ecore_Evas *ee, int on)
 #endif
 
 static void *
-_ecore_evas_directfb_window_get(Ecore_Evas *ee)
+_ecore_evas_directfb_window_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_DIRECTFB
    return ee->engine.directfb.window;
@@ -545,7 +545,7 @@ static const Ecore_Evas_Engine_Func _ecore_directfb_engine_func =
 /*******/
 
 Ecore_DirectFB_Window *
-ecore_evas_directfb_window_get(Ecore_Evas *ee)
+ecore_evas_directfb_window_get(const Ecore_Evas *ee)
 {
    return (Ecore_DirectFB_Window *) _ecore_evas_directfb_window_get(ee);
 }
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
index 21a4c27958..89d9391e48 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_fb.c
@@ -586,7 +586,7 @@ static const Ecore_Evas_Engine_Func _ecore_fb_engine_func =
  * FIXME: To be fixed.
  */
 EAPI Ecore_Evas *
-ecore_evas_fb_new(char *disp_name, int rotation, int w, int h)
+ecore_evas_fb_new(const char *disp_name, int rotation, int w, int h)
 {
 #ifdef BUILD_ECORE_EVAS_FB
    Evas_Engine_Info_FB *einfo;
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
index 42ab523b46..1bcfd92288 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_private.h
@@ -145,7 +145,7 @@ struct _Ecore_Evas_Engine_Func
    void        (*fn_sticky_set) (Ecore_Evas *ee, int sticky);
    void        (*fn_ignore_events_set) (Ecore_Evas *ee, int ignore);
    void        (*fn_alpha_set) (Ecore_Evas *ee, int alpha);
-   void       *(*fn_window_get) (Ecore_Evas *ee);
+   void       *(*fn_window_get) (const Ecore_Evas *ee);
 };
 
 struct _Ecore_Evas_Engine
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c
index 01588b3270..15eeb1e3bb 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_util.c
@@ -15,7 +15,7 @@ static void _ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj);
 
 
 static Evas_Object *
-_ecore_evas_associate_get(Ecore_Evas *ee)
+_ecore_evas_associate_get(const Ecore_Evas *ee)
 {
    return ecore_evas_data_get(ee, ASSOCIATE_KEY);
 }
@@ -33,7 +33,7 @@ _ecore_evas_associate_del(Ecore_Evas *ee)
 }
 
 static Ecore_Evas *
-_evas_object_associate_get(Evas_Object *obj)
+_evas_object_associate_get(const Evas_Object *obj)
 {
    return evas_object_data_get(obj, ASSOCIATE_KEY);
 }
@@ -313,7 +313,7 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj)
 }
 
 EAPI Evas_Object *
-ecore_evas_object_associate_get(Ecore_Evas *ee)
+ecore_evas_object_associate_get(const Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
    {
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
index 3406d95142..b1735a655b 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_win32.c
@@ -1281,7 +1281,7 @@ ecore_evas_gl_glew_new(Ecore_Win32_Window *parent,
 }
 
 EAPI Ecore_Win32_Window *
-ecore_evas_win32_window_get(Ecore_Evas *ee)
+ecore_evas_win32_window_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_WIN32
    return (Ecore_Win32_Window *) _ecore_evas_win32_window_get(ee);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
index 61d058409b..3c2a630dd0 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_wince.c
@@ -1070,7 +1070,7 @@ ecore_evas_software_wince_ddraw_new(Ecore_WinCE_Window *parent,
 }
 
 EAPI Ecore_WinCE_Window *
-ecore_evas_software_wince_window_get(Ecore_Evas *ee)
+ecore_evas_software_wince_window_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_SOFTWARE_16_WINCE
    return (Ecore_WinCE_Window *) _ecore_evas_wince_window_get(ee);
diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
index 3a3a987f8f..cfb935e977 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -2032,7 +2032,7 @@ _ecore_evas_x_alpha_set(Ecore_Evas *ee, int alpha)
 #endif /* BUILD_ECORE_EVAS_X11 */
 
 static void *
-_ecore_evas_x_window_get(Ecore_Evas *ee)
+_ecore_evas_x_window_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_X11
   return (void *) (long)ee->engine.x.win;
@@ -2845,7 +2845,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_software_x11_window_get(Ecore_Evas *ee)
+ecore_evas_software_x11_window_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB)
   return (Ecore_X_Window) (long)_ecore_evas_x_window_get(ee);
@@ -2860,7 +2860,7 @@ ecore_evas_software_x11_window_get(Ecore_Evas *ee)
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_software_x11_subwindow_get(Ecore_Evas *ee)
+ecore_evas_software_x11_subwindow_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB)
   return (Ecore_X_Window) (long)_ecore_evas_x_window_get(ee);
@@ -2908,7 +2908,7 @@ ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on)
  * FIXME: To be fixed.
  */
 EAPI int
-ecore_evas_software_x11_direct_resize_get(Ecore_Evas *ee)
+ecore_evas_software_x11_direct_resize_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_SOFTWARE_X11) || defined (BUILD_ECORE_EVAS_SOFTWARE_XCB)
    return ee->engine.x.direct_resize;
@@ -3038,7 +3038,7 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
+ecore_evas_gl_x11_window_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_OPENGL_X11
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3053,7 +3053,7 @@ ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_gl_x11_subwindow_get(Ecore_Evas *ee)
+ecore_evas_gl_x11_subwindow_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_OPENGL_X11
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3083,7 +3083,7 @@ ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on)
  * FIXME: To be fixed.
  */
 EAPI int
-ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee)
+ecore_evas_gl_x11_direct_resize_get(const Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_OPENGL_X11
    return ee->engine.x.direct_resize;
@@ -3292,7 +3292,7 @@ ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent,
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_xrender_x11_window_get(Ecore_Evas *ee)
+ecore_evas_xrender_x11_window_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB)
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3307,7 +3307,7 @@ ecore_evas_xrender_x11_window_get(Ecore_Evas *ee)
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_xrender_x11_subwindow_get(Ecore_Evas *ee)
+ecore_evas_xrender_x11_subwindow_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB)
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3337,7 +3337,7 @@ ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on)
  * FIXME: To be fixed.
  */
 EAPI int
-ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee)
+ecore_evas_xrender_x11_direct_resize_get(const Ecore_Evas *ee)
 {
 #if defined (BUILD_ECORE_EVAS_XRENDER_X11) || defined (BUILD_ECORE_EVAS_XRENDER_XCB)
    return ee->engine.x.direct_resize;
@@ -3506,7 +3506,7 @@ ecore_evas_software_x11_16_new(const char *disp_name, Ecore_X_Window parent,
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_software_x11_16_window_get(Ecore_Evas *ee)
+ecore_evas_software_x11_16_window_get(const Ecore_Evas *ee)
 {
 #if BUILD_ECORE_EVAS_SOFTWARE_16_X11
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3521,7 +3521,7 @@ ecore_evas_software_x11_16_window_get(Ecore_Evas *ee)
  * FIXME: To be fixed.
  */
 EAPI Ecore_X_Window
-ecore_evas_software_x11_16_subwindow_get(Ecore_Evas *ee)
+ecore_evas_software_x11_16_subwindow_get(const Ecore_Evas *ee)
 {
 #if BUILD_ECORE_EVAS_SOFTWARE_16_X11
    return (Ecore_X_Window) _ecore_evas_x_window_get(ee);
@@ -3569,7 +3569,7 @@ ecore_evas_software_x11_16_direct_resize_set(Ecore_Evas *ee, int on)
  * FIXME: To be fixed.
  */
 EAPI int
-ecore_evas_software_x11_16_direct_resize_get(Ecore_Evas *ee)
+ecore_evas_software_x11_16_direct_resize_get(const Ecore_Evas *ee)
 {
 #if BUILD_ECORE_EVAS_SOFTWARE_16_X11
    return ee->engine.x.direct_resize;