evas: Rename EAPI macro to EVAS_API in Evas library

Summary:
Patch from a series of patches to rename EAPI symbols to specific
library DSOs.

=  The Rationale =

This patch is from a series of patches to rename EAPI symbols to
specific library DSOs.

EAPI was designed to be able to pass
`__attribute__ ((visibility ("default")))` for symbols with
GCC, which would mean that even if -fvisibility=hidden was used
when compiling the library, the needed symbols would get exported.

MSVC __almost__ works like GCC (or mingw) in which you can
declare everything as export and it will just work (slower, but
it will work). But there's a caveat: global variables will not
work the same way for MSVC, but works for mingw and GCC.

For global variables (as opposed to functions), MSVC requires
correct DSO visibility for MSVC: instead of declaring a symbol as
export for everything, you need to declare it as import when
importing from another DSO and export when defining it locally.

With current EAPI definitions, we get the following example
working in mingw and MSVC (observe it doesn't define any global
variables as exported symbols).

Example 1:
dll1:
```
EAPI void foo(void);

EAPI void bar()
{
  foo();
}
```
dll2:
```
EAPI void foo()
{
  printf ("foo\n");
}
```

This works fine with API defined as __declspec(dllexport) in both
cases and for gcc defining as
`__atttribute__((visibility("default")))`.

However, the following:
Example 2:

dll1:

```
EAPI extern int foo;
EAPI void foobar(void);

EAPI void bar()
{
  foo = 5;
  foobar();
}
```

dll2:

```
EAPI int foo = 0;
EAPI void foobar()
{
  printf ("foo %d\n", foo);
}
```

This will work on mingw but will not work for MSVC. And that's why
LIBAPI is the only solution that works for MSVC.

Co-authored-by: João Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>
Co-authored-by: Lucas Cavalcante de Sousa <lucks.sousa@gmail.com>
Co-authored-by: Ricardo Campos <ricardo.campos@expertise.dev>

Reviewers: vtorri, woohyun, jptiz, lucas

Reviewed By: vtorri, lucas

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D12214

172 files changed, 2807 insertions, 3032 deletions

diff --git a/src/lib/evas/Efl_Canvas.h b/src/lib/evas/Efl_Canvas.h
index e54773040b..2254992063 100644
--- a/src/lib/evas/Efl_Canvas.h
+++ b/src/lib/evas/Efl_Canvas.h
@@ -8,31 +8,8 @@
 #include <Eo.h>
 /* This include has been added to support Eo in Evas */
 #include <Efl.h>
-#ifdef EAPI
-# undef EAPI
-#endif
 
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
+#include <evas_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -131,5 +108,5 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#undef EAPI
+
 #endif
diff --git a/src/lib/evas/Evas.h b/src/lib/evas/Evas.h
index 0bec46a0cf..000625afb4 100644
--- a/src/lib/evas/Evas.h
+++ b/src/lib/evas/Evas.h
@@ -174,31 +174,7 @@
 
 #include <Evas_Loader.h>
 
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
+#include <evas_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -221,7 +197,4 @@ extern "C" {
 }
 #endif
 
-#undef EAPI
-#define EAPI
-
 #endif
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index c8128e732f..35b18f59d1 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -49,7 +49,7 @@ typedef struct _Evas_Version
  * @ingroup Evas_Main_Group
  */
 
-EAPI extern Evas_Version * evas_version;
+EVAS_API extern Evas_Version * evas_version;
 
 /**
  * @file
@@ -488,7 +488,7 @@ typedef void      (*Evas_Async_Events_Put_Cb)(void *target, Evas_Callback_Type t
  * @since 1.8
  */
 EINA_DEPRECATED
-EAPI const char *evas_cserve_path_get(void);
+EVAS_API const char *evas_cserve_path_get(void);
 
 /**
  * @brief Directly initialize Evas and its required dependencies.
@@ -520,7 +520,7 @@ EAPI const char *evas_cserve_path_get(void);
  *
  * @ingroup Evas_Main_Group
  */
-EAPI int               evas_init(void);
+EVAS_API int               evas_init(void);
 
 /**
  * @brief Directly shutdown Evas.
@@ -546,7 +546,7 @@ EAPI int               evas_init(void);
  *
  * @ingroup Evas_Main_Group
  */
-EAPI int               evas_shutdown(void);
+EVAS_API int               evas_shutdown(void);
 
 /**
  * @brief Get the error status of the most recent memory allocation call
@@ -594,7 +594,7 @@ EAPI int               evas_shutdown(void);
  *
  * @ingroup Evas_Main_Group
  */
-EAPI Evas_Alloc_Error  evas_alloc_error(void);
+EVAS_API Evas_Alloc_Error  evas_alloc_error(void);
 
 /**
  * @brief Access the canvas' asynchronous event queue.
@@ -613,7 +613,7 @@ EAPI Evas_Alloc_Error  evas_alloc_error(void);
  *
  * @ingroup Evas_Main_Group
  */
-EAPI int               evas_async_events_fd_get(void) EINA_WARN_UNUSED_RESULT;
+EVAS_API int               evas_async_events_fd_get(void) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Process the asynchronous event queue.
@@ -626,7 +626,7 @@ EAPI int               evas_async_events_fd_get(void) EINA_WARN_UNUSED_RESULT;
  *
  * @ingroup Evas_Main_Group
  */
-EAPI int               evas_async_events_process(void);
+EVAS_API int               evas_async_events_process(void);
 
 /**
  * @brief Insert asynchronous events on the canvas.
@@ -644,7 +644,7 @@ EAPI int               evas_async_events_process(void);
  *
  * @ingroup Evas_Main_Group
  */
-EAPI Eina_Bool         evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func) EINA_ARG_NONNULL(1, 4);
+EVAS_API Eina_Bool         evas_async_events_put(const void *target, Evas_Callback_Type type, void *event_info, Evas_Async_Events_Put_Cb func) EINA_ARG_NONNULL(1, 4);
 
 /**
  * @defgroup Evas_Canvas Canvas Functions
@@ -751,7 +751,7 @@ EAPI Eina_Bool         evas_async_events_put(const void *target, Evas_Callback_T
  * evas_output_method_set(evas, engine_id);
  * @endcode
  */
-EAPI int               evas_render_method_lookup(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API int               evas_render_method_lookup(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * List all the rendering engines compiled into the copy of the Evas library
@@ -784,7 +784,7 @@ EAPI int               evas_render_method_lookup(const char *name) EINA_WARN_UNU
  * evas_render_method_list_free(engine_list);
  * @endcode
  */
-EAPI Eina_List        *evas_render_method_list(void) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_List        *evas_render_method_list(void) EINA_WARN_UNUSED_RESULT;
 
 /**
  * This function should be called to free a list of engine names
@@ -814,7 +814,7 @@ EAPI Eina_List        *evas_render_method_list(void) EINA_WARN_UNUSED_RESULT;
  * evas_render_method_list_free(engine_list);
  * @endcode
  */
-EAPI void              evas_render_method_list_free(Eina_List *list);
+EVAS_API void              evas_render_method_list_free(Eina_List *list);
 
 /**
  * @}
@@ -863,7 +863,7 @@ EAPI void              evas_render_method_list_free(Eina_List *list);
  *
  * @ingroup Evas_Canvas
  */
-EAPI void              evas_render_updates_free(Eina_List *updates);
+EVAS_API void              evas_render_updates_free(Eina_List *updates);
 
 
 /**
@@ -937,7 +937,7 @@ EAPI void              evas_render_updates_free(Eina_List *updates);
  * @see evas_device_add_full
  * @since 1.8
  */
-EAPI Evas_Device *evas_device_add(Evas *e);
+EVAS_API Evas_Device *evas_device_add(Evas *e);
 
 /**
  * Add a new device type
@@ -959,7 +959,7 @@ EAPI Evas_Device *evas_device_add(Evas *e);
  * @see evas_device_del
  * @since 1.19
  */
-EAPI Evas_Device *evas_device_add_full(Evas *e, const char *name,
+EVAS_API Evas_Device *evas_device_add_full(Evas *e, const char *name,
                                        const char *desc,
                                        Evas_Device *parent_dev,
                                        Evas_Device *emulation_dev,
@@ -976,7 +976,7 @@ EAPI Evas_Device *evas_device_add_full(Evas *e, const char *name,
  * @see evas_device_pop
  * @since 1.8
  */
-EAPI void evas_device_del(Evas_Device *dev);
+EVAS_API void evas_device_del(Evas_Device *dev);
 
 /**
  * Push the current context device onto the device stack
@@ -1005,7 +1005,7 @@ EAPI void evas_device_del(Evas_Device *dev);
  * @see evas_device_pop
  * @since 1.8
  */
-EAPI void evas_device_push(Evas *e, Evas_Device *dev);
+EVAS_API void evas_device_push(Evas *e, Evas_Device *dev);
 
 /**
  * This pops the top of the device stack for the canvas
@@ -1019,7 +1019,7 @@ EAPI void evas_device_push(Evas *e, Evas_Device *dev);
  * @see evas_device_push
  * @since 1.8
  */
-EAPI void evas_device_pop(Evas *e);
+EVAS_API void evas_device_pop(Evas *e);
 
 /**
  * List all current devices attached to the given canvas and/or device
@@ -1045,7 +1045,7 @@ EAPI void evas_device_pop(Evas *e);
  * @see evas_device_emulation_source_get
  * @since 1.8
  */
-EAPI const Eina_List *evas_device_list(Evas *e, const Evas_Device *dev);
+EVAS_API const Eina_List *evas_device_list(Evas *e, const Evas_Device *dev);
 
 /**
  * Get a device by its name
@@ -1061,7 +1061,7 @@ EAPI const Eina_List *evas_device_list(Evas *e, const Evas_Device *dev);
  *
  * @since 1.19
  */
-EAPI Evas_Device *evas_device_get(Evas *e, const char *name);
+EVAS_API Evas_Device *evas_device_get(Evas *e, const char *name);
 
 /**
  * Get a device by its seat id
@@ -1075,7 +1075,7 @@ EAPI Evas_Device *evas_device_get(Evas *e, const char *name);
  *
  * @since 1.20
  */
-EAPI Evas_Device *evas_device_get_by_seat_id(Evas *eo_e, unsigned int id);
+EVAS_API Evas_Device *evas_device_get_by_seat_id(Evas *eo_e, unsigned int id);
 
 /**
  * Set the name of a device as a string
@@ -1085,7 +1085,7 @@ EAPI Evas_Device *evas_device_get_by_seat_id(Evas *eo_e, unsigned int id);
  *
  * @since 1.8
  */
-EAPI void evas_device_name_set(Evas_Device *dev, const char *name);
+EVAS_API void evas_device_name_set(Evas_Device *dev, const char *name);
 
 /**
  * Get the name of a device
@@ -1101,7 +1101,7 @@ EAPI void evas_device_name_set(Evas_Device *dev, const char *name);
  *
  * @since 1.8
  */
-EAPI const char *evas_device_name_get(const Evas_Device *dev);
+EVAS_API const char *evas_device_name_get(const Evas_Device *dev);
 
 /**
  * Set the seat id of a device
@@ -1111,7 +1111,7 @@ EAPI const char *evas_device_name_get(const Evas_Device *dev);
  *
  * @since 1.20
  */
-EAPI void evas_device_seat_id_set(Evas_Device *dev, unsigned int id);
+EVAS_API void evas_device_seat_id_set(Evas_Device *dev, unsigned int id);
 
 /**
  * Get the seat id of a device
@@ -1125,7 +1125,7 @@ EAPI void evas_device_seat_id_set(Evas_Device *dev, unsigned int id);
  *
  * @since 1.20
  */
-EAPI unsigned int evas_device_seat_id_get(const Evas_Device *dev);
+EVAS_API unsigned int evas_device_seat_id_get(const Evas_Device *dev);
 
 /**
  * Set the description of a device as a string
@@ -1135,7 +1135,7 @@ EAPI unsigned int evas_device_seat_id_get(const Evas_Device *dev);
  *
  * @since 1.8
  */
-EAPI void evas_device_description_set(Evas_Device *dev, const char *desc);
+EVAS_API void evas_device_description_set(Evas_Device *dev, const char *desc);
 
 /**
  * Get the description of a device
@@ -1153,7 +1153,7 @@ EAPI void evas_device_description_set(Evas_Device *dev, const char *desc);
  *
  * @since 1.8
  */
-EAPI const char *evas_device_description_get(const Evas_Device *dev);
+EVAS_API const char *evas_device_description_get(const Evas_Device *dev);
 
 /**
  * Set the parent of a device
@@ -1175,7 +1175,7 @@ EAPI const char *evas_device_description_get(const Evas_Device *dev);
  *
  * @since 1.8
  */
-EAPI void evas_device_parent_set(Evas_Device *dev, Evas_Device *parent) EINA_DEPRECATED;
+EVAS_API void evas_device_parent_set(Evas_Device *dev, Evas_Device *parent) EINA_DEPRECATED;
 
 /**
  * Get the parent of a device
@@ -1188,7 +1188,7 @@ EAPI void evas_device_parent_set(Evas_Device *dev, Evas_Device *parent) EINA_DEP
  *
  * @since 1.8
  */
-EAPI const Evas_Device *evas_device_parent_get(const Evas_Device *dev);
+EVAS_API const Evas_Device *evas_device_parent_get(const Evas_Device *dev);
 
 /**
  * Set the major class of device
@@ -1203,7 +1203,7 @@ EAPI const Evas_Device *evas_device_parent_get(const Evas_Device *dev);
  *
  * @since 1.8
  */
-EAPI void evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas) EINA_DEPRECATED;
+EVAS_API void evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas) EINA_DEPRECATED;
 
 /**
  * Get the major class of a device
@@ -1215,7 +1215,7 @@ EAPI void evas_device_class_set(Evas_Device *dev, Evas_Device_Class clas) EINA_D
  *
  * @since 1.8
  */
-EAPI Evas_Device_Class evas_device_class_get(const Evas_Device *dev);
+EVAS_API Evas_Device_Class evas_device_class_get(const Evas_Device *dev);
 
 /**
  * Set the sub-class of a device
@@ -1228,7 +1228,7 @@ EAPI Evas_Device_Class evas_device_class_get(const Evas_Device *dev);
  *
  * @since 1.8
  */
-EAPI void evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas);
+EVAS_API void evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas);
 
 /**
  * Get the device sub-class
@@ -1238,7 +1238,7 @@ EAPI void evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas);
  *
  * @since 1.8
  */
-EAPI Evas_Device_Subclass evas_device_subclass_get(const Evas_Device *dev);
+EVAS_API Evas_Device_Subclass evas_device_subclass_get(const Evas_Device *dev);
 
 /**
  * Set the emulation source device
@@ -1255,7 +1255,7 @@ EAPI Evas_Device_Subclass evas_device_subclass_get(const Evas_Device *dev);
  *
  * @since 1.8
  */
-EAPI void evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src);
+EVAS_API void evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src);
 
 /**
  * Get the emulation source device
@@ -1265,7 +1265,7 @@ EAPI void evas_device_emulation_source_set(Evas_Device *dev, Evas_Device *src);
  *
  * @since 1.8
  */
