diff --git a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
index d913ee28fd..95c09533f5 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas.c
@@ -16,7 +16,7 @@ static int _ecore_evas_idle_enter_delete(void *data);
  * Query if engine @param engine is supported by ecore_evas. 1 is returned if
  * it is, and 0 is returned if it is not supported.
  */
-int
+EAPI int
 ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
 {
    switch (engine)
@@ -74,7 +74,7 @@ ecore_evas_engine_type_supported_get(Ecore_Evas_Engine_Type engine)
  * 
  * Set up the Evas wrapper system.
  */
-int
+EAPI int
 ecore_evas_init(void)
 {
    if (_ecore_evas_init_count == 0)
@@ -88,7 +88,7 @@ ecore_evas_init(void)
  * 
  * This closes the Evas system down.
  */
-int
+EAPI int
 ecore_evas_shutdown(void)
 {
    _ecore_evas_init_count--;
@@ -118,7 +118,7 @@ ecore_evas_shutdown(void)
  * @param e The Evas to get the Ecore_Evas from
  * @return The Ecore_Evas that holds this Evas
  */
-Ecore_Evas *
+EAPI Ecore_Evas *
 ecore_evas_ecore_evas_get(Evas *e)
 {
    return evas_data_attach_get(e);
@@ -130,7 +130,7 @@ ecore_evas_ecore_evas_get(Evas *e)
  *
  * This frees up any memory used by the Ecore_Evas. 
  */
-void
+EAPI void
 ecore_evas_free(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -145,7 +145,7 @@ ecore_evas_free(Ecore_Evas *ee)
    return;
 }
 
-void *
+EAPI void *
 ecore_evas_data_get(Ecore_Evas *ee, const char *key)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -160,7 +160,7 @@ ecore_evas_data_get(Ecore_Evas *ee, const char *key)
    return evas_hash_find(ee->data, key);
 }
 
-void
+EAPI void
 ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -188,7 +188,7 @@ ecore_evas_data_set(Ecore_Evas *ee, const char *key, const void *data)
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee is resized.
  */
-void
+EAPI void
 ecore_evas_callback_resize_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -210,7 +210,7 @@ ecore_evas_callback_resize_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee is moved.
  */
-void
+EAPI void
 ecore_evas_callback_move_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -232,7 +232,7 @@ ecore_evas_callback_move_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee is shown.
  */
-void
+EAPI void
 ecore_evas_callback_show_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -254,7 +254,7 @@ ecore_evas_callback_show_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee is hidden.
  */
-void
+EAPI void
 ecore_evas_callback_hide_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -276,7 +276,7 @@ ecore_evas_callback_hide_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee gets a delete request.
  */
-void
+EAPI void
 ecore_evas_callback_delete_request_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -298,7 +298,7 @@ ecore_evas_callback_delete_request_set(Ecore_Evas *ee, void (*func) (Ecore_Evas
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee is destroyed.
  */
-void
+EAPI void
 ecore_evas_callback_destroy_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -320,7 +320,7 @@ ecore_evas_callback_destroy_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee gets focus.
  */
-void
+EAPI void
 ecore_evas_callback_focus_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -342,7 +342,7 @@ ecore_evas_callback_focus_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever @p ee loses focus.
  */
-void
+EAPI void
 ecore_evas_callback_focus_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -364,7 +364,7 @@ ecore_evas_callback_focus_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever the mouse enters @p ee.
  */
-void
+EAPI void
 ecore_evas_callback_mouse_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -386,7 +386,7 @@ ecore_evas_callback_mouse_in_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called whenever the mouse leaves @p ee.
  */
-void
+EAPI void
 ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -408,7 +408,7 @@ ecore_evas_callback_mouse_out_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called just before the evas in @p ee is rendered.
  */
-void
+EAPI void
 ecore_evas_callback_pre_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -430,7 +430,7 @@ ecore_evas_callback_pre_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee)
  * A call to this function will set a callback on an Ecore_Evas, causing
  * @p func to be called just after the evas in @p ee is rendered.
  */
-void
+EAPI void
 ecore_evas_callback_post_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee))
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -451,7 +451,7 @@ ecore_evas_callback_post_render_set(Ecore_Evas *ee, void (*func) (Ecore_Evas *ee
  * 
  * This function returns the Evas contained within @p ee.
  */
-Evas *
+EAPI Evas *
 ecore_evas_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -471,7 +471,7 @@ ecore_evas_get(Ecore_Evas *ee)
  *
  * This moves @p ee to the screen coordinates (@p x, @p y)
  */
-void
+EAPI void
 ecore_evas_move(Ecore_Evas *ee, int x, int y)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -492,7 +492,7 @@ ecore_evas_move(Ecore_Evas *ee, int x, int y)
  *
  * This sets the managed geometry position of the @p ee to (@p x, @p y)
  */
-void
+EAPI void
 ecore_evas_managed_move(Ecore_Evas *ee, int x, int y)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -513,7 +513,7 @@ ecore_evas_managed_move(Ecore_Evas *ee, int x, int y)
  *
  * This resizes @p ee to @p w x @p h
  */
-void
+EAPI void
 ecore_evas_resize(Ecore_Evas *ee, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -548,7 +548,7 @@ ecore_evas_resize(Ecore_Evas *ee, int w, int h)
  * it to @p w x @p h.
  *
  */
-void
+EAPI void
 ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -588,7 +588,7 @@ ecore_evas_move_resize(Ecore_Evas *ee, int x, int y, int w, int h)
  * @endcode
  *
  */
-void
+EAPI void
 ecore_evas_geometry_get(Ecore_Evas *ee, int *x, int *y, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -622,7 +622,7 @@ ecore_evas_geometry_get(Ecore_Evas *ee, int *x, int *y, int *w, int *h)
  * The allowed values of @p rot depend on the engine being used. Most only
  * allow multiples of 90.
  */
-void
+EAPI void
 ecore_evas_rotation_set(Ecore_Evas *ee, int rot)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -645,7 +645,7 @@ ecore_evas_rotation_set(Ecore_Evas *ee, int rot)
  * @return the angle (in degrees) of rotation.
  *
  */
-int
+EAPI int
 ecore_evas_rotation_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -669,7 +669,7 @@ ecore_evas_rotation_get(Ecore_Evas *ee)
  * non-shaped Ecore_Evases, it is recommend to cover the entire evas with a
  * background object.
  */
-void
+EAPI void
 ecore_evas_shaped_set(Ecore_Evas *ee, int shaped)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -689,7 +689,7 @@ ecore_evas_shaped_set(Ecore_Evas *ee, int shaped)
  *
  * This function returns 1 if @p ee is shaped, and 0 if not.
  */
-int
+EAPI int
 ecore_evas_shaped_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -707,7 +707,7 @@ ecore_evas_shaped_get(Ecore_Evas *ee)
  *
  * This function makes @p ee visible.
  */
-void
+EAPI void
 ecore_evas_show(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -726,7 +726,7 @@ ecore_evas_show(Ecore_Evas *ee)
  *
  * This function makes @p ee hidden.
  */
-void
+EAPI void
 ecore_evas_hide(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -746,7 +746,7 @@ ecore_evas_hide(Ecore_Evas *ee)
  *
  * This function queries @p ee and returns 1 if it is visible, and 0 if not.
  */
-int
+EAPI int
 ecore_evas_visibility_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -764,7 +764,7 @@ ecore_evas_visibility_get(Ecore_Evas *ee)
  *
  * This functions raises the Ecore_Evas to the front.
  */
-void
+EAPI void
 ecore_evas_raise(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -783,7 +783,7 @@ ecore_evas_raise(Ecore_Evas *ee)
  *
  * This functions lowers the Ecore_Evas to the back.
  */
-void
+EAPI void
 ecore_evas_lower(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -803,7 +803,7 @@ ecore_evas_lower(Ecore_Evas *ee)
  * 
  * This function sets the title of @p ee to @p t.
  */
-void
+EAPI void
 ecore_evas_title_set(Ecore_Evas *ee, const char *t)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -823,7 +823,7 @@ ecore_evas_title_set(Ecore_Evas *ee, const char *t)
  *
  * This function returns the title of @p ee.
  */
-const char *
+EAPI const char *
 ecore_evas_title_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -843,7 +843,7 @@ ecore_evas_title_get(Ecore_Evas *ee)
  *
  * This function sets the name of @p ee to @p n, and its class to @p c.
  */
-void
+EAPI void
 ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -865,7 +865,7 @@ ecore_evas_name_class_set(Ecore_Evas *ee, const char *n, const char *c)
  * This function gets puts the name of @p ee into @p n, and its class into
  * @p c.
  */
-void
+EAPI void
 ecore_evas_name_class_get(Ecore_Evas *ee, const char **n, const char **c)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -886,7 +886,7 @@ ecore_evas_name_class_get(Ecore_Evas *ee, const char **n, const char **c)
  *
  * This function sets the minimum size of @p ee to @p w x @p h.
  */
-void
+EAPI void
 ecore_evas_size_min_set(Ecore_Evas *ee, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -917,7 +917,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.
  */
-void
+EAPI void
 ecore_evas_size_min_get(Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -946,7 +946,7 @@ ecore_evas_size_min_get(Ecore_Evas *ee, int *w, int *h)
  *
  * This function sets the maximum size of @p ee to @p w x @p h.
  */
-void
+EAPI void
 ecore_evas_size_max_set(Ecore_Evas *ee, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -977,7 +977,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.
  */
-void
+EAPI void
 ecore_evas_size_max_get(Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1006,7 +1006,7 @@ ecore_evas_size_max_get(Ecore_Evas *ee, int *w, int *h)
  *
  * This function sets the base size of @p ee to @p w x @p h.
  */
-void
+EAPI void
 ecore_evas_size_base_set(Ecore_Evas *ee, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1037,7 +1037,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.
  */
-void
+EAPI void
 ecore_evas_size_base_get(Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1067,7 +1067,7 @@ ecore_evas_size_base_get(Ecore_Evas *ee, int *w, int *h)
  * This function sets the step size of @p ee to @p w x @p h. This limits the
  * size of an Ecore_Evas to always being an integer multiple of the step size.
  */
-void
+EAPI void
 ecore_evas_size_step_set(Ecore_Evas *ee, int w, int h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1098,7 +1098,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.
  */
-void
+EAPI void
 ecore_evas_size_step_get(Ecore_Evas *ee, int *w, int *h)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1132,7 +1132,7 @@ ecore_evas_size_step_get(Ecore_Evas *ee, int *w, int *h)
  * by @p hot_x and @p hot_y, which are coordinates with respect to the top left
  * corner of the cursor image.
  */
-void
+EAPI void
 ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, int hot_y)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1155,7 +1155,7 @@ ecore_evas_cursor_set(Ecore_Evas *ee, const char *file, int layer, int hot_x, in
  *
  * This function queries information about an Ecore_Evas' cursor.
  */
-void
+EAPI void
 ecore_evas_cursor_get(Ecore_Evas *ee, char **file, int *layer, int *hot_x, int *hot_y)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1177,7 +1177,7 @@ ecore_evas_cursor_get(Ecore_Evas *ee, char **file, int *layer, int *hot_x, int *
  *
  * This function moves @p ee to the layer @p layer.
  */
-void
+EAPI void
 ecore_evas_layer_set(Ecore_Evas *ee, int layer)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1196,7 +1196,7 @@ ecore_evas_layer_set(Ecore_Evas *ee, int layer)
  * @return the layer @p ee's window is on.
  *
  */
-int
+EAPI int
 ecore_evas_layer_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1215,7 +1215,7 @@ ecore_evas_layer_get(Ecore_Evas *ee)
  *
  * This function focuses @p ee if @p on is 1, or defocuses @p ee if @p on is 0.
  */
-void
+EAPI void
 ecore_evas_focus_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1234,7 +1234,7 @@ ecore_evas_focus_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee if focused, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_focus_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1254,7 +1254,7 @@ ecore_evas_focus_get(Ecore_Evas *ee)
  * This function iconifies @p ee if @p on is 1, or uniconifies @p ee if @p on
  * is 0.
  */
-void
+EAPI void
 ecore_evas_iconified_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1273,7 +1273,7 @@ ecore_evas_iconified_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee is iconified, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_iconified_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1293,7 +1293,7 @@ ecore_evas_iconified_get(Ecore_Evas *ee)
  * This function makes @p ee borderless if @p on is 1, or bordered if @p on
  * is 0.
  */
-void
+EAPI void
 ecore_evas_borderless_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1312,7 +1312,7 @@ ecore_evas_borderless_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee is borderless, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_borderless_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1332,7 +1332,7 @@ ecore_evas_borderless_get(Ecore_Evas *ee)
  * This function causes the window manager to ignore @p ee if @p on is 1,
  * or not ignore @p ee if @p on is 0.
  */
-void
+EAPI void
 ecore_evas_override_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1351,7 +1351,7 @@ ecore_evas_override_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee is overridden, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_override_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1371,7 +1371,7 @@ ecore_evas_override_get(Ecore_Evas *ee)
  * This function maximizes @p ee if @p on is 1, or unmaximizes @p ee
  * if @p on is 0.
  */
-void
+EAPI void
 ecore_evas_maximized_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1390,7 +1390,7 @@ ecore_evas_maximized_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee is maximized, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_maximized_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1410,7 +1410,7 @@ ecore_evas_maximized_get(Ecore_Evas *ee)
  * This function causes @p ee to be fullscreen if @p on is 1,
  * or not if @p on is 0.
  */
-void
+EAPI void
 ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1429,7 +1429,7 @@ ecore_evas_fullscreen_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee is fullscreen, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_fullscreen_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1450,7 +1450,7 @@ ecore_evas_fullscreen_get(Ecore_Evas *ee)
  * This function causes @p ee to be drawn to a pixmap to avoid recalculations.
  * On expose events it will copy from the pixmap to the window.
  */
-void
+EAPI void
 ecore_evas_avoid_damage_set(Ecore_Evas *ee, int on)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1469,7 +1469,7 @@ ecore_evas_avoid_damage_set(Ecore_Evas *ee, int on)
  * @return 1 if @p ee avoids damage, 0 if not.
  *
  */
-int
+EAPI int
 ecore_evas_avoid_damage_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1487,7 +1487,7 @@ ecore_evas_avoid_damage_get(Ecore_Evas *ee)
  * @param withdrawn The Ecore_Evas window's new withdrawn state.
  *
  */
-void
+EAPI void
 ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1507,7 +1507,7 @@ ecore_evas_withdrawn_set(Ecore_Evas *ee, int withdrawn)
  * @return The Ecore_Evas window's withdrawn state.
  *
  */
-int
+EAPI int
 ecore_evas_withdrawn_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1526,7 +1526,7 @@ ecore_evas_withdrawn_get(Ecore_Evas *ee)
  * @param sticky The Ecore_Evas window's new sticky state.
  *
  */
-void
+EAPI void
 ecore_evas_sticky_set(Ecore_Evas *ee, int sticky)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1547,7 +1547,7 @@ ecore_evas_sticky_set(Ecore_Evas *ee, int sticky)
  * @return The Ecore_Evas window's sticky state.
  *
  */
-int
+EAPI int
 ecore_evas_sticky_get(Ecore_Evas *ee)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1566,7 +1566,7 @@ ecore_evas_sticky_get(Ecore_Evas *ee)
  * @param sticky The Ecore_Evas new ignore state
  *
  */
-void
+EAPI void
 ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore)
 {
    if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS))
@@ -1587,7 +1587,7 @@ ecore_evas_ignore_events_set(Ecore_Evas *ee, int ignore)
  * @return The Ecore_Evas window's ignore state.
  *
  */
-int
+EAPI int
 ecore_evas_ignore_events_get(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 aa87b4882a..cc2c0a4a26 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_buffer.c
@@ -424,7 +424,7 @@ static const Ecore_Evas_Engine_Func _ecore_buffer_engine_func =
  *
  * FIXME: To be fixed.
  */
-Ecore_Evas *
+EAPI Ecore_Evas *
 ecore_evas_buffer_new(int w, int h)
 {
 #ifdef BUILD_ECORE_EVAS_BUFFER
@@ -503,7 +503,7 @@ ecore_evas_buffer_new(int w, int h)
 #endif   
 }
 
-const int *
+EAPI const int *
 ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_EVAS_BUFFER
@@ -514,7 +514,7 @@ ecore_evas_buffer_pixels_get(Ecore_Evas *ee)
 #endif   
 }
 
-Evas_Object *
+EAPI Evas_Object *
 ecore_evas_object_image_new(Ecore_Evas *ee_target)
 {
 #ifdef BUILD_ECORE_EVAS_BUFFER
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 9f5ff208a3..65435d0d73 100644
--- a/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
+++ b/legacy/ecore/src/lib/ecore_evas/ecore_evas_x.c
@@ -1786,7 +1786,7 @@ static const Ecore_Evas_Engine_Func _ecore_x_engine_func =
  *
  * FIXME: To be fixed.
  */
-Ecore_Evas *
+EAPI Ecore_Evas *
 ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent, 
 			    int x, int y, int w, int h)
 {
@@ -1916,7 +1916,7 @@ ecore_evas_software_x11_new(const char *disp_name, Ecore_X_Window parent,
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_software_x11_window_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -1931,7 +1931,7 @@ ecore_evas_software_x11_window_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_software_x11_subwindow_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -1946,7 +1946,7 @@ ecore_evas_software_x11_subwindow_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on)
 {
 #ifdef BUILD_ECORE_X
@@ -1977,7 +1977,7 @@ ecore_evas_software_x11_direct_resize_set(Ecore_Evas *ee, int on)
  *
  * FIXME: To be fixed.
  */
-int
+EAPI int
 ecore_evas_software_x11_direct_resize_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -1992,7 +1992,7 @@ ecore_evas_software_x11_direct_resize_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
 {
 #ifdef BUILD_ECORE_X
@@ -2014,7 +2014,7 @@ ecore_evas_software_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window wi
  *
  * FIXME: To be fixed.
  */
-Ecore_Evas *
+EAPI Ecore_Evas *
 ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent, 
 		      int x, int y, int w, int h)
 {
@@ -2159,7 +2159,7 @@ ecore_evas_gl_x11_new(const char *disp_name, Ecore_X_Window parent,
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -2174,7 +2174,7 @@ ecore_evas_gl_x11_window_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_gl_x11_subwindow_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -2189,7 +2189,7 @@ ecore_evas_gl_x11_subwindow_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on)
 {
 #ifdef BUILD_ECORE_X
@@ -2204,7 +2204,7 @@ ecore_evas_gl_x11_direct_resize_set(Ecore_Evas *ee, int on)
  *
  * FIXME: To be fixed.
  */
-int
+EAPI int
 ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -2219,7 +2219,7 @@ ecore_evas_gl_x11_direct_resize_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
 {
    ecore_evas_software_x11_extra_event_window_add(ee, win);
@@ -2230,7 +2230,7 @@ ecore_evas_gl_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
  *
  * FIXME: To be fixed.
  */
-Ecore_Evas *
+EAPI Ecore_Evas *
 ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent, 
 		      int x, int y, int w, int h)
 {
@@ -2347,7 +2347,7 @@ ecore_evas_xrender_x11_new(const char *disp_name, Ecore_X_Window parent,
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_xrender_x11_window_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X 
@@ -2362,7 +2362,7 @@ ecore_evas_xrender_x11_window_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-Ecore_X_Window
+EAPI Ecore_X_Window
 ecore_evas_xrender_x11_subwindow_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -2377,7 +2377,7 @@ ecore_evas_xrender_x11_subwindow_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on)
 {
 #ifdef BUILD_ECORE_X
@@ -2392,7 +2392,7 @@ ecore_evas_xrender_x11_direct_resize_set(Ecore_Evas *ee, int on)
  *
  * FIXME: To be fixed.
  */
-int
+EAPI int
 ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee)
 {
 #ifdef BUILD_ECORE_X
@@ -2407,7 +2407,7 @@ ecore_evas_xrender_x11_direct_resize_get(Ecore_Evas *ee)
  *
  * FIXME: To be fixed.
  */
-void
+EAPI void
 ecore_evas_xrender_x11_extra_event_window_add(Ecore_Evas *ee, Ecore_X_Window win)
 {
    ecore_evas_software_x11_extra_event_window_add(ee, win);
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file.c b/legacy/ecore/src/lib/ecore_file/ecore_file.c
index 97538bd9ed..5b50515845 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file.c
@@ -1,14 +1,14 @@
 /*
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
-#include "ecore_file_private.h"
 #include <ctype.h>
+#include "ecore_file_private.h"
 
 
 static int init = 0;
 
 /* externally accessible functions */
-int
+EAPI int
 ecore_file_init()
 {
    if (++init != 1) return init;
@@ -30,7 +30,7 @@ error:
    return --init;
 }
 
-int
+EAPI int
 ecore_file_shutdown()
 {
    if (--init != 0) return init;
@@ -42,7 +42,7 @@ ecore_file_shutdown()
    return init;
 }
 
-time_t
+EAPI time_t
 ecore_file_mod_time(const char *file)
 {
    struct stat st;
@@ -51,7 +51,7 @@ ecore_file_mod_time(const char *file)
    return st.st_mtime;
 }
 
-int
+EAPI int
 ecore_file_size(const char *file)
 {
    struct stat st;
@@ -60,7 +60,7 @@ ecore_file_size(const char *file)
    return st.st_size;
 }
 
-int
+EAPI int
 ecore_file_exists(const char *file)
 {
    struct stat st;
@@ -70,7 +70,7 @@ ecore_file_exists(const char *file)
    return 1;
 }
 
-int
+EAPI int
 ecore_file_is_dir(const char *file)
 {
    struct stat st;
@@ -82,28 +82,28 @@ ecore_file_is_dir(const char *file)
 
 static mode_t default_mode = S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 
-int
+EAPI int
 ecore_file_mkdir(const char *dir)
 {
    if (mkdir(dir, default_mode) < 0) return 0;
    return 1;
 }
 
-int
+EAPI int
 ecore_file_rmdir(const char *dir)
 {
    if (rmdir(dir) < 0) return 0;
    return 1;
 }
 
-int
+EAPI int
 ecore_file_unlink(const char *file)
 {
    if (unlink(file) < 0) return 0;
    return 1;
 }
 
-int
+EAPI int
 ecore_file_recursive_rm(const char *dir)
 {
    DIR                *dirp;
@@ -150,7 +150,7 @@ ecore_file_recursive_rm(const char *dir)
    return ret;
 }
 
-int
+EAPI int
 ecore_file_mkpath(const char *path)
 {
    char ss[PATH_MAX];
@@ -177,7 +177,7 @@ ecore_file_mkpath(const char *path)
    return 1;
 }
 
-int
+EAPI int
 ecore_file_cp(const char *src, const char *dst)
 {
    FILE               *f1, *f2;
@@ -203,7 +203,7 @@ ecore_file_cp(const char *src, const char *dst)
    return 1;
 }
 
-int
+EAPI int
 ecore_file_mv(const char *src, const char *dst)
 {
    if (ecore_file_exists(dst)) return 0;
@@ -211,7 +211,7 @@ ecore_file_mv(const char *src, const char *dst)
    return 1;
 }
 
-int
+EAPI int
 ecore_file_symlink(const char *src, const char *dest)
 {
    if(!symlink(src, dest))
@@ -219,7 +219,7 @@ ecore_file_symlink(const char *src, const char *dest)
    return 0;
 }
 
-char *
+EAPI char *
 ecore_file_realpath(const char *file)
 {
    char  buf[PATH_MAX];
@@ -229,18 +229,18 @@ ecore_file_realpath(const char *file)
    return strdup(buf);
 }
 
-const char *
+EAPI const char *
 ecore_file_get_file(const char *path)
 {
    char *result = NULL;
 
    if (!path) return NULL;
    if ((result = strrchr(path, '/'))) result++;
-   else result = path;
+   else result = (char *)path;
    return result;
 }
 
-char *
+EAPI char *
 ecore_file_get_dir(char *file)
 {
    char               *p;
@@ -256,7 +256,7 @@ ecore_file_get_dir(char *file)
    return strdup(buf);
 }
 
-int
+EAPI int
 ecore_file_can_read(const char *file)
 {
    if (!file) return 0;
@@ -264,7 +264,7 @@ ecore_file_can_read(const char *file)
    return 0;
 }
 
-int
+EAPI int
 ecore_file_can_write(const char *file)
 {
    if (!file) return 0;
@@ -272,7 +272,7 @@ ecore_file_can_write(const char *file)
    return 0;
 }
 
-int
+EAPI int
 ecore_file_can_exec(const char *file)
 {
    if (!file) return 0;
@@ -280,7 +280,7 @@ ecore_file_can_exec(const char *file)
    return 0;
 }
 
-char *
+EAPI char *
 ecore_file_readlink(const char *link)
 {
    char                buf[PATH_MAX];
@@ -291,7 +291,7 @@ ecore_file_readlink(const char *link)
    return strdup(buf);
 }
 
-Ecore_List *
+EAPI Ecore_List *
 ecore_file_ls(const char *dir)
 {
    char               *f;
@@ -339,7 +339,7 @@ ecore_file_ls(const char *dir)
    return list;
 }
 
-char *
+EAPI char *
 ecore_file_app_exe_get(const char *app)
 {
    char *p, *pp, *exe1 = NULL, *exe2 = NULL;
@@ -482,7 +482,7 @@ restart:
    return exe;
 }
 
-char *
+EAPI char *
 ecore_file_strip_ext(const char *path)
 {
    char *p, *file = NULL;
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
index 75bc5f34ec..601bae84b0 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_download.c
@@ -80,12 +80,12 @@ ecore_file_download_shutdown(void)
    return init;
 }
 
-int
+EAPI int
 ecore_file_download(const char *url, const char *dst,
 		    void (*completion_cb)(void *data, const char *file, int status),
 		    void *data)
 {
-   if (!ecore_file_is_dir(ecore_file_get_dir(dst))) return 0;
+   if (!ecore_file_is_dir(ecore_file_get_dir((char *)dst))) return 0;
    if (ecore_file_exists(dst)) return 0;
 
    /* FIXME: Add handlers for http and ftp! */
@@ -120,7 +120,7 @@ ecore_file_download(const char *url, const char *dst,
      }
 }
 
-int
+EAPI int
 ecore_file_download_protocol_available(const char *protocol)
 {
    if (!strncmp(protocol, "file://", 7)) return 1;
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
index 7b7a57e6c7..a06256b950 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
@@ -74,7 +74,7 @@ ecore_file_monitor_shutdown(void)
    return init;
 }
 
-Ecore_File_Monitor *
+EAPI Ecore_File_Monitor *
 ecore_file_monitor_add(const char *path,
 			    void (*func) (void *data, Ecore_File_Monitor *em,
 					  Ecore_File_Event event,
@@ -101,7 +101,7 @@ ecore_file_monitor_add(const char *path,
    return NULL;
 }
 
-void
+EAPI void
 ecore_file_monitor_del(Ecore_File_Monitor *em)
 {
    switch (monitor_type)
@@ -126,7 +126,7 @@ ecore_file_monitor_del(Ecore_File_Monitor *em)
      }
 }
 
-const char *
+EAPI const char *
 ecore_file_monitor_path_get(Ecore_File_Monitor *em)
 {
    return em->path;
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c
index f953c6371a..d1f634db18 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_path.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_path.c
@@ -57,7 +57,7 @@ _ecore_file_path_from_env(const char *env)
    return path;
 }
 
-int
+EAPI int
 ecore_file_app_installed(const char *exe)
 {
    char *dir;
@@ -75,7 +75,7 @@ ecore_file_app_installed(const char *exe)
    return 0;
 }
 
-Ecore_List *
+EAPI Ecore_List *
 ecore_file_app_list(void)
 {
    Ecore_List *list, *files;
diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
index 8330cb95a0..87c3ec9127 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
@@ -22,39 +22,39 @@ struct _Ecore_File_Monitor
 };
 
 #ifdef HAVE_INOTIFY
-EAPI int                 ecore_file_monitor_inotify_init(void);
-EAPI int                 ecore_file_monitor_inotify_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_inotify_add(const char *path,
+int                 ecore_file_monitor_inotify_init(void);
+int                 ecore_file_monitor_inotify_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_inotify_add(const char *path,
 							void (*func) (void *data,
 								      Ecore_File_Monitor *ecore_file_monitor,
 								      Ecore_File_Event event,
 								      const char *path),
 							void *data);
-EAPI void                ecore_file_monitor_inotify_del(Ecore_File_Monitor *ecore_file_monitor);
+void                ecore_file_monitor_inotify_del(Ecore_File_Monitor *ecore_file_monitor);
 #endif
 
 #ifdef HAVE_FAM
-EAPI int                 ecore_file_monitor_fam_init(void);
-EAPI int                 ecore_file_monitor_fam_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
+int                 ecore_file_monitor_fam_init(void);
+int                 ecore_file_monitor_fam_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
 						    void (*func) (void *data,
 								  Ecore_File_Monitor *ecore_file_monitor,
 								  Ecore_File_Event event,
 								  const char *path),
 						    void *data);
-EAPI void                ecore_file_monitor_fam_del(Ecore_File_Monitor *ecore_file_monitor);
+void                ecore_file_monitor_fam_del(Ecore_File_Monitor *ecore_file_monitor);
 #endif
 
 #ifdef HAVE_POLL
-EAPI int                 ecore_file_monitor_poll_init(void);
-EAPI int                 ecore_file_monitor_poll_shutdown(void);
-EAPI Ecore_File_Monitor *ecore_file_monitor_poll_add(const char *path,
-						     void (*func) (void *data,
-								   Ecore_File_Monitor *ecore_file_monitor,
-								   Ecore_File_Event event,
-								   const char *path),
-						     void *data);
-EAPI void                ecore_file_monitor_poll_del(Ecore_File_Monitor *ecore_file_monitor);
+int                 ecore_file_monitor_poll_init(void);
+int                 ecore_file_monitor_poll_shutdown(void);
+Ecore_File_Monitor *ecore_file_monitor_poll_add(const char *path,
+						void (*func) (void *data,
+							      Ecore_File_Monitor *ecore_file_monitor,
+							      Ecore_File_Event event,
+							      const char *path),
+						void *data);
+void                ecore_file_monitor_poll_del(Ecore_File_Monitor *ecore_file_monitor);
 
 /* ecore_file_path */
 int ecore_file_path_init(void);