-EAPI const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev);
+EVAS_API const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev);
 
 /**
  * @}
@@ -1777,7 +1777,7 @@ typedef void (*Evas_Object_Image_Pixels_Get_Cb)(void *data, Evas_Object *o);
  *
  * This functions is threadsafe.
  */
-EAPI Eina_Bool                     evas_object_image_extension_can_load_get(const char *file);
+EVAS_API Eina_Bool                     evas_object_image_extension_can_load_get(const char *file);
 
 /**
  * Check if a file extension may be supported by @ref Evas_Object_Image.
@@ -1789,7 +1789,7 @@ EAPI Eina_Bool                     evas_object_image_extension_can_load_get(cons
  *
  * This functions is threadsafe.
  */
-EAPI Eina_Bool                     evas_object_image_extension_can_load_fast_get(const char *file);
+EVAS_API Eina_Bool                     evas_object_image_extension_can_load_fast_get(const char *file);
 /**
  * @}
  */
@@ -2336,7 +2336,7 @@ struct _Evas_Smart_Cb_Description
  * when they are not referenced anymore. Thus, this function is of no use
  * for Evas users, most probably.
  */
-EAPI void                              evas_smart_free(Evas_Smart *s) EINA_ARG_NONNULL(1);
+EVAS_API void                              evas_smart_free(Evas_Smart *s) EINA_ARG_NONNULL(1);
 
 /**
  * Creates a new #Evas_Smart from a given #Evas_Smart_Class struct
@@ -2353,7 +2353,7 @@ EAPI void                              evas_smart_free(Evas_Smart *s) EINA_ARG_N
  * construct yours, consider using the #EVAS_SMART_SUBCLASS_NEW macro,
  * which will make use of this function automatically for you.
  */
-EAPI Evas_Smart                       *evas_smart_class_new(const Evas_Smart_Class *sc) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EVAS_API Evas_Smart                       *evas_smart_class_new(const Evas_Smart_Class *sc) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * Get the #Evas_Smart_Class handle of an #Evas_Smart struct
@@ -2361,7 +2361,7 @@ EAPI Evas_Smart                       *evas_smart_class_new(const Evas_Smart_Cla
  * @param s a valid #Evas_Smart pointer
  * @return the #Evas_Smart_Class in it
  */
-EAPI const Evas_Smart_Class           *evas_smart_class_get(const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API const Evas_Smart_Class           *evas_smart_class_get(const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Get the data pointer set on an #Evas_Smart struct
@@ -2371,7 +2371,7 @@ EAPI const Evas_Smart_Class           *evas_smart_class_get(const Evas_Smart *s)
  * This data pointer is set as the data field in the #Evas_Smart_Class
  * passed in to evas_smart_class_new().
  */
-EAPI void                             *evas_smart_data_get(const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API void                             *evas_smart_data_get(const Evas_Smart *s) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * Get the smart callbacks known by this #Evas_Smart handle's smart
@@ -2410,7 +2410,7 @@ EAPI void                             *evas_smart_data_get(const Evas_Smart *s)
  *       as well.
  * @see evas_object_smart_callbacks_descriptions_get()
  */
-EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count) EINA_ARG_NONNULL(1, 1);
+EVAS_API const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(const Evas_Smart *s, unsigned int *count) EINA_ARG_NONNULL(1, 1);
 
 /**
  * Find a callback description for the callback named @a name.
@@ -2425,7 +2425,7 @@ EAPI const Evas_Smart_Cb_Description **evas_smart_callbacks_descriptions_get(con
  *
  * @see evas_smart_callbacks_descriptions_get()
  */
-EAPI const Evas_Smart_Cb_Description  *evas_smart_callback_description_find(const Evas_Smart *s, const char *name) EINA_ARG_NONNULL(1, 2);
+EVAS_API const Evas_Smart_Cb_Description  *evas_smart_callback_description_find(const Evas_Smart *s, const char *name) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Sets one class to inherit from the other.
@@ -2444,7 +2444,7 @@ EAPI const Evas_Smart_Cb_Description  *evas_smart_callback_description_find(cons
  *        this size. Everything after @c Evas_Smart_Class size is copied
  *        using regular memcpy().
  */
-EAPI Eina_Bool                         evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size) EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool                         evas_smart_class_inherit_full(Evas_Smart_Class *sc, const Evas_Smart_Class *parent_sc, unsigned int parent_sc_size) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Get the number of uses of the smart instance
@@ -2465,7 +2465,7 @@ EAPI Eina_Bool                         evas_smart_class_inherit_full(Evas_Smart_
  * Evas_Smart_Class data from memory (have it be a constant structure and
  * data), or use this API call and be very careful.
  */
-EAPI int                               evas_smart_usage_get(const Evas_Smart *s);
+EVAS_API int                               evas_smart_usage_get(const Evas_Smart *s);
 
 /**
  * @def evas_smart_class_inherit
@@ -2543,7 +2543,7 @@ EAPI int                               evas_smart_usage_get(const Evas_Smart *s)
  *
  * @ingroup Evas_Smart_Object_Group
  */
-EAPI void evas_smart_legacy_type_register(const char *type, const Efl_Class *klass) EINA_ARG_NONNULL(1, 2);
+EVAS_API void evas_smart_legacy_type_register(const char *type, const Efl_Class *klass) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @}
@@ -2634,7 +2634,7 @@ struct _Evas_Object_Smart_Clipped_Data
  * child ones, like the #EVAS_SMART_SUBCLASS_NEW macro or the
  * evas_smart_class_inherit_full() function.
  */
-EAPI void                    evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) EINA_ARG_NONNULL(1);
+EVAS_API void                    evas_object_smart_clipped_smart_set(Evas_Smart_Class *sc) EINA_ARG_NONNULL(1);
 
 /**
  * Get a pointer to the <b>clipped smart object's</b> class, to use
@@ -2643,7 +2643,7 @@ EAPI void                    evas_object_smart_clipped_smart_set(Evas_Smart_Clas
  * @see #Evas_Smart_Object_Clipped for more information on this smart
  * class
  */
-EAPI const Evas_Smart_Class *evas_object_smart_clipped_class_get(void) EINA_CONST;
+EVAS_API const Evas_Smart_Class *evas_object_smart_clipped_class_get(void) EINA_CONST;
 /**
  * @}
  */
@@ -2883,7 +2883,7 @@ struct _Evas_Object_Box_Option
  * @param api The box API struct to set back, most probably with
  * overridden fields (on class extensions scenarios)
  */
-EAPI void                       evas_object_box_smart_set(Evas_Object_Box_Api *api) EINA_ARG_NONNULL(1);
+EVAS_API void                       evas_object_box_smart_set(Evas_Object_Box_Api *api) EINA_ARG_NONNULL(1);
 
 /**
  * Get the Evas box smart class, for inheritance purposes.
@@ -2893,7 +2893,7 @@ EAPI void                       evas_object_box_smart_set(Evas_Object_Box_Api *a
  * The returned value is @b not to be modified, just use it as your
  * parent class.
  */
-EAPI const Evas_Object_Box_Api *evas_object_box_smart_class_get(void) EINA_CONST;
+EVAS_API const Evas_Object_Box_Api *evas_object_box_smart_class_get(void) EINA_CONST;
 
 /**
  * @}
@@ -3008,7 +3008,7 @@ struct _Evas_Cserve_Config
  * @return @c EINA_TRUE if it wants, @c EINA_FALSE otherwise.
  * @ingroup Evas_Cserve
  */
-EAPI Eina_Bool   evas_cserve_want_get(void) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool   evas_cserve_want_get(void) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Retrieves if the system is connected to the server used to share
@@ -3017,7 +3017,7 @@ EAPI Eina_Bool   evas_cserve_want_get(void) EINA_WARN_UNUSED_RESULT;
  * @return @c EINA_TRUE if it's connected, @c EINA_FALSE otherwise.
  * @ingroup Evas_Cserve
  */
-EAPI Eina_Bool   evas_cserve_connected_get(void) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool   evas_cserve_connected_get(void) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Retrieves statistics from a running bitmap sharing server.
@@ -3028,14 +3028,14 @@ EAPI Eina_Bool   evas_cserve_connected_get(void) EINA_WARN_UNUSED_RESULT;
  *         @c EINA_FALSE otherwise (when @p stats is untouched)
  * @ingroup Evas_Cserve
  */
-EAPI Eina_Bool   evas_cserve_stats_get(Evas_Cserve_Stats *stats) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool   evas_cserve_stats_get(Evas_Cserve_Stats *stats) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Completely discard/clean a given images cache, thus re-setting it.
  *
  * @param cache A handle to the given images cache.
  */
-EAPI void        evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache);
+EVAS_API void        evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache *cache);
 
 /**
  * Retrieves the current configuration of the Evas image caching
@@ -3054,7 +3054,7 @@ EAPI void        evas_cserve_image_cache_contents_clean(Evas_Cserve_Image_Cache
  *
  * @ingroup Evas_Cserve
  */
-EAPI Eina_Bool   evas_cserve_config_get(Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool   evas_cserve_config_get(Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Changes the configurations of the Evas image caching server.
@@ -3068,14 +3068,14 @@ EAPI Eina_Bool   evas_cserve_config_get(Evas_Cserve_Config *config) EINA_WARN_UN
  *
  * @ingroup Evas_Cserve
  */
-EAPI Eina_Bool   evas_cserve_config_set(const Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool   evas_cserve_config_set(const Evas_Cserve_Config *config) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Force the system to disconnect from the bitmap caching server.
  *
  * @ingroup Evas_Cserve
  */
-EAPI void        evas_cserve_disconnect(void);
+EVAS_API void        evas_cserve_disconnect(void);
 
 /**
  * @defgroup Evas_Utils General Utilities
@@ -3114,7 +3114,7 @@ EAPI void        evas_cserve_disconnect(void);
  *
  * @ingroup Evas_Utils
  */
-EAPI const char *evas_load_error_str(Evas_Load_Error error);
+EVAS_API const char *evas_load_error_str(Evas_Load_Error error);
 
 /* Evas utility routines for color space conversions */
 /* hsv color space has h in the range 0.0 to 360.0, and s,v in the range 0.0 to 1.0 */
@@ -3135,7 +3135,7 @@ EAPI const char *evas_load_error_str(Evas_Load_Error error);
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
+EVAS_API void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *b);
 
 /**
  * Convert a given color from RGB to HSV format.
@@ -3152,7 +3152,7 @@ EAPI void evas_color_hsv_to_rgb(float h, float s, float v, int *r, int *g, int *
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
+EVAS_API void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *v);
 
 /* argb color space has a,r,g,b in the range 0 to 255 */
 
@@ -3169,7 +3169,7 @@ EAPI void evas_color_rgb_to_hsv(int r, int g, int b, float *h, float *s, float *
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_color_argb_premul(int a, int *r, int *g, int *b);
+EVAS_API void evas_color_argb_premul(int a, int *r, int *g, int *b);
 
 /**
  * Undo pre-multiplication of a rgb triplet by an alpha factor.
@@ -3186,7 +3186,7 @@ EAPI void evas_color_argb_premul(int a, int *r, int *g, int *b);
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_color_argb_unpremul(int a, int *r, int *g, int *b);
+EVAS_API void evas_color_argb_unpremul(int a, int *r, int *g, int *b);
 
 /**
  * Pre-multiplies data by an alpha factor.
@@ -3199,7 +3199,7 @@ EAPI void evas_color_argb_unpremul(int a, int *r, int *g, int *b);
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_data_argb_premul(unsigned int *data, unsigned int len);
+EVAS_API void evas_data_argb_premul(unsigned int *data, unsigned int len);
 
 /**
  * Undo pre-multiplication data by an alpha factor.
@@ -3212,7 +3212,7 @@ EAPI void evas_data_argb_premul(unsigned int *data, unsigned int len);
  *
  * @ingroup Evas_Utils
  **/
-EAPI void evas_data_argb_unpremul(unsigned int *data, unsigned int len);
+EVAS_API void evas_data_argb_unpremul(unsigned int *data, unsigned int len);
 
 /* string and font handling */
 
@@ -3235,7 +3235,7 @@ EAPI void evas_data_argb_unpremul(unsigned int *data, unsigned int len);
  *
  * @ingroup Evas_Utils
  */
-EAPI int  evas_string_char_next_get(const char *str, int pos, int *decoded) EINA_ARG_NONNULL(1);
+EVAS_API int  evas_string_char_next_get(const char *str, int pos, int *decoded) EINA_ARG_NONNULL(1);
 
 /**
  * Gets the previous character in the string
@@ -3256,7 +3256,7 @@ EAPI int  evas_string_char_next_get(const char *str, int pos, int *decoded) EINA
  *
  * @ingroup Evas_Utils
  */
-EAPI int  evas_string_char_prev_get(const char *str, int pos, int *decoded) EINA_ARG_NONNULL(1);
+EVAS_API int  evas_string_char_prev_get(const char *str, int pos, int *decoded) EINA_ARG_NONNULL(1);
 
 /**
  * Get the length in characters of the string.
@@ -3266,7 +3266,7 @@ EAPI int  evas_string_char_prev_get(const char *str, int pos, int *decoded) EINA
  *
  * @ingroup Evas_Utils
  */
-EAPI int  evas_string_char_len_get(const char *str) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API int  evas_string_char_len_get(const char *str) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * Get language direction.
@@ -3274,7 +3274,7 @@ EAPI int  evas_string_char_len_get(const char *str) EINA_WARN_UNUSED_RESULT EINA
  * @ingroup Evas_Utils
  * @since 1.20
  */
-EAPI Evas_BiDi_Direction     evas_language_direction_get(void);
+EVAS_API Evas_BiDi_Direction     evas_language_direction_get(void);
 
 /**
  * Reinitialize language from the environment.
@@ -3285,7 +3285,7 @@ EAPI Evas_BiDi_Direction     evas_language_direction_get(void);
  * @ingroup Evas_Utils
  * @since 1.18
  */
-EAPI void                    evas_language_reinit(void);
+EVAS_API void                    evas_language_reinit(void);
 
 /**
  * @defgroup Evas_Keys Key Input Functions
@@ -3341,28 +3341,28 @@ EAPI void                    evas_language_reinit(void);
  * for the application.
  * @since 1.9
  */
-EAPI void                    evas_font_path_global_clear(void);
+EVAS_API void                    evas_font_path_global_clear(void);
 
 /**
  * Appends a font path to the list of font paths used by the application.
  * @param   path The new font path.
  * @since 1.9
  */
-EAPI void                    evas_font_path_global_append(const char *path) EINA_ARG_NONNULL(1);
+EVAS_API void                    evas_font_path_global_append(const char *path) EINA_ARG_NONNULL(1);
 
 /**
  * Prepends a font path to the list of font paths used by the application.
  * @param   path The new font path.
  * @since 1.9
  */
-EAPI void                    evas_font_path_global_prepend(const char *path) EINA_ARG_NONNULL(1);
+EVAS_API void                    evas_font_path_global_prepend(const char *path) EINA_ARG_NONNULL(1);
 
 /**
  * Retrieves the list of font paths used by the application.
  * @return  The list of font paths used.
  * @since 1.9
  */
-EAPI const Eina_List        *evas_font_path_global_list(void) EINA_WARN_UNUSED_RESULT;
+EVAS_API const Eina_List        *evas_font_path_global_list(void) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @}
@@ -3374,7 +3374,7 @@ EAPI const Eina_List        *evas_font_path_global_list(void) EINA_WARN_UNUSED_R
  *
  * @since 1.14
  */
-EAPI void                    evas_font_reinit(void);
+EVAS_API void                    evas_font_reinit(void);
 
 /**
  * @}
@@ -3387,7 +3387,7 @@ EAPI void                    evas_font_reinit(void);
  *
  * @since 1.24
  */
-EAPI void                    evas_font_data_cache_set(Evas_Font_Data_Cache options, int byte);
+EVAS_API void                    evas_font_data_cache_set(Evas_Font_Data_Cache options, int byte);
 
 /**
  * @}
@@ -3399,7 +3399,7 @@ EAPI void                    evas_font_data_cache_set(Evas_Font_Data_Cache optio
  * @return Returns font allocated memory cache limit, if value is negative this means no limit.
  * @since 1.24
  */
-EAPI int    evas_font_data_cache_get(Evas_Font_Data_Cache options);
+EVAS_API int    evas_font_data_cache_get(Evas_Font_Data_Cache options);
 
 /**
  * @}
diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h
index 98b2440ff2..614fef9334 100644
--- a/src/lib/evas/Evas_GL.h
+++ b/src/lib/evas/Evas_GL.h
@@ -4,31 +4,7 @@
 #include <Evas.h>
 //#include <GL/gl.h>
 
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
+#include <evas_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -581,7 +557,7 @@ struct _Evas_GL_Config
  *
  * @return The created Evas_GL object, or @c NULL in case of failure
  */
-EAPI Evas_GL                 *evas_gl_new                (Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL                 *evas_gl_new                (Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Frees an Evas_GL object.
@@ -590,7 +566,7 @@ EAPI Evas_GL                 *evas_gl_new                (Evas *e) EINA_WARN_UNU
  *
  * @see evas_gl_new
  */
-EAPI void                     evas_gl_free               (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
+EVAS_API void                     evas_gl_free               (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Allocates a new config object for the user to fill out.
@@ -600,7 +576,7 @@ EAPI void                     evas_gl_free               (Evas_GL *evas_gl) EINA
  *
  * @see evas_gl_config_free
  */
-EAPI Evas_GL_Config          *evas_gl_config_new         (void);
+EVAS_API Evas_GL_Config          *evas_gl_config_new         (void);
 
 /**
  * @brief Frees a config object created from evas_gl_config_new.
@@ -612,7 +588,7 @@ EAPI Evas_GL_Config          *evas_gl_config_new         (void);
  *
  * @see evas_gl_config_new
  */
-EAPI void                     evas_gl_config_free        (Evas_GL_Config *cfg) EINA_ARG_NONNULL(1);
+EVAS_API void                     evas_gl_config_free        (Evas_GL_Config *cfg) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Creates and returns a new @ref Evas_GL_Surface object for GL Rendering.
@@ -627,7 +603,7 @@ EAPI void                     evas_gl_config_free        (Evas_GL_Config *cfg) E
  *
  * @see evas_gl_surface_destroy
  */
-EAPI Evas_GL_Surface         *evas_gl_surface_create     (Evas_GL *evas_gl, Evas_GL_Config *cfg, int w, int h) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2);
+EVAS_API Evas_GL_Surface         *evas_gl_surface_create     (Evas_GL *evas_gl, Evas_GL_Config *cfg, int w, int h) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Create a pixel buffer surface
@@ -660,7 +636,7 @@ EAPI Evas_GL_Surface         *evas_gl_surface_create     (Evas_GL *evas_gl, Evas
  *
  * @since 1.12
  */
-EAPI Evas_GL_Surface         *evas_gl_pbuffer_surface_create(Evas_GL *evas_gl, Evas_GL_Config *cfg, int w, int h, const int *attrib_list) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2);
+EVAS_API Evas_GL_Surface         *evas_gl_pbuffer_surface_create(Evas_GL *evas_gl, Evas_GL_Config *cfg, int w, int h, const int *attrib_list) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Destroys an Evas GL Surface.
@@ -670,7 +646,7 @@ EAPI Evas_GL_Surface         *evas_gl_pbuffer_surface_create(Evas_GL *evas_gl, E
  *
  * @note This function can also destroy pbuffer surfaces.
  */
-EAPI void                     evas_gl_surface_destroy    (Evas_GL *evas_gl, Evas_GL_Surface *surf) EINA_ARG_NONNULL(1,2);
+EVAS_API void                     evas_gl_surface_destroy    (Evas_GL *evas_gl, Evas_GL_Surface *surf) EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Creates and returns a new Evas GL context object.
@@ -681,7 +657,7 @@ EAPI void                     evas_gl_surface_destroy    (Evas_GL *evas_gl, Evas
  * @return The created context,
  *         otherwise @c NULL on failure
  */
-EAPI Evas_GL_Context         *evas_gl_context_create     (Evas_GL *evas_gl, Evas_GL_Context *share_ctx) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_Context         *evas_gl_context_create     (Evas_GL *evas_gl, Evas_GL_Context *share_ctx) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Creates and returns a new Evas GL context object for OpenGL-ES 1.1 or 2.0.
@@ -706,7 +682,7 @@ EAPI Evas_GL_Context         *evas_gl_context_create     (Evas_GL *evas_gl, Evas
  *
  * @since 1.12
  */
-EAPI Evas_GL_Context         *evas_gl_context_version_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx, Evas_GL_Context_Version version) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_Context         *evas_gl_context_version_create(Evas_GL *evas_gl, Evas_GL_Context *share_ctx, Evas_GL_Context_Version version) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Destroys the given Evas GL context object.
@@ -717,7 +693,7 @@ EAPI Evas_GL_Context         *evas_gl_context_version_create(Evas_GL *evas_gl, E
  * @see evas_gl_context_create
  * @see evas_gl_context_version_create
  */
-EAPI void                     evas_gl_context_destroy    (Evas_GL *evas_gl, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1,2);
+EVAS_API void                     evas_gl_context_destroy    (Evas_GL *evas_gl, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Sets the given context as the current context for the given surface.
@@ -728,7 +704,7 @@ EAPI void                     evas_gl_context_destroy    (Evas_GL *evas_gl, Evas
  * @return @c EINA_TRUE if successful,
  *         otherwise @c EINA_FALSE if not
  */
-EAPI Eina_Bool                evas_gl_make_current       (Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1,2);
+EVAS_API Eina_Bool                evas_gl_make_current       (Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Returns a pointer to a static, null-terminated string describing some aspect of Evas GL.
@@ -736,7 +712,7 @@ EAPI Eina_Bool                evas_gl_make_current       (Evas_GL *evas_gl, Evas
  * @param[in] evas_gl The given Evas_GL object
  * @param[in] name    A symbolic constant, only @ref EVAS_GL_EXTENSIONS is supported for now
  */
-EAPI const char              *evas_gl_string_query       (Evas_GL *evas_gl, int name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
+EVAS_API const char              *evas_gl_string_query       (Evas_GL *evas_gl, int name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_PURE;
 
 /**
  * @brief Returns a extension function from OpenGL or the Evas_GL glue layer.
@@ -749,7 +725,7 @@ EAPI const char              *evas_gl_string_query       (Evas_GL *evas_gl, int
  *
  * @return A function pointer to the Evas_GL extension.
  */
-EAPI Evas_GL_Func             evas_gl_proc_address_get   (Evas_GL *evas_gl, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2) EINA_PURE;
+EVAS_API Evas_GL_Func             evas_gl_proc_address_get   (Evas_GL *evas_gl, const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1,2) EINA_PURE;
 
 /**
  * @brief Fills in the Native Surface information from a given Evas GL surface.
@@ -768,7 +744,7 @@ EAPI Evas_GL_Func             evas_gl_proc_address_get   (Evas_GL *evas_gl, cons
  *          since its properties are internal to Evas and are not meant to be
  *          tampered with in any way or form from outside Evas.
  */
-EAPI Eina_Bool                evas_gl_native_surface_get (Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_Native_Surface *ns) EINA_ARG_NONNULL(1,2,3);
+EVAS_API Eina_Bool                evas_gl_native_surface_get (Evas_GL *evas_gl, Evas_GL_Surface *surf, Evas_Native_Surface *ns) EINA_ARG_NONNULL(1,2,3);
 
 /**
  * @brief Gets the API for rendering using OpenGL.
@@ -790,7 +766,7 @@ EAPI Eina_Bool                evas_gl_native_surface_get (Evas_GL *evas_gl, Evas
  * @see evas_gl_context_api_get
  *
  */
-EAPI Evas_GL_API             *evas_gl_api_get            (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_API             *evas_gl_api_get            (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Gets the API for rendering using OpenGL with non standard contexts.
@@ -817,7 +793,7 @@ EAPI Evas_GL_API             *evas_gl_api_get            (Evas_GL *evas_gl) EINA
  *
  * @since 1.12
  */
-EAPI Evas_GL_API             *evas_gl_context_api_get    (Evas_GL *evas_gl, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_API             *evas_gl_context_api_get    (Evas_GL *evas_gl, Evas_GL_Context *ctx) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Get the current rotation of the view, in degrees.
@@ -842,7 +818,7 @@ EAPI Evas_GL_API             *evas_gl_context_api_get    (Evas_GL *evas_gl, Evas
  *
  * @since 1.12
  */
-EAPI int                      evas_gl_rotation_get       (Evas_GL *evas_gl) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+EVAS_API int                      evas_gl_rotation_get       (Evas_GL *evas_gl) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Query a surface for its properties
@@ -862,7 +838,7 @@ EAPI int                      evas_gl_rotation_get       (Evas_GL *evas_gl) EINA
  *
  * @since 1.12
  */
-EAPI Eina_Bool                evas_gl_surface_query      (Evas_GL *evas_gl, Evas_GL_Surface *surface, int attribute, void *value) EINA_ARG_NONNULL(1,2);
+EVAS_API Eina_Bool                evas_gl_surface_query      (Evas_GL *evas_gl, Evas_GL_Surface *surface, int attribute, void *value) EINA_ARG_NONNULL(1,2);
 
 /**
  * @brief Returns the last error of any evas_gl function called in the current thread.
@@ -886,7 +862,7 @@ EAPI Eina_Bool                evas_gl_surface_query      (Evas_GL *evas_gl, Evas
  *
  * @since 1.12
  */
-EAPI int                      evas_gl_error_get          (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
+EVAS_API int                      evas_gl_error_get          (Evas_GL *evas_gl) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Returns the Evas GL context object in use or set by @ref evas_gl_make_current.
@@ -898,7 +874,7 @@ EAPI int                      evas_gl_error_get          (Evas_GL *evas_gl) EINA
  *
  * @since 1.12
  */
-EAPI Evas_GL_Context         *evas_gl_current_context_get (Evas_GL *evas_gl) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_Context         *evas_gl_current_context_get (Evas_GL *evas_gl) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Returns the Evas GL surface object in use or set by @ref evas_gl_make_current
@@ -916,7 +892,7 @@ EAPI Evas_GL_Context         *evas_gl_current_context_get (Evas_GL *evas_gl) EIN
  *
  * @since 1.12
  */
-EAPI Evas_GL_Surface         *evas_gl_current_surface_get (Evas_GL *evas_gl) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_GL_Surface         *evas_gl_current_surface_get (Evas_GL *evas_gl) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @brief Get current Evas GL
@@ -934,7 +910,7 @@ EAPI Evas_GL_Surface         *evas_gl_current_surface_get (Evas_GL *evas_gl) EIN
  *
  * @since 1.16
  */
-EAPI Evas_GL                 *evas_gl_current_evas_gl_get (Evas_GL_Context **context, Evas_GL_Surface **surface) EINA_WARN_UNUSED_RESULT;
+EVAS_API Evas_GL                 *evas_gl_current_evas_gl_get (Evas_GL_Context **context, Evas_GL_Surface **surface) EINA_WARN_UNUSED_RESULT;
 
 
 /*-------------------------------------------------------------------------
@@ -6140,7 +6116,4 @@ EvasGLImage *img = glapi->evasglCreateImageForContext
 }
 #endif
 
-#undef EAPI
-#define EAPI
-
 #endif
diff --git a/src/lib/evas/Evas_Internal.h b/src/lib/evas/Evas_Internal.h
index 7fa7021e50..ef6d64ea18 100644
--- a/src/lib/evas/Evas_Internal.h
+++ b/src/lib/evas/Evas_Internal.h
@@ -2,31 +2,7 @@
 #ifndef _EVAS_INTERNAL_H
 #define _EVAS_INTERNAL_H
 
-#ifdef EAPI
-# undef EAPI
-#endif
-
-#ifdef _WIN32
-# ifdef EFL_BUILD
-#  ifdef DLL_EXPORT
-#   define EAPI __declspec(dllexport)
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI __declspec(dllimport)
-# endif
-#else
-# ifdef __GNUC__
-#  if __GNUC__ >= 4
-#   define EAPI __attribute__ ((visibility("default")))
-#  else
-#   define EAPI
-#  endif
-# else
-#  define EAPI
-# endif
-#endif
+#include <evas_api.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,16 +16,16 @@ extern "C" {
 
 typedef struct _Evas_Object_Pointer_Data Evas_Object_Pointer_Data;
 
-EOAPI const Eina_List *efl_input_device_children_get(const Eo *obj);
+EVAS_API EVAS_API_WEAK const Eina_List *efl_input_device_children_get(const Eo *obj);
 
-EOAPI void efl_input_device_evas_set(Eo *obj, Evas *e);
-EOAPI Evas *efl_input_device_evas_get(const Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_input_device_evas_set(Eo *obj, Evas *e);
+EVAS_API EVAS_API_WEAK Evas *efl_input_device_evas_get(const Eo *obj);
 
-EOAPI void efl_input_device_subclass_set(Eo *obj, Evas_Device_Subclass sub_clas);
-EOAPI Evas_Device_Subclass efl_input_device_subclass_get(const Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_input_device_subclass_set(Eo *obj, Evas_Device_Subclass sub_clas);
+EVAS_API EVAS_API_WEAK Evas_Device_Subclass efl_input_device_subclass_get(const Eo *obj);
 
-EOAPI void efl_input_device_grab_register(Eo *obj, Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata);
-EOAPI void efl_input_device_grab_unregister(Eo *obj, Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata);
+EVAS_API EVAS_API_WEAK void efl_input_device_grab_register(Eo *obj, Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata);
+EVAS_API EVAS_API_WEAK void efl_input_device_grab_unregister(Eo *obj, Efl_Canvas_Object *grab, Evas_Object_Pointer_Data *pdata);
 
 typedef struct _Efl_Input_Pointer_Data  Efl_Input_Pointer_Data;
 typedef struct _Efl_Input_Key_Data      Efl_Input_Key_Data;
@@ -193,23 +169,23 @@ _efl_input_value_mark(Efl_Input_Pointer_Data *pd, Efl_Input_Value key)
 
 typedef struct _Efl_Canvas_Output Efl_Canvas_Output;
 
-EAPI Efl_Canvas_Output *efl_canvas_output_add(Evas *canvas);
-EAPI void efl_canvas_output_del(Efl_Canvas_Output *output);
-EAPI void efl_canvas_output_view_set(Efl_Canvas_Output *output,
+EVAS_API Efl_Canvas_Output *efl_canvas_output_add(Evas *canvas);
+EVAS_API void efl_canvas_output_del(Efl_Canvas_Output *output);
+EVAS_API void efl_canvas_output_view_set(Efl_Canvas_Output *output,
                                      Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-EAPI void efl_canvas_output_view_get(Efl_Canvas_Output *output,
+EVAS_API void efl_canvas_output_view_get(Efl_Canvas_Output *output,
                                      Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-EAPI Eina_Bool efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
+EVAS_API Eina_Bool efl_canvas_output_engine_info_set(Efl_Canvas_Output *output,
                                                  Evas_Engine_Info *info);
-EAPI Evas_Engine_Info *efl_canvas_output_engine_info_get(Efl_Canvas_Output *output);
-EAPI Eina_Bool efl_canvas_output_lock(Efl_Canvas_Output *output);
-EAPI Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
+EVAS_API Evas_Engine_Info *efl_canvas_output_engine_info_get(Efl_Canvas_Output *output);
+EVAS_API Eina_Bool efl_canvas_output_lock(Efl_Canvas_Output *output);
+EVAS_API Eina_Bool efl_canvas_output_unlock(Efl_Canvas_Output *output);
 
-EAPI void evas_render_pending_objects_flush(Evas *eo_evas);
+EVAS_API void evas_render_pending_objects_flush(Evas *eo_evas);
 
-EAPI void efl_input_pointer_finalize(Efl_Input_Pointer *obj);
+EVAS_API void efl_input_pointer_finalize(Efl_Input_Pointer *obj);
 
-EAPI Eina_Iterator *efl_canvas_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *list);
+EVAS_API Eina_Iterator *efl_canvas_iterator_create(Eo *obj, Eina_Iterator *real_iterator, Eina_List *list);
 
 static inline void
 evas_object_size_hint_combined_min_get(const Eo *obj, int *w, int *h)
@@ -230,23 +206,23 @@ evas_object_size_hint_combined_max_get(const Eo *obj, int *w, int *h)
 }
 
 /* Internal EO APIs */
-EAPI Eo *evas_find(const Eo *obj);
-EOAPI void efl_canvas_object_legacy_ctor(Eo *obj);
-EOAPI void efl_canvas_object_type_set(Eo *obj, const char *type);
-EOAPI void efl_canvas_group_add(Eo *obj);
-EOAPI void efl_canvas_group_del(Eo *obj);
-EOAPI void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped);
-EOAPI void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y);
-EOAPI void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat);
-EOAPI void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat);
-EOAPI Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat);
-
-EOAPI void *efl_input_legacy_info_get(const Eo *obj);
-
-EOAPI Eo *efl_input_focus_instance_get(Efl_Object *owner, void **priv);
-EOAPI Eo *efl_input_hold_instance_get(Efl_Object *owner, void **priv);
-EOAPI Eo *efl_input_key_instance_get(Efl_Object *owner, void **priv);
-EOAPI Eo *efl_input_pointer_instance_get(Efl_Object *owner, void **priv);
+EVAS_API Eo *evas_find(const Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_canvas_object_legacy_ctor(Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_canvas_object_type_set(Eo *obj, const char *type);
+EVAS_API EVAS_API_WEAK void efl_canvas_group_add(Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_canvas_group_del(Eo *obj);
+EVAS_API EVAS_API_WEAK void efl_canvas_group_clipped_set(Eo *obj, Eina_Bool unclipped);
+EVAS_API EVAS_API_WEAK void evas_canvas_touch_point_list_nth_xy_get(Eo *obj, unsigned int n, double *x, double *y);
+EVAS_API EVAS_API_WEAK void evas_canvas_seat_focus_in(Eo *obj, Efl_Input_Device *seat);
+EVAS_API EVAS_API_WEAK void evas_canvas_seat_focus_out(Eo *obj, Efl_Input_Device *seat);
+EVAS_API EVAS_API_WEAK Eo* evas_canvas_seat_focus_get(const Eo *obj, Efl_Input_Device *seat);
+
+EVAS_API EVAS_API_WEAK void *efl_input_legacy_info_get(const Eo *obj);
+
+EVAS_API EVAS_API_WEAK Eo *efl_input_focus_instance_get(Efl_Object *owner, void **priv);
+EVAS_API EVAS_API_WEAK Eo *efl_input_hold_instance_get(Efl_Object *owner, void **priv);
+EVAS_API EVAS_API_WEAK Eo *efl_input_key_instance_get(Efl_Object *owner, void **priv);
+EVAS_API EVAS_API_WEAK Eo *efl_input_pointer_instance_get(Efl_Object *owner, void **priv);
 /**
  * @brief If @c true the object belongs to the window border decorations.
  *
@@ -264,7 +240,7 @@ EOAPI Eo *efl_input_pointer_instance_get(Efl_Object *owner, void **priv);
  *
  * @ingroup Efl_Canvas_Object
  */
-EOAPI void efl_canvas_object_is_frame_object_set(Eo *obj, Eina_Bool is_frame);
+EVAS_API EVAS_API_WEAK void efl_canvas_object_is_frame_object_set(Eo *obj, Eina_Bool is_frame);
 
 /**
  * @brief If @c true the object belongs to the window border decorations.
@@ -284,18 +260,18 @@ EOAPI void efl_canvas_object_is_frame_object_set(Eo *obj, Eina_Bool is_frame);
  *
  * @ingroup Efl_Canvas_Object
  */
-EOAPI Eina_Bool efl_canvas_object_is_frame_object_get(const Eo *obj);
+EVAS_API EVAS_API_WEAK Eina_Bool efl_canvas_object_is_frame_object_get(const Eo *obj);
 
-EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
+EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE;
 #define EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE))
 
-EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST;
+EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST;
 #define EVAS_CANVAS_EVENT_RENDER_FLUSH_POST (&(_EVAS_CANVAS_EVENT_RENDER_FLUSH_POST))
 
-EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE;
+EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE;
 #define EVAS_CANVAS_EVENT_AXIS_UPDATE (&(_EVAS_CANVAS_EVENT_AXIS_UPDATE))
 
-EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE;
+EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE;
 #define EVAS_CANVAS_EVENT_VIEWPORT_RESIZE (&(_EVAS_CANVAS_EVENT_VIEWPORT_RESIZE))
 
 #define EFL_CANVAS_GROUP_DEL_OPS(kls) EFL_OBJECT_OP_FUNC(efl_canvas_group_del, _##kls##_efl_canvas_group_group_del)
@@ -303,7 +279,7 @@ EWAPI extern const Efl_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE;
 #define EFL_CANVAS_GROUP_ADD_DEL_OPS(kls) EFL_CANVAS_GROUP_ADD_OPS(kls), EFL_CANVAS_GROUP_DEL_OPS(kls)
 
 /* Efl.Animation.Player */
-EWAPI extern const Efl_Event_Description _EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED;
+EVAS_API EVAS_API_WEAK extern const Efl_Event_Description _EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED;
 #define EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED (&(_EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED))
 /* Efl.Animation.Player END */
 
@@ -316,24 +292,21 @@ EWAPI extern const Efl_Event_Description _EFL_ANIMATION_PLAYER_EVENT_PRE_STARTED
  * @param cur the cursor.
  * @param forward if Eina_True check cluster after cusror position, else before cursor position.
  */
-EAPI Eina_Bool evas_textblock_cursor_at_cluster_as_single_glyph(Evas_Textblock_Cursor *cur,Eina_Bool forward);
+EVAS_API Eina_Bool evas_textblock_cursor_at_cluster_as_single_glyph(Evas_Textblock_Cursor *cur,Eina_Bool forward);
 
 
 
 
 /*Attribute Factory Internal function*/
-EAPI const char * efl_text_formatter_attribute_get(Efl_Text_Attribute_Handle *annotation);
-EAPI Eina_Iterator * efl_text_formatter_range_attributes_get(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end);
-EAPI void efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end);
-EAPI void efl_text_formatter_remove(Efl_Text_Attribute_Handle *annotation);
-EAPI Eina_Bool efl_text_formatter_attribute_is_item(Efl_Text_Attribute_Handle *annotation);
-EAPI Eina_Bool efl_text_formatter_item_geometry_get(const Efl_Text_Attribute_Handle *annotation, int *x, int *y, int *w, int *h);
+EVAS_API const char * efl_text_formatter_attribute_get(Efl_Text_Attribute_Handle *annotation);
+EVAS_API Eina_Iterator * efl_text_formatter_range_attributes_get(const Efl_Text_Cursor_Object *start, const Efl_Text_Cursor_Object *end);
+EVAS_API void efl_text_formatter_attribute_cursors_get(const Efl_Text_Attribute_Handle *handle, Efl_Text_Cursor_Object *start, Efl_Text_Cursor_Object *end);
+EVAS_API void efl_text_formatter_remove(Efl_Text_Attribute_Handle *annotation);
+EVAS_API Eina_Bool efl_text_formatter_attribute_is_item(Efl_Text_Attribute_Handle *annotation);
+EVAS_API Eina_Bool efl_text_formatter_item_geometry_get(const Efl_Text_Attribute_Handle *annotation, int *x, int *y, int *w, int *h);
 
 #ifdef __cplusplus
 }
 #endif
 
-#undef EAPI
-#define EAPI
-
 #endif
diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index cee20dda1a..4affbb99ae 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -30,7 +30,7 @@
  * @return A new uninitialised Evas canvas on success. Otherwise, @c NULL.
  * @ingroup Evas_Canvas
  */
-EAPI Evas             *evas_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
+EVAS_API Evas             *evas_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
 
 /**
  * Frees the given evas and any objects created on it.
@@ -42,7 +42,7 @@ EAPI Evas             *evas_new(void) EINA_WARN_UNUSED_RESULT EINA_MALLOC;
  *
  * @ingroup Evas_Canvas
  */
-EAPI void              evas_free(Evas *e)  EINA_ARG_NONNULL(1);
+EVAS_API void              evas_free(Evas *e)  EINA_ARG_NONNULL(1);
 
 typedef struct _Evas_Engine_Info /** Generic engine information. Generic info is useless */
 {
@@ -69,7 +69,7 @@ typedef struct _Evas_Engine_Info /** Generic engine information. Generic info is
  *
  * @ingroup Evas_Canvas
  */
-EAPI Eina_Bool evas_engine_info_set(Evas *obj, Evas_Engine_Info *info);
+EVAS_API Eina_Bool evas_engine_info_set(Evas *obj, Evas_Engine_Info *info);
 
 /**
  * @brief Retrieves the current render engine info struct from the given evas.
@@ -83,7 +83,7 @@ EAPI Eina_Bool evas_engine_info_set(Evas *obj, Evas_Engine_Info *info);
  *
  * @ingroup Evas_Canvas
  */
-EAPI Evas_Engine_Info *evas_engine_info_get(const Evas *obj);
+EVAS_API Evas_Engine_Info *evas_engine_info_get(const Evas *obj);
 
 /**
  * @brief Get the maximum image size evas can possibly handle.
@@ -99,7 +99,7 @@ EAPI Evas_Engine_Info *evas_engine_info_get(const Evas *obj);
  *
  * @return @c true on success, @c false otherwise
  */
-EAPI Eina_Bool evas_image_max_size_get(Eo *eo_e, int *w, int *h);
+EVAS_API Eina_Bool evas_image_max_size_get(Eo *eo_e, int *w, int *h);
 
 
 #include "canvas/evas_canvas_eo.legacy.h"
@@ -455,7 +455,7 @@ struct _Evas_Event_Axis_Update
  * it more than once on the event, in this case). This would make
  * sense if you passed different functions and/or callback data, only.
  */
-EAPI void  evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
+EVAS_API void  evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
 
 /**
  * Add (register) a callback function to a given canvas event with a
@@ -472,7 +472,7 @@ EAPI void  evas_event_callback_add(Evas *e, Evas_Callback_Type type, Evas_Event_
  * @see evas_event_callback_add
  * @since 1.1
  */
-EAPI void  evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 4);
+EVAS_API void  evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 4);
 
 /**
  * Delete a callback function from the canvas.
@@ -498,7 +498,7 @@ EAPI void  evas_event_callback_priority_add(Evas *e, Evas_Callback_Type type, Ev
  * my_data = evas_event_callback_del(ebject, EVAS_CALLBACK_CANVAS_FOCUS_IN, focus_in_callback);
  * @endcode
  */
-EAPI void *evas_event_callback_del(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func) EINA_ARG_NONNULL(1, 3);
+EVAS_API void *evas_event_callback_del(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func) EINA_ARG_NONNULL(1, 3);
 
 /**
  * Delete (unregister) a callback function registered to a given
@@ -530,7 +530,7 @@ EAPI void *evas_event_callback_del(Evas *e, Evas_Callback_Type type, Evas_Event_
  * @note For deletion of canvas events callbacks filtering by just
  * type and function pointer, user evas_event_callback_del().
  */
-EAPI void *evas_event_callback_del_full(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
+EVAS_API void *evas_event_callback_del_full(Evas *e, Evas_Callback_Type type, Evas_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
 
 /**
  * Push a callback on the post-event callback stack
@@ -563,7 +563,7 @@ EAPI void *evas_event_callback_del_full(Evas *e, Evas_Callback_Type type, Evas_E
  * @warning Only use this function if you know exactly what you are doing!
  *
  */
-EAPI void  evas_post_event_callback_push(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
+EVAS_API void  evas_post_event_callback_push(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
 
 /**
  * Remove a callback from the post-event callback stack
@@ -576,7 +576,7 @@ EAPI void  evas_post_event_callback_push(Evas *e, Evas_Object_Event_Post_Cb func
  * the callback stack is removed from being executed when the stack is
  * unwound. Further instances may still be run on unwind.
  */
-EAPI void  evas_post_event_callback_remove(Evas *e, Evas_Object_Event_Post_Cb func);
+EVAS_API void  evas_post_event_callback_remove(Evas *e, Evas_Object_Event_Post_Cb func);
 
 /**
  * Remove a callback from the post-event callback stack
@@ -590,7 +590,7 @@ EAPI void  evas_post_event_callback_remove(Evas *e, Evas_Object_Event_Post_Cb fu
  * in the callback stack is removed from being executed when the stack is
  * unwound. Further instances may still be run on unwind.
  */
-EAPI void  evas_post_event_callback_remove_full(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
+EVAS_API void  evas_post_event_callback_remove_full(Evas *e, Evas_Object_Event_Post_Cb func, const void *data);
 
 /**
  * @}
@@ -631,7 +631,7 @@ EAPI void  evas_post_event_callback_remove_full(Evas *e, Evas_Object_Event_Post_
  * realistic code we would be freezing while a toolkit or Edje was
  * doing some UI changes, thawing it back afterwards.
  */
-EAPI void             evas_event_freeze(Evas *e) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_event_freeze(Evas *e) EINA_ARG_NONNULL(1);
 
 /**
  * Thaw a canvas out after freezing (for input events).
@@ -646,7 +646,7 @@ EAPI void             evas_event_freeze(Evas *e) EINA_ARG_NONNULL(1);
  *
  * See evas_event_freeze() for an example.
  */
-EAPI void             evas_event_thaw(Evas *e) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_event_thaw(Evas *e) EINA_ARG_NONNULL(1);
 
 /**
  * Return the freeze count on input events of a given canvas.
@@ -668,7 +668,7 @@ EAPI void             evas_event_thaw(Evas *e) EINA_ARG_NONNULL(1);
  * @endcode
  *
  */
-EAPI int              evas_event_freeze_get(const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API int              evas_event_freeze_get(const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * After thaw of a canvas, re-evaluate the state of objects and call callbacks
@@ -679,7 +679,7 @@ EAPI int              evas_event_freeze_get(const Evas *e) EINA_WARN_UNUSED_RESU
  * containment and other states and thus also call callbacks for mouse in and
  * out on new objects if the state change demands it.
  */
-EAPI void             evas_event_thaw_eval(Evas *e) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_event_thaw_eval(Evas *e) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Mouse move event feed.
@@ -692,7 +692,7 @@ EAPI void             evas_event_thaw_eval(Evas *e) EINA_ARG_NONNULL(1);
  * @param[in] timestamp The timestamp of the mouse up event.
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_move(Evas *obj, int x, int y, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_move(Evas *obj, int x, int y, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse move event feed from input.
@@ -710,7 +710,7 @@ EAPI void             evas_event_feed_mouse_move(Evas *obj, int x, int y, unsign
  *
  * @since 1.8
  */
-EAPI void             evas_event_input_mouse_move(Evas *obj, int x, int y, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_input_mouse_move(Evas *obj, int x, int y, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse up event feed.
@@ -723,7 +723,7 @@ EAPI void             evas_event_input_mouse_move(Evas *obj, int x, int y, unsig
  * @param[in] timestamp The timestamp of the mouse up event.
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_up(Evas *obj, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_up(Evas *obj, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse down event feed.
@@ -736,7 +736,7 @@ EAPI void             evas_event_feed_mouse_up(Evas *obj, int b, Evas_Button_Fla
  * @param[in] timestamp The timestamp of the mouse up event.
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_down(Evas *obj, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_down(Evas *obj, int b, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse wheel event feed.
@@ -749,7 +749,7 @@ EAPI void             evas_event_feed_mouse_down(Evas *obj, int b, Evas_Button_F
  * @param[in] timestamp The timestamp of the mouse up event.
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_wheel(Evas *obj, int direction, int z, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_wheel(Evas *obj, int direction, int z, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse in event feed.
@@ -760,7 +760,7 @@ EAPI void             evas_event_feed_mouse_wheel(Evas *obj, int direction, int
  *
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_in(Evas *obj, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_in(Evas *obj, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse out event feed.
@@ -771,7 +771,7 @@ EAPI void             evas_event_feed_mouse_in(Evas *obj, unsigned int timestamp
  *
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_out(Evas *obj, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_out(Evas *obj, unsigned int timestamp, const void *data);
 
 /**
  * @brief Mouse cancel event feed.
@@ -780,15 +780,15 @@ EAPI void             evas_event_feed_mouse_out(Evas *obj, unsigned int timestam
  *
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_mouse_cancel(Evas *obj, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_mouse_cancel(Evas *obj, unsigned int timestamp, const void *data);
 
 /* multi touch events - no doc */
-EAPI void             evas_event_input_multi_down(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-EAPI void             evas_event_input_multi_move(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
-EAPI void             evas_event_input_multi_up(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-EAPI void             evas_event_feed_multi_down(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
-EAPI void             evas_event_feed_multi_move(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
-EAPI void             evas_event_feed_multi_up(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_input_multi_down(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_input_multi_move(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_input_multi_up(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_multi_down(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_multi_move(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_multi_up(Evas *obj, int d, int x, int y, double rad, double radx, double rady, double pres, double ang, double fx, double fy, Evas_Button_Flags flags, unsigned int timestamp, const void *data);
 
 /**
  * @brief Key down event feed.
@@ -802,7 +802,7 @@ EAPI void             evas_event_feed_multi_up(Evas *obj, int d, int x, int y, d
  * @param[in] timestamp Timestamp of the mouse up event.
  * @param[in] data Data for canvas.
  */
-EAPI void             evas_event_feed_key_down(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_key_down(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
 
 /**
  * @brief Key up event feed.
@@ -816,7 +816,7 @@ EAPI void             evas_event_feed_key_down(Evas *obj, const char *keyname, c
  * @param[in] timestamp Timestamp of the mouse up event.
  * @param[in] data Data for canvas.
  */
-EAPI void             evas_event_feed_key_up(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_key_up(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data);
 
 /**
  * @brief Key down event feed with keycode.
@@ -833,7 +833,7 @@ EAPI void             evas_event_feed_key_up(Evas *obj, const char *keyname, con
  *
  * @since 1.10
  */
-EAPI void             evas_event_feed_key_down_with_keycode(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode);
+EVAS_API void             evas_event_feed_key_down_with_keycode(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode);
 
 /**
  * @brief Key up event feed with keycode.
@@ -850,7 +850,7 @@ EAPI void             evas_event_feed_key_down_with_keycode(Evas *obj, const cha
  *
  * @since 1.10
  */
-EAPI void             evas_event_feed_key_up_with_keycode(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode);
+EVAS_API void             evas_event_feed_key_up_with_keycode(Evas *obj, const char *keyname, const char *key, const char *string, const char *compose, unsigned int timestamp, const void *data, unsigned int keycode);
 
 /**
  * @brief Input device axis update event feed.
@@ -867,7 +867,7 @@ EAPI void             evas_event_feed_key_up_with_keycode(Evas *obj, const char
  *
  * @since 1.13
  */
-EAPI void             evas_event_feed_axis_update(Evas *obj, unsigned int timestamp, int device, int toolid, int naxes, const Evas_Axis *axis, const void *data);
+EVAS_API void             evas_event_feed_axis_update(Evas *obj, unsigned int timestamp, int device, int toolid, int naxes, const Evas_Axis *axis, const void *data);
 
 /**
  * @brief Hold event feed.
@@ -877,7 +877,7 @@ EAPI void             evas_event_feed_axis_update(Evas *obj, unsigned int timest
  * @param[in] timestamp The timestamp of the mouse up event.
  * @param[in] data The data for canvas.
  */
-EAPI void             evas_event_feed_hold(Evas *obj, int hold, unsigned int timestamp, const void *data);
+EVAS_API void             evas_event_feed_hold(Evas *obj, int hold, unsigned int timestamp, const void *data);
 
 /**
  * @brief Re feed event.
@@ -889,7 +889,7 @@ EAPI void             evas_event_feed_hold(Evas *obj, int hold, unsigned int tim
  *
  * @param[in] event_type Event type.
  */
-EAPI void             evas_event_refeed_event(Evas *obj, void *event_copy, Evas_Callback_Type event_type);
+EVAS_API void             evas_event_refeed_event(Evas *obj, void *event_copy, Evas_Callback_Type event_type);
 
 /**
  * @}
@@ -917,7 +917,7 @@ EAPI void             evas_event_refeed_event(Evas *obj, void *event_copy, Evas_
  *
  * @ingroup Evas_Canvas
  */
-EAPI const Evas_Modifier *evas_key_modifier_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API const Evas_Modifier *evas_key_modifier_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Creates a bit mask from the @c keyname modifier key. Values returned
@@ -939,7 +939,7 @@ EAPI const Evas_Modifier *evas_key_modifier_get(const Evas *obj) EINA_WARN_UNUSE
  *
  * @ingroup Evas_Canvas
  */
-EAPI Evas_Modifier_Mask evas_key_modifier_mask_get(const Evas *evas, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2);
+EVAS_API Evas_Modifier_Mask evas_key_modifier_mask_get(const Evas *evas, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2);
 
 /**
  * Checks the state of a given modifier of the default seat, at the time of the
@@ -960,7 +960,7 @@ EAPI Evas_Modifier_Mask evas_key_modifier_mask_get(const Evas *evas, const char
  * @see evas_key_modifier_off
  * @see evas_seat_key_modifier_is_set
  */
-EAPI Eina_Bool            evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool            evas_key_modifier_is_set(const Evas_Modifier *m, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
 
 /**
  * Checks the state of a given modifier key of a given seat, at the time of the
@@ -985,7 +985,7 @@ EAPI Eina_Bool            evas_key_modifier_is_set(const Evas_Modifier *m, const
  * @see evas_key_modifier_is_set
  * @since 1.19
  */
-EAPI Eina_Bool            evas_seat_key_modifier_is_set(const Evas_Modifier *m, const char *keyname, const Evas_Device *seat) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool            evas_seat_key_modifier_is_set(const Evas_Modifier *m, const char *keyname, const Evas_Device *seat) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
 
 /**
  * Checks the state of a given lock key of the default seat, at the time of the call. If
@@ -1007,7 +1007,7 @@ EAPI Eina_Bool            evas_seat_key_modifier_is_set(const Evas_Modifier *m,
  * @see evas_seat_key_lock_off
  * @see evas_seat_key_lock_is_set
  */
-EAPI Eina_Bool            evas_key_lock_is_set(const Evas_Lock *l, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool            evas_key_lock_is_set(const Evas_Lock *l, const char *keyname) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
 
 /**
  * Checks the state of a given lock key of a given seat, at the time of the call. If
@@ -1029,7 +1029,7 @@ EAPI Eina_Bool            evas_key_lock_is_set(const Evas_Lock *l, const char *k
  * @see evas_key_lock_is_set
  * @since 1.19
  */
-EAPI Eina_Bool            evas_seat_key_lock_is_set(const Evas_Lock *l, const char *keyname, const Evas_Device *seat) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool            evas_seat_key_lock_is_set(const Evas_Lock *l, const char *keyname, const Evas_Device *seat) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
 
 /**
  * @brief Returns a handle to the list of lock keys registered in the canvas
@@ -1043,7 +1043,7 @@ EAPI Eina_Bool            evas_seat_key_lock_is_set(const Evas_Lock *l, const ch
  *
  * @ingroup Evas_Canvas
  */
-EAPI const Evas_Lock *evas_key_lock_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API const Evas_Lock *evas_key_lock_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @}
@@ -1061,7 +1061,7 @@ EAPI const Evas_Lock *evas_key_lock_get(const Evas *obj) EINA_WARN_UNUSED_RESULT
  *
  * @ingroup Evas_Canvas
  */
-EAPI Eina_Bool evas_pointer_inside_by_device_get(const Evas *obj, Efl_Input_Device *dev);
+EVAS_API Eina_Bool evas_pointer_inside_by_device_get(const Evas *obj, Efl_Input_Device *dev);
 
 /**
  * @brief Returns whether the default mouse pointer is logically inside the
@@ -1085,7 +1085,7 @@ EAPI Eina_Bool evas_pointer_inside_by_device_get(const Evas *obj, Efl_Input_Devi
  *
  * @ingroup Evas_Canvas
  */
-EAPI Eina_Bool evas_pointer_inside_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool evas_pointer_inside_get(const Evas *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @defgroup Evas_Touch_Point_List Touch Point List Functions
@@ -1122,7 +1122,7 @@ typedef enum
  *
  * @return The number of touched point on the evas.
  */
-EAPI unsigned int evas_touch_point_list_count(Evas *obj);
+EVAS_API unsigned int evas_touch_point_list_count(Evas *obj);
 
 /**
  * @brief This function returns the @c id of nth touch point.
@@ -1134,7 +1134,7 @@ EAPI unsigned int evas_touch_point_list_count(Evas *obj);
  *
  * @return id of nth touch point, if the call succeeded, -1 otherwise.
  */
-EAPI int evas_touch_point_list_nth_id_get(Evas *obj, unsigned int n);
+EVAS_API int evas_touch_point_list_nth_id_get(Evas *obj, unsigned int n);
 
 /**
  * @brief This function returns the @c state of nth touch point.
@@ -1149,7 +1149,7 @@ EAPI int evas_touch_point_list_nth_id_get(Evas *obj, unsigned int n);
  * @return @c state of nth touch point, if the call succeeded,
  * EVAS_TOUCH_POINT_CANCEL otherwise.
  */
-EAPI Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *obj, unsigned int n);
+EVAS_API Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *obj, unsigned int n);
 
 /**
  * @brief This function returns the nth touch point's coordinates.
@@ -1161,7 +1161,7 @@ EAPI Evas_Touch_Point_State evas_touch_point_list_nth_state_get(Evas *obj, unsig
  * @param[out] x The pointer to a Evas_Coord to be filled in.
  * @param[out] y The pointer to a Evas_Coord to be filled in.
  */
-EAPI void evas_touch_point_list_nth_xy_get(Evas *eo_e, unsigned int n, Evas_Coord *x, Evas_Coord *y);
+EVAS_API void evas_touch_point_list_nth_xy_get(Evas *eo_e, unsigned int n, Evas_Coord *x, Evas_Coord *y);
 
 /**
  * @}
@@ -1179,7 +1179,7 @@ EAPI void evas_touch_point_list_nth_xy_get(Evas *eo_e, unsigned int n, Evas_Coor
  * @param e The evas instance that returned such list.
  * @param available the list returned by evas_font_dir_available_list().
  */
-EAPI void                    evas_font_available_list_free(Evas *e, Eina_List *available) EINA_ARG_NONNULL(1);
+EVAS_API void                    evas_font_available_list_free(Evas *e, Eina_List *available) EINA_ARG_NONNULL(1);
 
 /** Flags for Font Hinting
  */
@@ -1198,7 +1198,7 @@ typedef enum
  * @param[in] hinting The used hinting, one of #EVAS_FONT_HINTING_NONE,
  * #EVAS_FONT_HINTING_AUTO, #EVAS_FONT_HINTING_BYTECODE.
  */
-EAPI void evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting);
+EVAS_API void evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting);
 
 /**
  * @brief Retrieves the font hinting used by the given evas.
@@ -1206,7 +1206,7 @@ EAPI void evas_font_hinting_set(Evas *e, Evas_Font_Hinting_Flags hinting);
  * @return The used hinting, one of #EVAS_FONT_HINTING_NONE,
  * #EVAS_FONT_HINTING_AUTO, #EVAS_FONT_HINTING_BYTECODE.
  */
-EAPI Evas_Font_Hinting_Flags evas_font_hinting_get(const Evas *e);
+EVAS_API Evas_Font_Hinting_Flags evas_font_hinting_get(const Evas *e);
 
 /**
  * @brief Checks if the font hinting is supported by the given evas.
@@ -1220,7 +1220,7 @@ EAPI Evas_Font_Hinting_Flags evas_font_hinting_get(const Evas *e);
  *
  * @ingroup Evas_Canvas
  */
-EAPI Eina_Bool evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags hinting) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @}
@@ -1270,7 +1270,7 @@ EAPI Eina_Bool evas_font_hinting_can_hint(const Evas *e, Evas_Font_Hinting_Flags
  * @ingroup Evas_Object_Group_Basic
  * @since 1.1
  */
-EAPI void             evas_object_ref(Evas_Object *obj);
+EVAS_API void             evas_object_ref(Evas_Object *obj);
 
 /**
  * Decrements object reference count.
@@ -1288,7 +1288,7 @@ EAPI void             evas_object_ref(Evas_Object *obj);
  * @ingroup Evas_Object_Group_Basic
  * @since 1.1
  */
-EAPI void             evas_object_unref(Evas_Object *obj);
+EVAS_API void             evas_object_unref(Evas_Object *obj);
 
 /**
  * Get the object reference count.
@@ -1307,7 +1307,7 @@ EAPI void             evas_object_unref(Evas_Object *obj);
  * @ingroup Evas_Object_Group_Basic
  * @since 1.2
  */
-EAPI int              evas_object_ref_get(const Evas_Object *obj);
+EVAS_API int              evas_object_ref_get(const Evas_Object *obj);
 
 /**
  * Marks the given Evas object for deletion (when Evas will free its
@@ -1329,7 +1329,7 @@ EAPI int              evas_object_ref_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void             evas_object_del(Evas_Object *obj) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_object_del(Evas_Object *obj) EINA_ARG_NONNULL(1);
 
 /**
  * @brief Retrieves the type of the given Evas object.
@@ -1348,7 +1348,7 @@ EAPI void             evas_object_del(Evas_Object *obj) EINA_ARG_NONNULL(1);
  * @ingroup Evas_Object_Group_Basic
  * @since 1.18
  */
-EAPI const char      *evas_object_type_get(const Evas_Object *obj);
+EVAS_API const char      *evas_object_type_get(const Evas_Object *obj);
 
 /**
  * @brief Sets the name of the given Evas object to the given name.
@@ -1359,7 +1359,7 @@ EAPI const char      *evas_object_type_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void evas_object_name_set(Evas_Object *obj, const char *name);
+EVAS_API void evas_object_name_set(Evas_Object *obj, const char *name);
 
 /**
  * @brief Retrieves the name of the given Evas object.
@@ -1370,7 +1370,7 @@ EAPI void evas_object_name_set(Evas_Object *obj, const char *name);
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI const char *evas_object_name_get(const Evas_Object *obj);
+EVAS_API const char *evas_object_name_get(const Evas_Object *obj);
 
 /**
  * @brief Retrieves the object from children of the given object with the given
@@ -1394,7 +1394,7 @@ EAPI const char *evas_object_name_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI Evas_Object *evas_object_name_child_find(const Evas_Object *obj, const char *name, int recurse) EINA_WARN_UNUSED_RESULT;
+EVAS_API Evas_Object *evas_object_name_child_find(const Evas_Object *obj, const char *name, int recurse) EINA_WARN_UNUSED_RESULT;
 
 /**
  * Retrieves the position and (rectangular) size of the given Evas
@@ -1425,7 +1425,7 @@ EAPI Evas_Object *evas_object_name_child_find(const Evas_Object *obj, const char
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void             evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h) EINA_ARG_NONNULL(1);
 
 /**
  * Set the position and (rectangular) size of the given Evas object.
@@ -1452,7 +1452,7 @@ EAPI void             evas_object_geometry_get(const Evas_Object *obj, Evas_Coor
  * @since 1.8
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void             evas_object_geometry_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_object_geometry_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas_Coord h) EINA_ARG_NONNULL(1);
 
 
 /**
@@ -1468,7 +1468,7 @@ EAPI void             evas_object_geometry_set(Evas_Object *obj, Evas_Coord x, E
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void             evas_object_show(Evas_Object *obj) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_object_show(Evas_Object *obj) EINA_ARG_NONNULL(1);
 
 /**
  * Makes the given Evas object invisible.
@@ -1500,7 +1500,7 @@ EAPI void             evas_object_show(Evas_Object *obj) EINA_ARG_NONNULL(1);
  *
  * @ingroup Evas_Object_Group_Basic
  */
-EAPI void             evas_object_hide(Evas_Object *obj) EINA_ARG_NONNULL(1);
+EVAS_API void             evas_object_hide(Evas_Object *obj) EINA_ARG_NONNULL(1);
 
 /**
  *
@@ -1517,7 +1517,7 @@ EAPI void             evas_object_hide(Evas_Object *obj) EINA_ARG_NONNULL(1);
  * @param[in] b The blue component of the given color.
  * @param[in] a The alpha component of the given color.
  */
-EAPI void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a);
+EVAS_API void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a);
 
 /**
  *
@@ -1554,7 +1554,7 @@ EAPI void evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a);
  * @param[out] b The blue component of the given color.
  * @param[out] a The alpha component of the given color.
  */
-EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
+EVAS_API void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b, int *a);
 
 /**
  * @}
@@ -1568,7 +1568,7 @@ EAPI void evas_object_color_get(const Evas_Object *obj, int *r, int *g, int *b,
  * @param[in] y in
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
+EVAS_API void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
 
 /**
  *
@@ -1578,7 +1578,7 @@ EAPI void evas_object_move(Evas_Object *obj, Evas_Coord x, Evas_Coord y);
  * @param[in] h in
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EVAS_API void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 
 /**
  *
@@ -1586,7 +1586,7 @@ EAPI void evas_object_resize(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Eina_Bool evas_object_visible_get(const Evas_Object *obj);
+EVAS_API Eina_Bool evas_object_visible_get(const Evas_Object *obj);
 
 /**
  * @brief Sets the hints for an object's maximum size.
@@ -1605,7 +1605,7 @@ EAPI Eina_Bool evas_object_visible_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EVAS_API void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 
 /**
  * @brief Retrieves the hints for an object's maximum size.
@@ -1622,7 +1622,7 @@ EAPI void evas_object_size_hint_max_set(Evas_Object *obj, Evas_Coord w, Evas_Coo
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EVAS_API void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 
 /**
  * @brief Sets the hints for an object's optimum size.
@@ -1640,7 +1640,7 @@ EAPI void evas_object_size_hint_max_get(const Evas_Object *obj, Evas_Coord *w, E
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EVAS_API void evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 
 /**
  * @brief Retrieves the hints for an object's optimum size.
@@ -1657,7 +1657,7 @@ EAPI void evas_object_size_hint_request_set(Evas_Object *obj, Evas_Coord w, Evas
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EVAS_API void evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 
 /**
  * @brief Sets the hints for an object's minimum size.
@@ -1675,7 +1675,7 @@ EAPI void evas_object_size_hint_request_get(const Evas_Object *obj, Evas_Coord *
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
+EVAS_API void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coord h);
 
 /**
  * @brief Disable/cease clipping on a clipped @c obj object.
@@ -1690,7 +1690,7 @@ EAPI void evas_object_size_hint_min_set(Evas_Object *obj, Evas_Coord w, Evas_Coo
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_clip_unset(Evas_Object *obj);
+EVAS_API void evas_object_clip_unset(Evas_Object *obj);
 
 /**
  * @brief Retrieves the hints for an object's minimum size.
@@ -1707,7 +1707,7 @@ EAPI void evas_object_clip_unset(Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
+EVAS_API void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, Evas_Coord *h);
 
 /**
  * @brief Sets the hints for an object's padding space.
@@ -1725,7 +1725,7 @@ EAPI void evas_object_size_hint_min_get(const Evas_Object *obj, Evas_Coord *w, E
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
+EVAS_API void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas_Coord r, Evas_Coord t, Evas_Coord b);
 
 /**
  * @brief Retrieves the hints for an object's padding space.
@@ -1746,7 +1746,7 @@ EAPI void evas_object_size_hint_padding_set(Evas_Object *obj, Evas_Coord l, Evas
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
+EVAS_API void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *l, Evas_Coord *r, Evas_Coord *t, Evas_Coord *b);
 
 /**
  * @brief Sets the hints for an object's weight.
@@ -1771,7 +1771,7 @@ EAPI void evas_object_size_hint_padding_get(const Evas_Object *obj, Evas_Coord *
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y);
+EVAS_API void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y);
 
 /**
  * @brief Retrieves the hints for an object's weight.
@@ -1794,7 +1794,7 @@ EAPI void evas_object_size_hint_weight_set(Evas_Object *obj, double x, double y)
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y);
+EVAS_API void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, double *y);
 
 /**
  * @brief Sets the hints for an object's alignment.
@@ -1825,7 +1825,7 @@ EAPI void evas_object_size_hint_weight_get(const Evas_Object *obj, double *x, do
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y);
+EVAS_API void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y);
 
 /**
  * @brief Retrieves the hints for on object's alignment.
@@ -1845,7 +1845,7 @@ EAPI void evas_object_size_hint_align_set(Evas_Object *obj, double x, double y);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y);
+EVAS_API void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, double *y);
 
 /**
  * @brief Sets the hints for an object's aspect ratio.
@@ -1866,7 +1866,7 @@ EAPI void evas_object_size_hint_align_get(const Evas_Object *obj, double *x, dou
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
+EVAS_API void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control aspect, Evas_Coord w, Evas_Coord h);
 
 /**
  * @brief Retrieves the hints for an object's aspect ratio.
@@ -1889,7 +1889,7 @@ EAPI void evas_object_size_hint_aspect_set(Evas_Object *obj, Evas_Aspect_Control
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h);
+EVAS_API void evas_object_size_hint_aspect_get(const Evas_Object *obj, Evas_Aspect_Control *aspect, Evas_Coord *w, Evas_Coord *h);
 
 /** Display mode size hint. */
 typedef enum
@@ -1920,7 +1920,7 @@ typedef Efl_Gfx_Hint_Mode             Evas_Display_Mode;
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_size_hint_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode);
+EVAS_API void evas_object_size_hint_display_mode_set(Evas_Object *obj, Evas_Display_Mode dispmode);
 
 /**
  * @brief Retrieves the hints for an object's display mode
@@ -1933,7 +1933,7 @@ EAPI void evas_object_size_hint_display_mode_set(Evas_Object *obj, Evas_Display_
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Display_Mode evas_object_size_hint_display_mode_get(const Evas_Object *obj);
+EVAS_API Evas_Display_Mode evas_object_size_hint_display_mode_get(const Evas_Object *obj);
 
 /**
  *
@@ -1958,7 +1958,7 @@ EAPI Evas_Display_Mode evas_object_size_hint_display_mode_get(const Evas_Object
 Must be between #EVAS_LAYER_MIN and #EVAS_LAYER_MAX.
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_layer_set(Evas_Object *obj, short l);
+EVAS_API void evas_object_layer_set(Evas_Object *obj, short l);
 
 /**
  *
@@ -1970,7 +1970,7 @@ EAPI void evas_object_layer_set(Evas_Object *obj, short l);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI short evas_object_layer_get(const Evas_Object *obj);
+EVAS_API short evas_object_layer_get(const Evas_Object *obj);
 
 /**
  *
@@ -1988,7 +1988,7 @@ EAPI short evas_object_layer_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Object *evas_object_below_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API Evas_Object *evas_object_below_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  *
@@ -2006,7 +2006,7 @@ EAPI Evas_Object *evas_object_below_get(const Evas_Object *obj) EINA_WARN_UNUSED
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Object *evas_object_above_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API Evas_Object *evas_object_above_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  *
@@ -2036,7 +2036,7 @@ EAPI Evas_Object *evas_object_above_get(const Evas_Object *obj) EINA_WARN_UNUSED
  * @param[in] below the object below which to stack
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_stack_below(Evas_Object *obj, Evas_Object *below) EINA_ARG_NONNULL(2);
+EVAS_API void evas_object_stack_below(Evas_Object *obj, Evas_Object *below) EINA_ARG_NONNULL(2);
 
 /**
  *
@@ -2052,7 +2052,7 @@ EAPI void evas_object_stack_below(Evas_Object *obj, Evas_Object *below) EINA_ARG
  * @ingroup Evas_Object_Group
  *
  */
-EAPI void evas_object_raise(Evas_Object *obj);
+EVAS_API void evas_object_raise(Evas_Object *obj);
 
 /**
  *
@@ -2082,7 +2082,7 @@ EAPI void evas_object_raise(Evas_Object *obj);
  * @param[in] above the object above which to stack
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_stack_above(Evas_Object *obj, Evas_Object *above) EINA_ARG_NONNULL(2);
+EVAS_API void evas_object_stack_above(Evas_Object *obj, Evas_Object *above) EINA_ARG_NONNULL(2);
 
 /**
  *
@@ -2098,7 +2098,7 @@ EAPI void evas_object_stack_above(Evas_Object *obj, Evas_Object *above) EINA_ARG
  * @ingroup Evas_Object_Group
  *
  */
-EAPI void evas_object_lower(Evas_Object *obj);
+EVAS_API void evas_object_lower(Evas_Object *obj);
 
 /**
  * @brief Set a hint flag on the given Evas object that it's used as a "static
@@ -2113,7 +2113,7 @@ EAPI void evas_object_lower(Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip);
+EVAS_API void evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip);
 
 /**
  * @brief Return a list of objects currently clipped by @c obj.
@@ -2135,7 +2135,7 @@ EAPI void evas_object_static_clip_set(Evas_Object *obj, Eina_Bool is_static_clip
  *
  * @ingroup Evas_Object_Group
  */
-EAPI const Eina_List *evas_object_clipees_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API const Eina_List *evas_object_clipees_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Test if any object is clipped by @c obj.
@@ -2148,7 +2148,7 @@ EAPI const Eina_List *evas_object_clipees_get(const Evas_Object *obj) EINA_WARN_
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Eina_Bool evas_object_clipees_has(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool evas_object_clipees_has(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /** How the object should be rendered to output.
  *
@@ -2196,7 +2196,7 @@ typedef enum
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op);
+EVAS_API void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op);
 
 /**
  * @brief Retrieves the current value of the operation used for rendering the
@@ -2207,7 +2207,7 @@ EAPI void evas_object_render_op_set(Evas_Object *obj, Evas_Render_Op render_op);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj);
+EVAS_API Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj);
 
 /**
  * @brief Get the "static clipper" hint flag for a given Evas object.
@@ -2216,7 +2216,7 @@ EAPI Evas_Render_Op evas_object_render_op_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Eina_Bool evas_object_static_clip_get(const Evas_Object *obj);
+EVAS_API Eina_Bool evas_object_static_clip_get(const Evas_Object *obj);
 
 /**
  * @brief Sets the scaling factor for an Evas object. Does not affect all
@@ -2234,7 +2234,7 @@ EAPI Eina_Bool evas_object_static_clip_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI void evas_object_scale_set(Evas_Object *obj, double scale);
+EVAS_API void evas_object_scale_set(Evas_Object *obj, double scale);
 
 /**
  * @brief Retrieves the scaling factor for the given Evas object.
@@ -2245,7 +2245,7 @@ EAPI void evas_object_scale_set(Evas_Object *obj, double scale);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI double evas_object_scale_get(const Evas_Object *obj);
+EVAS_API double evas_object_scale_get(const Evas_Object *obj);
 
 /**
  * @brief Returns whether the mouse pointer is logically inside the object.
@@ -2258,7 +2258,7 @@ EAPI double evas_object_scale_get(const Evas_Object *obj);
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Eina_Bool evas_object_pointer_inside_by_device_get(const Evas_Object *obj, Efl_Input_Device * dev);
+EVAS_API Eina_Bool evas_object_pointer_inside_by_device_get(const Evas_Object *obj, Efl_Input_Device * dev);
 
 /**
  * @brief Returns whether the default mouse pointer is logically inside the
@@ -2278,7 +2278,7 @@ EAPI Eina_Bool evas_object_pointer_inside_by_device_get(const Evas_Object *obj,
  *
  * @ingroup Evas_Object_Group
  */
-EAPI Eina_Bool evas_object_pointer_inside_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool evas_object_pointer_inside_get(const Evas_Object *obj) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Returns whether the coords are logically inside the object.
@@ -2300,7 +2300,7 @@ EAPI Eina_Bool evas_object_pointer_inside_get(const Evas_Object *obj) EINA_WARN_
  * @ingroup Evas_Object_Group
  */
 
-EAPI Eina_Bool evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj, int x, int y) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_Bool evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj, int x, int y) EINA_WARN_UNUSED_RESULT;
 
 #include "canvas/efl_canvas_object_eo.legacy.h"
 
@@ -2311,7 +2311,7 @@ EAPI Eina_Bool evas_object_pointer_coords_inside_get(const Evas_Object *eo_obj,
  * evas 3D / VG object.
  * @ingroup Evas_Object_Group
  */
-EAPI Evas *evas_object_evas_get(const Eo *obj);
+EVAS_API Evas *evas_object_evas_get(const Eo *obj);
 
 /**
  * @brief Retrieve a list of objects lying over a given position in a canvas.
@@ -2336,7 +2336,7 @@ EAPI Evas *evas_object_evas_get(const Eo *obj);
  *
  * @ingroup Evas_Canvas
  */
- EAPI Eina_List *evas_objects_at_xy_get(Eo *eo_e, int x, int y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
+ EVAS_API Eina_List *evas_objects_at_xy_get(Eo *eo_e, int x, int y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
 
 
 /**
@@ -2363,7 +2363,7 @@ EAPI Evas *evas_object_evas_get(const Eo *obj);
  * position.
  * @ingroup Evas_Canvas
  */
- EAPI Evas_Object* evas_object_top_at_xy_get(Eo *eo_e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
+ EVAS_API Evas_Object* evas_object_top_at_xy_get(Eo *eo_e, Evas_Coord x, Evas_Coord y, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects);
 
 
 /**
@@ -2382,7 +2382,7 @@ EAPI Evas *evas_object_evas_get(const Eo *obj);
  * @return List of objects
  * @ingroup Evas_Canvas
  */
-EAPI Eina_List *evas_objects_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) EINA_WARN_UNUSED_RESULT;
+EVAS_API Eina_List *evas_objects_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @brief Retrieve the Evas object stacked at the top of a given rectangular
@@ -2413,7 +2413,7 @@ EAPI Eina_List *evas_objects_in_rectangle_get(const Eo *obj, int x, int y, int w
  *
  * @ingroup Evas_Canvas
  */
-EAPI Evas_Object *evas_object_top_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) EINA_WARN_UNUSED_RESULT;
+EVAS_API Evas_Object *evas_object_top_in_rectangle_get(const Eo *obj, int x, int y, int w, int h, Eina_Bool include_pass_events_objects, Eina_Bool include_hidden_objects) EINA_WARN_UNUSED_RESULT;
 
 /**
  * @ingroup Evas_Object_Group_Events
@@ -2610,7 +2610,7 @@ EAPI Evas_Object *evas_object_top_in_rectangle_get(const Eo *obj, int x, int y,
  * See the full example @ref Example_Evas_Events "here".
  *
  */
-EAPI void      evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
+EVAS_API void      evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
 
 /**
  * Add (register) a callback function to a given Evas object event with a
@@ -2626,7 +2626,7 @@ EAPI void      evas_object_event_callback_add(Evas_Object *obj, Evas_Callback_Ty
  * @see evas_object_event_callback_add
  * @since 1.1
  */
-EAPI void      evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 4);
+EVAS_API void      evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Callback_Type type, Evas_Callback_Priority priority, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 4);
 
 /**
  * Delete a callback function from an object
@@ -2652,7 +2652,7 @@ EAPI void      evas_object_event_callback_priority_add(Evas_Object *obj, Evas_Ca
  * my_data = evas_object_event_callback_del(object, EVAS_CALLBACK_MOUSE_UP, up_callback);
  * @endcode
  */
-EAPI void     *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func) EINA_ARG_NONNULL(1, 3);
+EVAS_API void     *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func) EINA_ARG_NONNULL(1, 3);
 
 /**
  * Delete (unregister) a callback function registered to a given
@@ -2686,7 +2686,7 @@ EAPI void     *evas_object_event_callback_del(Evas_Object *obj, Evas_Callback_Ty
  * my_data = evas_object_event_callback_del_full(object, EVAS_CALLBACK_MOUSE_UP, up_callback, data);
  * @endcode
  */
-EAPI void     *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
+EVAS_API void     *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callback_Type type, Evas_Object_Event_Cb func, const void *data) EINA_ARG_NONNULL(1, 3);
 
 /**
  * @brief Requests @c keyname key events be directed to @c obj.
@@ -2723,7 +2723,7 @@ EAPI void     *evas_object_event_callback_del_full(Evas_Object *obj, Evas_Callba
  *
  * @return @c true if the call succeeded, @c false otherwise.
  */
-EAPI Eina_Bool evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2);
+EVAS_API Eina_Bool evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers, Eina_Bool exclusive) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2);
 
 /**
  * @brief Removes the grab on @c keyname key events by @c obj.
@@ -2740,7 +2740,7 @@ EAPI Eina_Bool evas_object_key_grab(Evas_Object *obj, const char *keyname, Evas_
  * @param[in] not_modifiers A mask of modifiers that mus not not be present to
  * trigger the event.
  */
-EAPI void evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) EINA_ARG_NONNULL(2);
+EVAS_API void evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modifiers, Evas_Modifier_Mask not_modifiers) EINA_ARG_NONNULL(2);
 
 /**
  * @}
@@ -2790,7 +2790,7 @@ EAPI void evas_object_key_ungrab(Evas_Object *obj, const char *keyname, Evas_Mod
  * printf("The data that was attached was %p\n", evas_object_data_get(obj, "name_of_data"));
  * @endcode
  */
-EAPI void                     evas_object_data_set(Evas_Object *obj, const char *key, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void                     evas_object_data_set(Evas_Object *obj, const char *key, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Return an attached data pointer on an Evas object by its given
@@ -2821,7 +2821,7 @@ EAPI void                     evas_object_data_set(Evas_Object *obj, const char
  * else printf("No data was stored on the object\n");
  * @endcode
  */
-EAPI void                    *evas_object_data_get(const Evas_Object *obj, const char *key) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
+EVAS_API void                    *evas_object_data_get(const Evas_Object *obj, const char *key) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1, 2);
 
 /**
  * Delete an attached data pointer from an object.
@@ -2843,7 +2843,7 @@ EAPI void                    *evas_object_data_get(const Evas_Object *obj, const
  * my_data = evas_object_data_del(obj, "name_of_my_data");
  * @endcode
  */
-EAPI void                    *evas_object_data_del(Evas_Object *obj, const char *key) EINA_ARG_NONNULL(1, 2);
+EVAS_API void                    *evas_object_data_del(Evas_Object *obj, const char *key) EINA_ARG_NONNULL(1, 2);
 
 /**
  * @}
@@ -2871,7 +2871,7 @@ EAPI void                    *evas_object_data_del(Evas_Object *obj, const char
  * objects, acting only on the ones at the "top level", with regard to
  * object parenting.
  */
-EAPI Evas_Object *evas_object_top_at_pointer_get(const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EVAS_API Evas_Object *evas_object_top_at_pointer_get(const Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
 
 /**
  * @}
@@ -3092,7 +3092,7 @@ typedef void (*Evas_Object_Intercept_Clip_Unset_Cb)(void *data, Evas_Object *obj
  * @see evas_object_intercept_show_callback_del().
  *
  */
-EAPI void  evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a show event of a object.
@@ -3106,7 +3106,7 @@ EAPI void  evas_object_intercept_show_callback_add(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_show_callback_add().
  *
  */
-EAPI void *evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object_Intercept_Show_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a hide event of a object.
@@ -3121,7 +3121,7 @@ EAPI void *evas_object_intercept_show_callback_del(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_hide_callback_del().
  *
  */
-EAPI void  evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a hide event of a object.
@@ -3135,7 +3135,7 @@ EAPI void  evas_object_intercept_hide_callback_add(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_hide_callback_add().
  *
  */
-EAPI void *evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object_Intercept_Hide_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a move event of an object.
@@ -3150,7 +3150,7 @@ EAPI void *evas_object_intercept_hide_callback_del(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_move_callback_del().
  *
  */
-EAPI void  evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a move event of an object.
@@ -3164,7 +3164,7 @@ EAPI void  evas_object_intercept_move_callback_add(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_move_callback_add().
  *
  */
-EAPI void *evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object_Intercept_Move_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a resize event of an object.
@@ -3179,7 +3179,7 @@ EAPI void *evas_object_intercept_move_callback_del(Evas_Object *obj, Evas_Object
  * @see evas_object_intercept_resize_callback_del().
  *
  */
-EAPI void  evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a resize event of an object.
@@ -3193,7 +3193,7 @@ EAPI void  evas_object_intercept_resize_callback_add(Evas_Object *obj, Evas_Obje
  * @see evas_object_intercept_resize_callback_add().
  *
  */
-EAPI void *evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Object_Intercept_Resize_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a raise event of an object.
@@ -3208,7 +3208,7 @@ EAPI void *evas_object_intercept_resize_callback_del(Evas_Object *obj, Evas_Obje
  * @see evas_object_intercept_raise_callback_del().
  *
  */
-EAPI void  evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a raise event of an object.
@@ -3222,7 +3222,7 @@ EAPI void  evas_object_intercept_raise_callback_add(Evas_Object *obj, Evas_Objec
  * @see evas_object_intercept_raise_callback_add().
  *
  */
-EAPI void *evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Object_Intercept_Raise_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a lower event of an object.
@@ -3237,7 +3237,7 @@ EAPI void *evas_object_intercept_raise_callback_del(Evas_Object *obj, Evas_Objec
  * @see evas_object_intercept_lower_callback_del().
  *
  */
-EAPI void  evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a lower event of an object.
@@ -3251,7 +3251,7 @@ EAPI void  evas_object_intercept_lower_callback_add(Evas_Object *obj, Evas_Objec
  * @see evas_object_intercept_lower_callback_add().
  *
  */
-EAPI void *evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Object_Intercept_Lower_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a stack above event of an object.
@@ -3266,7 +3266,7 @@ EAPI void *evas_object_intercept_lower_callback_del(Evas_Object *obj, Evas_Objec
  * @see evas_object_intercept_stack_above_callback_del().
  *
  */
-EAPI void  evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a stack above event of an object.
@@ -3280,7 +3280,7 @@ EAPI void  evas_object_intercept_stack_above_callback_add(Evas_Object *obj, Evas
  * @see evas_object_intercept_stack_above_callback_add().
  *
  */
-EAPI void *evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Above_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a stack below event of an object.
@@ -3295,7 +3295,7 @@ EAPI void *evas_object_intercept_stack_above_callback_del(Evas_Object *obj, Evas
  * @see evas_object_intercept_stack_below_callback_del().
  *
  */
-EAPI void  evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a stack below event of an object.
@@ -3309,7 +3309,7 @@ EAPI void  evas_object_intercept_stack_below_callback_add(Evas_Object *obj, Evas
  * @see evas_object_intercept_stack_below_callback_add().
  *
  */
-EAPI void *evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas_Object_Intercept_Stack_Below_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a layer set event of an object.
@@ -3324,7 +3324,7 @@ EAPI void *evas_object_intercept_stack_below_callback_del(Evas_Object *obj, Evas
  * @see evas_object_intercept_layer_set_callback_del().
  *
  */
-EAPI void  evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a layer set event of an object.
@@ -3338,7 +3338,7 @@ EAPI void  evas_object_intercept_layer_set_callback_add(Evas_Object *obj, Evas_O
  * @see evas_object_intercept_layer_set_callback_add().
  *
  */
-EAPI void *evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Layer_Set_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a color set event of an object.
@@ -3353,7 +3353,7 @@ EAPI void *evas_object_intercept_layer_set_callback_del(Evas_Object *obj, Evas_O
  * @see evas_object_intercept_color_set_callback_del().
  *
  */
-EAPI void  evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a color set event of an object.
@@ -3367,7 +3367,7 @@ EAPI void  evas_object_intercept_color_set_callback_add(Evas_Object *obj, Evas_O
  * @see evas_object_intercept_color_set_callback_add().
  *
  */
-EAPI void *evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Color_Set_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a clip set event of an object.
@@ -3382,7 +3382,7 @@ EAPI void *evas_object_intercept_color_set_callback_del(Evas_Object *obj, Evas_O
  * @see evas_object_intercept_clip_set_callback_del().
  *
  */
-EAPI void  evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a clip set event of an object.
@@ -3396,7 +3396,7 @@ EAPI void  evas_object_intercept_clip_set_callback_add(Evas_Object *obj, Evas_Ob
  * @see evas_object_intercept_clip_set_callback_add().
  *
  */
-EAPI void *evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Set_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a clip unset event of an object.
@@ -3411,7 +3411,7 @@ EAPI void *evas_object_intercept_clip_set_callback_del(Evas_Object *obj, Evas_Ob
  * @see evas_object_intercept_clip_unset_callback_del().
  *
  */
-EAPI void  evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a clip unset event of an object.
@@ -3425,7 +3425,7 @@ EAPI void  evas_object_intercept_clip_unset_callback_add(Evas_Object *obj, Evas_
  * @see evas_object_intercept_clip_unset_callback_add().
  *
  */
-EAPI void *evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_Object_Intercept_Clip_Unset_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a focus set event of an object.
@@ -3440,7 +3440,7 @@ EAPI void *evas_object_intercept_clip_unset_callback_del(Evas_Object *obj, Evas_
  * @see evas_object_intercept_focus_set_callback_del().
  *
  */
-EAPI void  evas_object_intercept_focus_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_focus_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a focus set event of an object.
@@ -3454,7 +3454,7 @@ EAPI void  evas_object_intercept_focus_set_callback_add(Evas_Object *obj, Evas_O
  * @see evas_object_intercept_focus_set_callback_add().
  *
  */
-EAPI void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Focus_Set_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Set the callback function that intercepts a focus set event of an object.
@@ -3471,7 +3471,7 @@ EAPI void *evas_object_intercept_focus_set_callback_del(Evas_Object *obj, Evas_O
  * @since 1.20
  *
  */
-EAPI void  evas_object_intercept_device_focus_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Device_Focus_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
+EVAS_API void  evas_object_intercept_device_focus_set_callback_add(Evas_Object *obj, Evas_Object_Intercept_Device_Focus_Set_Cb func, const void *data) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Unset the callback function that intercepts a focus set event of an object.
@@ -3487,7 +3487,7 @@ EAPI void  evas_object_intercept_device_focus_set_callback_add(Evas_Object *obj,
  * @since 1.20
  *
  */
-EAPI void *evas_object_intercept_device_focus_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Device_Focus_Set_Cb func) EINA_ARG_NONNULL(1, 2);
+EVAS_API void *evas_object_intercept_device_focus_set_callback_del(Evas_Object *obj, Evas_Object_Intercept_Device_Focus_Set_Cb func) EINA_ARG_NONNULL(1, 2);
 
 /* Internal APIs for legacy compatibility */
 #ifdef EFL_CANVAS_OBJECT_PROTECTED
@@ -3509,7 +3509,7 @@ enum _Evas_Object_Intercept_Cb_Type
 };
 typedef enum _Evas_Object_Intercept_Cb_Type Evas_Object_Intercept_Cb_Type;
 
-EWAPI Eina_Bool _evas_object_intercept_call(Evas_Object *obj, Evas_Object_Intercept_Cb_Type type, int internal, ...);
+EVAS_API EVAS_API_WEAK Eina_Bool _evas_object_intercept_call(Evas_Object *obj, Evas_Object_Intercept_Cb_Type type, int internal, ...);
 
 #endif
 
@@ -3531,7 +3531,7 @@ EWAPI Eina_Bool _evas_object_intercept_call(Evas_Object *obj, Evas_Object_Interc
  *
  * @ingroup Evas_Object_Rectangle
  */
-EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EVAS_API Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * @}
@@ -3619,7 +3619,7 @@ EAPI Evas_Object *evas_object_rectangle_add(Evas *e) EINA_WARN_UNUSED_RESULT EIN
  *
  * @since 1.14
  */
-EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
+EVAS_API Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1) EINA_MALLOC;
 
 /**
  * Get the total number of frames of the vector, if it's animated.
@@ -3628,7 +3628,7 @@ EAPI Evas_Object *evas_object_vg_add(Evas *e) EINA_WARN_UNUSED_RESULT EINA_ARG_N
  *
  * @since 1.23
  */
-EAPI int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+EVAS_API int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
 
 /**
  * Get the duration of a sequence of frames.
@@ -3648,7 +3648,7 @@ EAPI int evas_object_vg_animated_frame_count_get(const Evas_Object *obj) EINA_AR
  * @see evas_object_vg_animated_frame_count_get()
  * @since 1.23
  */
-EAPI double evas_object_vg_animated_frame_duration_get(const Evas_Object *obj, int start_frame EINA_UNUSED, int frame_num EINA_UNUSED) EINA_ARG_NONNULL(1);
+EVAS_API double evas_object_vg_animated_frame_duration_get(const Evas_Object *obj, int start_frame EINA_UNUSED, int frame_num EINA_UNUSED) EINA_ARG_NONNULL(1);
 
 /**
  *
@@ -3667,7 +3667,7 @@ NULL, otherwise.
  *
  * @since 1.23
  */
-EAPI Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const char *key);
+EVAS_API Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const char *key);
 
 /**
  * Set current frame of animated vector object.
@@ -3682,7 +3682,7 @@ EAPI Eina_Bool evas_object_vg_file_set(Evas_Object *obj, const char *file, const
  *
  * @since 1.23
  */
-EAPI Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_index) EINA_ARG_NONNULL(1, 2);
+EVAS_API Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_index) EINA_ARG_NONNULL(1, 2);
 
 /**
  * Get the current frame number of animated vector object.
@@ -3694,7 +3694,7 @@ EAPI Eina_Bool evas_object_vg_animated_frame_set(Evas_Object *obj, int frame_ind
  *
  * @since 1.23
  */
-EAPI int evas_object_vg_animated_frame_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
+EVAS_API int evas_object_vg_animated_frame_get(const Evas_Object *obj) EINA_ARG_NONNULL(1);
 
 
 #include "canvas/efl_canvas_vg_node_eo.legacy.h"
@@ -3820,7 +3820,7 @@ typedef struct _Evas_Vg_Dash
  *
  * @since 1.14
  */
-EAPI Evas_Vg_Shape* evas_vg_shape_add(Evas_Vg_Container *parent);
+EVAS_API Evas_Vg_Shape* evas_vg_shape_add(Evas_Vg_Container *parent);
 
 /**
  * @brief Creates a new vector container object.
@@ -3831,7 +3831,7 @@ EAPI Evas_Vg_Shape* evas_vg_shape_add(Evas_Vg_Container *parent);
  * @since 1.14
  */
 
-EAPI Evas_Vg_Container* evas_vg_container_add(Evas_Object *parent);
+EVAS_API Evas_Vg_Container* evas_vg_container_add(Evas_Object *parent);
 
 /**
  * @brief Retrieves whether or not the given Evas_Vg_Node object is visible.
@@ -3841,7 +3841,7 @@ EAPI Evas_Vg_Container* evas_vg_container_add(Evas_Object *parent);
  *
  * @since 1.24
  */
-EAPI Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj);
+EVAS_API Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj);
 
 /**
  * @brief Makes the given Evas_Vg_Node object visible or invisible.
@@ -3851,7 +3851,7 @@ EAPI Eina_Bool evas_vg_node_visible_get(Evas_Vg_Node *obj);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v);
+EVAS_API void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v);
 
 /**
  * @brief Retrieves the general/main color of the given Evas_Vg_Node object.
@@ -3874,7 +3874,7 @@ EAPI void evas_vg_node_visible_set(Evas_Vg_Node *obj, Eina_Bool v);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a);
+EVAS_API void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int *a);
 
 /**
  * @brief Sets the general/main color of the given Evas_Vg_Node object to the given
@@ -3891,7 +3891,7 @@ EAPI void evas_vg_node_color_get(Evas_Vg_Node *obj, int *r, int *g, int *b, int
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a);
+EVAS_API void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a);
 
 /**
  * @brief Retrieves the geometry of the given Evas_Vg_Node object.
@@ -3904,7 +3904,7 @@ EAPI void evas_vg_node_color_set(Evas_Vg_Node *obj, int r, int g, int b, int a);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h);
+EVAS_API void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, int *h);
 
 /**
  * @brief Changes the geometry of the given Evas_Vg_Node object.
@@ -3918,7 +3918,7 @@ EAPI void evas_vg_node_geometry_get(Evas_Vg_Node *obj, int *x, int *y, int *w, i
  * @since 1.24
  * @deprecated
  */
-EAPI void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h) EINA_DEPRECATED;
+EVAS_API void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int h) EINA_DEPRECATED;
 
 /**
  * @brief Stack @p obj immediately below @p below.
@@ -3948,7 +3948,7 @@ EAPI void evas_vg_node_geometry_set(Evas_Vg_Node *obj, int x, int y, int w, int
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_stack_below(Evas_Vg_Node *obj, Evas_Vg_Node *below);
+EVAS_API void evas_vg_node_stack_below(Evas_Vg_Node *obj, Evas_Vg_Node *below);
 
 /**
  * @brief Stack @p obj immediately above @p above.
@@ -3978,7 +3978,7 @@ EAPI void evas_vg_node_stack_below(Evas_Vg_Node *obj, Evas_Vg_Node *below);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_stack_above(Evas_Vg_Node *obj, Evas_Vg_Node *above);
+EVAS_API void evas_vg_node_stack_above(Evas_Vg_Node *obj, Evas_Vg_Node *above);
 
 /**
  * @brief Raise @p obj to the top of its layer.
@@ -3994,7 +3994,7 @@ EAPI void evas_vg_node_stack_above(Evas_Vg_Node *obj, Evas_Vg_Node *above);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_raise(Evas_Vg_Node *obj);
+EVAS_API void evas_vg_node_raise(Evas_Vg_Node *obj);
 
 /**
  * @brief Lower @p obj to the bottom of its layer.
@@ -4010,7 +4010,7 @@ EAPI void evas_vg_node_raise(Evas_Vg_Node *obj);
  *
  * @since 1.24
  */
-EAPI void evas_vg_node_lower(Evas_Vg_Node *obj);
+EVAS_API void evas_vg_node_lower(Evas_Vg_Node *obj);
 
 #include "canvas/efl_canvas_vg_node_eo.legacy.h"
 
@@ -4022,7 +4022,7 @@ EAPI void evas_vg_node_lower(Evas_Vg_Node *obj);
  *
  * @since 1.14
  */
-EAPI double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj);
+EVAS_API double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj);
 
 /**
  * @brief Sets the stroke scale to be used for stroking the path.
@@ -4033,7 +4033,7 @@ EAPI double evas_vg_shape_stroke_scale_get(Evas_Vg_Shape *obj);
  *
  * @since 1.14
  */
-EAPI void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s);
+EVAS_API void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s);
 
 /**
  * @brief Gets the color used for stroking the path.
@@ -4046,7 +4046,7 @@ EAPI void evas_vg_shape_stroke_scale_set(Evas_Vg_Shape *obj, double s);
  *
  * @since 1.14
  */
-EAPI void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int *a);
+EVAS_API void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int *b, int *a);
 
 /**
  * @brief Sets the color to be used for stroking the path.
@@ -4059,7 +4059,7 @@ EAPI void evas_vg_shape_stroke_color_get(Evas_Vg_Shape *obj, int *r, int *g, int
  *
  * @since 1.14
  */
-EAPI void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b, int a);
+EVAS_API void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b, int a);
 
 /**
  * @brief Gets the stroke width to be used for stroking the path.
@@ -4069,7 +4069,7 @@ EAPI void evas_vg_shape_stroke_color_set(Evas_Vg_Shape *obj, int r, int g, int b
  *
  * @since 1.14
  */
-EAPI double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj);
+EVAS_API double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj);
 
 /**
  * @brief Sets the stroke width to be used for stroking the path.
@@ -4079,7 +4079,7 @@ EAPI double evas_vg_shape_stroke_width_get(Evas_Vg_Shape *obj);
  *
  * @since 1.14
  */
-EAPI void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w);
+EVAS_API void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w);
 
 /**
  * @brief Gets the stroke location to be used for stroking the path.
@@ -4089,7 +4089,7 @@ EAPI void evas_vg_shape_stroke_width_set(Evas_Vg_Shape *obj, double w);
  *
  * @since 1.24
  */
-EAPI double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj);
+EVAS_API double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj);
 
 /**
  * @brief Sets the stroke location to be used for stroking the path.
@@ -4099,7 +4099,7 @@ EAPI double evas_vg_shape_stroke_location_get(Evas_Vg_Shape *obj);
  *
  * @since 1.24
  */
-EAPI void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered);
+EVAS_API void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered);
 
 /**
  * @brief Gets the stroke dash type used for stroking path.
@@ -4110,7 +4110,7 @@ EAPI void evas_vg_shape_stroke_location_set(Evas_Vg_Shape *obj, double centered)
  *
  * @since 1.24
  */
-EAPI void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash, unsigned int *length);
+EVAS_API void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash **dash, unsigned int *length);
 
 /**
  * @brief Sets the stroke dash type to be used for stroking the path.
@@ -4121,7 +4121,7 @@ EAPI void evas_vg_shape_stroke_dash_get(Evas_Vg_Shape *obj, const Evas_Vg_Dash *
  *
  * @since 1.24
  */
-EAPI void evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash, unsigned int length);
+EVAS_API void evas_vg_shape_stroke_dash_set(Evas_Vg_Shape *obj, const Evas_Vg_Dash *dash, unsigned int length);
 
 /**
  * @brief Gets the cap style used for stroking path.